新增了用户查询相关的接口 需要 使用者 先实现userService接口

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FormPageController.java

@@ -25,8 +25,8 @@ import java.util.List;
  *
  * @Author: zsp
  */
-@RestController("/formPage")
-@RequestMapping
+@RestController()
+@RequestMapping("/formPage")
 @Api("页面管理接口")
 public class FormPageController {
 

src/main/java/com/tykj/workflowcore/workflow_editer/controller/UserController.java

+package com.tykj.workflowcore.workflow_editer.controller;
+
+import com.tykj.workflowcore.base.result.ResultUtil;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRole;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRoleType;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowUser;
+import com.tykj.workflowcore.workflow_editer.service.UserService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author HuangXiahao
+ * @version V1.0
+ * @class UserController
+ * @packageName com.tykj.workflowcore.workflow_editer.controller
+ **/
+@RestController()
+@RequestMapping("/workflow/user")
+@Api("页面管理接口")
+public class UserController {
+
+    @Autowired(required = false)
+    UserService userService;
+
+    @PostMapping("/getCurrentUser")
+    public ResponseEntity getCurrentUser(){
+        WorkFlowUser currentUser = userService.getCurrentUser();
+        return ResultUtil.success(currentUser,"查询成功");
+    }
+
+    @PostMapping("/getAllUser")
+    public ResponseEntity getAllUser(){
+        List<WorkFlowUser> allUser = userService.getAllUser();
+        return ResultUtil.success(allUser,"查询成功");
+    }
+
+    @PostMapping("/getAllRole")
+    public ResponseEntity getAllRole(String roleType){
+        List<WorkFlowRole> allRole = userService.getAllRole(roleType);
+        return ResultUtil.success(allRole,"查询成功");
+
+    }
+
+    @PostMapping("/getRoleType")
+    public ResponseEntity getRoleType(){
+        List<WorkFlowRoleType> roleType = userService.getRoleType();
+        return ResultUtil.success(roleType,"查询成功");
+    }
+
+
+}

src/main/java/com/tykj/workflowcore/workflow_editer/entity/WorkFlowRole.java

@@ -20,12 +20,20 @@ import java.util.List;
 @NoArgsConstructor
 public class WorkFlowRole {
 
-    private String roleName;
+    /**
+     * 例如研发部、管理员等
+     */
+    private String name;
 
     /**
      * 例如： department,subject 等
      */
-    private String type;
+    private String roleType;
+
+    /**
+     * 权限在数据库中的ID
+     */
+    private String roleId;
 
 
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/WorkFlowRoleType.java

+package com.tykj.workflowcore.workflow_editer.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ClassName:    Role
+ * Package:    com.tykj.entity
+ * Description:
+ * Datetime:    2021/2/23   15:05
+ *
+ * @Author: zsp
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WorkFlowRoleType {
+
+    //例如：部门、角色
+    private String name;
+
+    /**
+     * 例如： department,subject 等
+     */
+    private String type;
+
+
+}

src/main/java/com/tykj/workflowcore/workflow_editer/service/UserService.java

 package com.tykj.workflowcore.workflow_editer.service;
 
 import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRole;
+import com.tykj.workflowcore.workflow_editer.entity.WorkFlowRoleType;
 import com.tykj.workflowcore.workflow_editer.entity.WorkFlowUser;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -34,6 +38,10 @@ public interface UserService {
      */
     List<WorkFlowRole> getAllRole(String roleType);
 
-    List<String> getRoleType();
+    /**
+     * 获取当前系统中的用户分组类别
+     * @return
+     */
+    List<WorkFlowRoleType> getRoleType();
 
 }