流程数据修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ActivitiServiceImpl.java

@@ -633,7 +633,9 @@ public class ActivitiServiceImpl implements ActivitiService {
             default:
                 break;
         }
-        taskService.setAssignee(taskId, userId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        taskService.deleteCandidateUser(taskId, String.valueOf(sysUser.getId()));
+        taskService.addCandidateUser(taskId, userId);
         return true;
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/ActivitiController.java

@@ -1,84 +0,0 @@
-//package com.qmth.distributed.print.api;
-//
-//import com.qmth.boot.api.annotation.Aac;
-//import com.qmth.boot.api.annotation.BOOL;
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.distributed.print.business.service.ActivitiService;
-//import com.qmth.teachcloud.common.util.Result;
-//import com.qmth.teachcloud.common.util.ResultUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import javax.annotation.Resource;
-//import java.io.IOException;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-///**
-// * @Description: activiti demo api
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2021/7/12
-// */
-//@Api(tags = "工作流Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/activiti")
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
-//public class ActivitiController {
-//
-//    @Resource
-//    private ActivitiService activitiService;
-//
-//    @ApiOperation(value = "注册流程")
-//    @RequestMapping(value = "/createDeployment", method = RequestMethod.POST)
-//    public Result createDeployment(@RequestParam(value = "processFileName") String processFileName) {
-//        activitiService.createDeployment(processFileName);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "上传流程")
-//    @RequestMapping(value = "/updateDeployment", method = RequestMethod.POST)
-//    public Result uploadDeployment(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file) throws IOException {
-//        activitiService.uploadDeployment(file);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "启动流程")
-//    @RequestMapping(value = "/startActivity", method = RequestMethod.POST)
-//    public Result startActivity(@RequestParam(value = "processKey") String processKey) {
-//        Map<String, Object> map = new HashMap<>();
-//        map.put("userId", 1L);
-//        map.put("approveId", 2L);
-//        map.put("assigneeId", 3L);
-//        activitiService.startActivity(processKey, null);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "获取待办")
-//    @RequestMapping(value = "/getTaskList", method = RequestMethod.POST)
-//    public Result getTaskList() {
-//        activitiService.getTaskList();
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "提交")
-//    @RequestMapping(value = "/complete", method = RequestMethod.POST)
-//    public Result complete(@RequestParam(value = "taskId") String taskId) {
-//        activitiService.complete(taskId);
-//        return ResultUtil.ok();
-//    }
-//
-//    @ApiOperation(value = "根据流程id直接结束流程")
-//    @RequestMapping(value = "/deleteProcessInstance", method = RequestMethod.POST)
-//    public Result deleteProcessInstance(@RequestParam(value = "flowId") String flowId) {
-//        activitiService.deleteProcessInstance(flowId);
-//        return ResultUtil.ok();
-//    }
-//}

distributed-print/src/main/java/com/qmth/distributed/print/api/SysPrivilegeController.java

@@ -1,93 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.teachcloud.common.bean.dto.PrivilegeDto;
-import com.qmth.teachcloud.common.entity.SysPrivilege;
-import com.qmth.teachcloud.common.service.SysPrivilegeService;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 菜单权限表 前端控制器
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Api(tags = "菜单权限Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/privilege")
-public class SysPrivilegeController {
-
-    @Autowired
-    private SysPrivilegeService sysPrivilegeService;
-
-    /**
-     * 查询
-     *
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list() {
-        return ResultUtil.ok(sysPrivilegeService.listPrivilegeTreeNew());
-    }
-
-    /**
-     * 查询需要授权的菜单
-     *
-     * @return
-     */
-    @ApiOperation(value = "查询需要授权的菜单")
-    @RequestMapping(value = "/list_auth", method = RequestMethod.POST)
-    public Result listAuth() {
-        return ResultUtil.ok(sysPrivilegeService.listPrivilegeTreeAuth());
-    }
-
-    /**
-     * 新增/修改
-     *
-     * @param privilege
-     * @return
-     */
-    @ApiOperation(value = "新增/修改")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(@RequestBody SysPrivilege privilege) {
-        return ResultUtil.ok(new EditResult(sysPrivilegeService.savePrivilege(privilege)));
-    }
-
-    /**
-     * 删除
-     *
-     * @param privilege
-     * @return
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody SysPrivilege privilege) {
-        return ResultUtil.ok(sysPrivilegeService.remove(privilege.getId()));
-    }
-
-    /**
-     * 角色已绑定权限列表
-     *
-     * @param roleId
-     * @return
-     */
-    @ApiOperation(value = "角色已绑定权限列表")
-    @RequestMapping(value = "/get_role_privileges", method = RequestMethod.POST)
-    public Result getRolePrivileges(@RequestParam(value = "roleId", required = true) Long roleId) {
-        return ResultUtil.ok(sysPrivilegeService.getRolePrivileges(roleId));
-    }
-}
-

