Merge remote-tracking branch 'origin/master'

jiangping

2024-12-31 b437ca4b3ba3fadc821e4b01398c3257e540fcb7

 server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java

@@ -9,6 +9,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.CreateSystemUserDTO;
import com.doumee.dao.system.dto.CreateUserRoleDTO;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -31,7 +32,7 @@
 */
@Api(tags = "用户")
@RestController
@RequestMapping("/cloudService/system/user")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/user")
public class SystemUserCloudController extends BaseController {

    @Autowired
@@ -44,7 +45,8 @@
    @ApiOperation("配置用户角色")
    @PostMapping("/createUserRole")
    @CloudRequiredPermission("system:user:createUserRole")
    public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
    public ApiResponse createUserRole (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateUserRoleDTO dto) {
        dto.setCreateUser(this.getLoginUser(token).getId());
        systemUserBiz.createUserRole(dto);
        return ApiResponse.success(null);
    }
@@ -54,8 +56,9 @@
    @ApiOperation("重置用户密码")
    @PostMapping("/resetPwd")
    @CloudRequiredPermission("system:user:resetPwd")
    public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
        dto.setOperaUserId(this.getLoginUser().getId());
    public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
        dto.setOperaUserId(this.getLoginUser(token).getId());
        dto.setNeedChangePwd(Constants.ZERO);
        systemUserBiz.resetPwd(dto);
        return ApiResponse.success(null);
    }
@@ -65,8 +68,8 @@
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("system:user:create")
    public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setCreateUser(this.getLoginUser().getId());
    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setCreateUser(this.getLoginUser(token).getId());
        systemUserBiz.create(systemUser);
        return ApiResponse.success(null);
    }
@@ -96,8 +99,8 @@
    @ApiOperation("修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("system:user:update")
    public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setUpdateUser(this.getLoginUser().getId());
    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody CreateSystemUserDTO systemUser) {
        systemUser.setUpdateUser(this.getLoginUser(token).getId());
        systemUserBiz.updateById(systemUser);
        return ApiResponse.success(null);
    }
@@ -109,8 +112,12 @@
        return ApiResponse.success(systemUserService.findPage(pageWrap));
    }



    @ApiOperation("分页查询司机列表")
    @PostMapping("/pageDriver")
    @CloudRequiredPermission("system:user:query")
    public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) {
        return ApiResponse.success(systemUserService.findDriverPage(pageWrap));
    }


    @ApiOperation("查询所有系统用户")
@@ -120,6 +127,12 @@
        return ApiResponse.success(systemUserService.findAllList(pageWrap));
    }

    @ApiOperation("查询所有内部人员用户")
    @PostMapping("/findInternalList")
    @CloudRequiredPermission("system:user:query")
    public ApiResponse<List<SystemUser>> findInternalList () {
        return ApiResponse.success(systemUserService.findInternalList());
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")