distributed-print/src/main/java/com/qmth/distributed/print/api/SysRoleController.java

@@ -1,115 +0,0 @@
-package com.qmth.distributed.print.api;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.entity.SysRole;
-import com.qmth.teachcloud.common.service.SysRoleService;
-import com.qmth.teachcloud.common.util.Result;
-import com.qmth.teachcloud.common.util.ResultUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-/**
- * <p>
- * 角色表 前端控制器
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Api(tags = "角色Controller")
-@RestController
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
-public class SysRoleController {
-
-    @Autowired
-    private SysRoleService sysRoleService;
-
-    /**
-     * 查询
-     *
-     * @param name
-     * @param enable
-     * @param pageNumber
-     * @param pageSize
-     * @return
-     */
-    @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "name", required = false) String name,
-                       @RequestParam(value = "enable", required = false) Boolean enable,
-                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
-    }
-
-    /**
-     * 新增用户时查询角色方法
-     *
-     * @return
-     */
-    @ApiOperation(value = "新增用户时查询角色方法")
-    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
-    public Result listToUser() {
-        return ResultUtil.ok(sysRoleService.listToUser());
-    }
-
-    /**
-     * 新增/修改
-     *
-     * @param role
-     * @return
-     */
-    @ApiOperation(value = "新增/修改")
-    @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(@Valid @RequestBody SysRole role, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-        }
-        return ResultUtil.ok(sysRoleService.saveRoleNew(role));
-    }
-
-    /**
-     * 启用/禁用
-     *
-     * @param role
-     * @return
-     */
-    @ApiOperation(value = "启用/禁用")
-    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@RequestBody SysRole role) throws NoSuchAlgorithmException {
-        return ResultUtil.ok(sysRoleService.enable(role));
-    }
-
-    /**
-     * 删除
-     *
-     * @param id
-     * @return
-     */
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(Long id) {
-        return ResultUtil.ok(sysRoleService.remove(id));
-    }
-
-    /**
-     * 用户已绑定角色列表
-     *
-     * @param userId
-     * @return
-     */
-    @ApiOperation(value = "用户已绑定角色列表")
-    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
-    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
-        return ResultUtil.ok(sysRoleService.getUserRoles(userId));
-    }
-}
-

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysPrivilegeController.java

@@ -1,95 +1,87 @@
-//package com.qmth.teachcloud.common.api.api;
-//
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.teachcloud.common.bean.dto.PrivilegeDto;
-//import com.qmth.teachcloud.common.entity.SysPrivilege;
-//import com.qmth.teachcloud.common.service.SysPrivilegeService;
-//import com.qmth.teachcloud.common.util.Result;
-//import com.qmth.teachcloud.common.util.ResultUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.List;
-//
-///**
-// * <p>
-// * 菜单权限表 前端控制器
-// * </p>
-// *
-// * @author xf
-// * @since 2021-03-23
-// */
-//@Api(tags = "菜单权限Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/privilege")
-//public class SysPrivilegeController {
-//
-//    @Autowired
-//    private SysPrivilegeService sysPrivilegeService;
-//
-//    /**
-//     * 查询
-//     *
-//     * @return
-//     */
-//    @ApiOperation(value = "查询")
-//    @RequestMapping(value = "/list", method = RequestMethod.POST)
-//    public Result list() {
-//        List<PrivilegeDto> privilegeDtoList = sysPrivilegeService.listPrivilegeTree();
-//        return ResultUtil.ok(privilegeDtoList);
-//    }
-//
-//    /**
-//     * 查询需要授权的菜单
-//     *
-//     * @return
-//     */
-//    @ApiOperation(value = "查询需要授权的菜单")
-//    @RequestMapping(value = "/list_auth", method = RequestMethod.POST)
-//    public Result listAuth() {
-//        List<PrivilegeDto> privilegeDtoList = sysPrivilegeService.listPrivilegeTreeAuth();
-//        return ResultUtil.ok(privilegeDtoList);
-//    }
-//
-//    /**
-//     * 新增/修改
-//     *
-//     * @param privilege
-//     * @return
-//     */
-//    @ApiOperation(value = "新增/修改")
-//    @RequestMapping(value = "/save", method = RequestMethod.POST)
-//    public Result save( @RequestBody SysPrivilege privilege) {
-//        String id = sysPrivilegeService.savePrivilege(privilege);
-//        return ResultUtil.ok(id,"");
-//    }
-//
-//    /**
-//     * 删除
-//     *
-//     * @param privilege
-//     * @return
-//     */
-//    @ApiOperation(value = "删除")
-//    @RequestMapping(value = "/remove", method = RequestMethod.POST)
-//    public Result remove(@RequestBody SysPrivilege privilege) {
-//        boolean isSuccess = sysPrivilegeService.remove(privilege.getId());
-//        return ResultUtil.ok(isSuccess);
-//    }
-//
-//    /**
-//     * 角色已绑定权限列表
-//     *
-//     * @param roleId
-//     * @return
-//     */
-//    @ApiOperation(value = "角色已绑定权限列表")
-//    @RequestMapping(value = "/get_role_privileges", method = RequestMethod.POST)
-//    public Result getRolePrivileges(@RequestParam(value = "roleId", required = true) Long roleId) {
-//        List<String> list = sysPrivilegeService.getRolePrivileges(roleId);
-//        return ResultUtil.ok(list);
-//    }
-//}
-//
+package com.qmth.teachcloud.common.api.api;
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.entity.SysPrivilege;
+import com.qmth.teachcloud.common.service.SysPrivilegeService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 菜单权限表 前端控制器
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@Api(tags = "菜单权限Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/privilege")
+public class SysPrivilegeController {
+
+    @Autowired
+    private SysPrivilegeService sysPrivilegeService;
+
+    /**
+     * 查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list() {
+        return ResultUtil.ok(sysPrivilegeService.listPrivilegeTreeNew());
+    }
+
+    /**
+     * 查询需要授权的菜单
+     *
+     * @return
+     */
+    @ApiOperation(value = "查询需要授权的菜单")
+    @RequestMapping(value = "/list_auth", method = RequestMethod.POST)
+    public Result listAuth() {
+        return ResultUtil.ok(sysPrivilegeService.listPrivilegeTreeAuth());
+    }
+
+    /**
+     * 新增/修改
+     *
+     * @param privilege
+     * @return
+     */
+    @ApiOperation(value = "新增/修改")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Result save(@RequestBody SysPrivilege privilege) {
+        return ResultUtil.ok(sysPrivilegeService.savePrivilege(privilege));
+    }
+
+    /**
+     * 删除
+     *
+     * @param privilege
+     * @return
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/remove", method = RequestMethod.POST)
+    public Result remove(@RequestBody SysPrivilege privilege) {
+        return ResultUtil.ok(sysPrivilegeService.remove(privilege.getId()));
+    }
+
+    /**
+     * 角色已绑定权限列表
+     *
+     * @param roleId
+     * @return
+     */
+    @ApiOperation(value = "角色已绑定权限列表")
+    @RequestMapping(value = "/get_role_privileges", method = RequestMethod.POST)
+    public Result getRolePrivileges(@RequestParam(value = "roleId", required = true) Long roleId) {
+        return ResultUtil.ok(sysPrivilegeService.getRolePrivileges(roleId));
+    }
+}
+

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysRoleController.java

@@ -1,113 +1,113 @@
-//package com.qmth.distributed.print.api;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.teachcloud.common.entity.SysRole;
-//import com.qmth.teachcloud.common.service.SysRoleService;
-//import com.qmth.teachcloud.common.util.Result;
-//import com.qmth.teachcloud.common.util.ResultUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.validation.BindingResult;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.validation.Valid;
-//import java.util.List;
-//
-///**
-// * <p>
-// * 角色表 前端控制器
-// * </p>
-// *
-// * @author xf
-// * @since 2021-03-23
-// */
-//@Api(tags = "角色Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
-//public class SysRoleController {
-//
-//    @Autowired
-//    private SysRoleService sysRoleService;
-//
-//    /**
-//     * 查询
-//     *
-//     * @param name
-//     * @param enable
-//     * @param pageNumber
-//     * @param pageSize
-//     * @return
-//     */
-//    @ApiOperation(value = "查询")
-//    @RequestMapping(value = "/list", method = RequestMethod.POST)
-//    public Result list(@RequestParam(value = "name", required = false) String name,
-//                       @RequestParam(value = "enable", required = false) Boolean enable,
-//                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
-//    }
-//
-//    /**
-//     * 新增用户时查询角色方法
-//     *
-//     * @return
-//     */
-//    @ApiOperation(value = "新增用户时查询角色方法")
-//    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
-//    public Result listToUser() {
-//        return ResultUtil.ok(sysRoleService.listToUser());
-//    }
-//
-//    /**
-//     * 新增/修改
-//     *
-//     * @param role
-//     * @return
-//     */
-//    @ApiOperation(value = "新增/修改")
-//    @RequestMapping(value = "/save", method = RequestMethod.POST)
-//    public Result save(@Valid @RequestBody SysRole role, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        return ResultUtil.ok(sysRoleService.saveRoleNew(role));
-//    }
-//
-//    /**
-//     * 启用/禁用
-//     *
-//     * @param role
-//     * @return
-//     */
-//    @ApiOperation(value = "启用/禁用")
-//    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-//    public Result enable(@RequestBody SysRole role) {
-//        return ResultUtil.ok(sysRoleService.enable(role));
-//    }
-//
-//    /**
-//     * 删除
-//     *
-//     * @param id
-//     * @return
-//     */
-//    @ApiOperation(value = "删除")
-//    @RequestMapping(value = "/remove", method = RequestMethod.POST)
-//    public Result remove(Long id) {
-//        return ResultUtil.ok(sysRoleService.remove(id));
-//    }
-//
-//    /**
-//     * 用户已绑定角色列表
-//     *
-//     * @param userId
-//     * @return
-//     */
-//    @ApiOperation(value = "用户已绑定角色列表")
-//    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
-//    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
-//        return ResultUtil.ok(sysRoleService.getUserRoles(userId));
-//    }
-//}
+package com.qmth.teachcloud.common.api.api;
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.entity.SysRole;
+import com.qmth.teachcloud.common.service.SysRoleService;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * <p>
+ * 角色表 前端控制器
+ * </p>
+ *
+ * @author xf
+ * @since 2021-03-23
+ */
+@Api(tags = "角色Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/role")
+public class SysRoleController {
+
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    /**
+     * 查询
+     *
+     * @param name
+     * @param enable
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "查询")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(@RequestParam(value = "name", required = false) String name,
+                       @RequestParam(value = "enable", required = false) Boolean enable,
+                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        return ResultUtil.ok(sysRoleService.list(name, enable, pageNumber, pageSize));
+    }
+
+    /**
+     * 新增用户时查询角色方法
+     *
+     * @return
+     */
+    @ApiOperation(value = "新增用户时查询角色方法")
+    @RequestMapping(value = "/list_to_user", method = RequestMethod.POST)
+    public Result listToUser() {
+        return ResultUtil.ok(sysRoleService.listToUser());
+    }
+
+    /**
+     * 新增/修改
+     *
+     * @param role
+     * @return
+     */
+    @ApiOperation(value = "新增/修改")
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
+    public Result save(@Valid @RequestBody SysRole role, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
+        }
+        return ResultUtil.ok(sysRoleService.saveRoleNew(role));
+    }
+
+    /**
+     * 启用/禁用
+     *
+     * @param role
+     * @return
+     */
+    @ApiOperation(value = "启用/禁用")
+    @RequestMapping(value = "/enable", method = RequestMethod.POST)
+    public Result enable(@RequestBody SysRole role) throws NoSuchAlgorithmException {
+        return ResultUtil.ok(sysRoleService.enable(role));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "删除")
+    @RequestMapping(value = "/remove", method = RequestMethod.POST)
+    public Result remove(Long id) {
+        return ResultUtil.ok(sysRoleService.remove(id));
+    }
+
+    /**
+     * 用户已绑定角色列表
+     *
+     * @param userId
+     * @return
+     */
+    @ApiOperation(value = "用户已绑定角色列表")
+    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
+    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
+        return ResultUtil.ok(sysRoleService.getUserRoles(userId));
+    }
+}
+

teachcloud-common-api/src/main/java/com/qmth/teachcloud/common/api/api/SysUserController.java

@@ -1,171 +0,0 @@
-//package com.qmth.teachcloud.common.api.api;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.qmth.boot.api.constant.ApiConstant;
-//import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
-//import com.qmth.teachcloud.common.bean.dto.UserDto;
-//import com.qmth.teachcloud.common.bean.params.UserSaveParams;
-//import com.qmth.teachcloud.common.entity.SysUser;
-//import com.qmth.teachcloud.common.service.SysUserService;
-//import com.qmth.teachcloud.common.util.Result;
-//import com.qmth.teachcloud.common.util.ResultUtil;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.validation.BindingResult;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.validation.Valid;
-//import java.security.NoSuchAlgorithmException;
-//import java.util.List;
-//
-///**
-// * <p>
-// * 用户表 前端控制器
-// * </p>
-// *
-// * @author xf
-// * @since 2021-03-23
-// */
-//@Api(tags = "用户Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
-//public class SysUserController {
-//    private final static Logger log = LoggerFactory.getLogger(SysUserController.class);
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//
-//    /**
-//     * 查询
-//     *
-//     * @param loginName
-//     * @param roleId
-//     * @param enable
-//     * @return
-//     */
-//    @ApiOperation(value = "查询")
-//    @RequestMapping(value = "/list", method = RequestMethod.POST)
-//    public Result list(@RequestParam(value = "loginName", required = false) String loginName,
-//                       @RequestParam(value = "roleId", required = false) String roleId,
-//                       @RequestParam(value = "enable", required = false) Boolean enable,
-//                       @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        IPage<UserDto> userDtos = sysUserService.list(loginName, roleId, enable, pageNumber, pageSize);
-//        return ResultUtil.ok(userDtos);
-//    }
-//
-//    /**
-//     * 查询
-//     *
-//     * @param realName
-//     * @param enable
-//     * @return
-//     */
-//    @ApiOperation(value = "查询")
-//    @RequestMapping(value = "/list_customer", method = RequestMethod.POST)
-//    public Result listCustomer(@RequestParam(value = "realName", required = false) String realName,
-//                               @RequestParam(value = "enable", required = false) Boolean enable,
-//                               @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-//                               @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-//        IPage<UserDto> userDtos = sysUserService.listCustomer(realName, enable, pageNumber, pageSize);
-//        return ResultUtil.ok(userDtos);
-//    }
-//
-//    /**
-//     * 根据科目查询命题老师
-//     *
-//     * @param courseCode
-//     * @param param
-//     * @return
-//     */
-//    @ApiOperation(value = "根据科目查询命题老师")
-//    @RequestMapping(value = "/user_list", method = RequestMethod.POST)
-//    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
-//                            @RequestParam(value = "param", required = false) String param) {
-//        List<BlurryUserDto> list = sysUserService.listUser(courseCode, param);
-//        return ResultUtil.ok(list);
-//    }
-//
-//    /**
-//     * 新增/修改
-//     *
-//     * @param userSaveParams
-//     * @return
-//     */
-//    @ApiOperation(value = "新增/修改")
-//    @RequestMapping(value = "/save", method = RequestMethod.POST)
-//    public Result save(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        return ResultUtil.ok(sysUserService.saveUser(userSaveParams));
-//    }
-//
-//    /**
-//     * 新增客服
-//     *
-//     * @param userSaveParams
-//     * @return
-//     */
-//    @ApiOperation(value = "新增客服")
-//    @RequestMapping(value = "/save_customer", method = RequestMethod.POST)
-//    public Result saveCustomer(@ApiParam(value = "用户信息", required = true) @Valid @RequestBody UserSaveParams userSaveParams, BindingResult bindingResult) {
-//        if (bindingResult.hasErrors()) {
-//            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
-//        }
-//        return ResultUtil.ok(sysUserService.saveCustomer(userSaveParams));
-//    }
-//
-//    /**
-//     * 启用/禁用
-//     *
-//     * @param user
-//     * @return
-//     */
-//    @ApiOperation(value = "启用/禁用")
-//    @RequestMapping(value = "/enable", method = RequestMethod.POST)
-//    public Result enable(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-//        return ResultUtil.ok(sysUserService.enable(user));
-//    }
-//
-//    /**
-//     * 重置密码
-//     *
-//     * @param user
-//     * @return
-//     */
-//    @ApiOperation(value = "重置密码")
-//    @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
-//    public Result resetPassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-//        return ResultUtil.ok(sysUserService.resetPassword(user.getId()));
-//    }
-//
-//    /**
-//     * 修改密码
-//     *
-//     * @return
-//     */
-//    @ApiOperation(value = "修改密码")
-//    @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-//    public Result updatePassword(@RequestBody SysUser user) throws NoSuchAlgorithmException {
-//        return ResultUtil.ok(sysUserService.updatePassword(user));
-//    }
-//
-//    /**
-//     * 绑定角色
-//     *
-//     * @param sysUser
-//     * @return
-//     */
-//    @ApiOperation(value = "绑定角色")
-//    @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
-//    public Result bindRoles(@RequestBody SysUser sysUser) {
-//        boolean isSuccess = sysUserService.bindRoles(sysUser);
-//        return ResultUtil.ok(isSuccess);
-//    }
-//}
-//