From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/company/src/main/java/com/doumee/api/system/SystemUserController.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
index 0d14fb7..f6169f7 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -7,10 +7,8 @@
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
-import com.doumee.dao.system.dto.CreateSystemUserDTO;
-import com.doumee.dao.system.dto.CreateUserRoleDTO;
-import com.doumee.dao.system.dto.QuerySystemUserDTO;
-import com.doumee.dao.system.dto.ResetSystemUserPwdDTO;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.system.dto.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.system.vo.SystemUserListVO;
import com.doumee.service.system.SystemUserService;
@@ -126,4 +124,61 @@
return ApiResponse.success(systemUserService.findById(id));
}
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("鏂板缓鍛樺伐")
+ @PostMapping("/companyCreateUser")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyCreate(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("鏂板缓涓绘挱")
+ @PostMapping("/companyCreateAnchor")
+// @RequiresPermissions("system:user:create")
+ public ApiResponse companyCreateAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼鍛樺伐淇℃伅")
+ @PostMapping("/companyUpdUser")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyUpdUser(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.COMPANY.getKey());
+ systemUserBiz.companyCreateUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼涓绘挱淇℃伅")
+ @PostMapping("/companyUpdAnchor")
+ @RequiresPermissions("system:user:create")
+ public ApiResponse companyUpdAnchor(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ createCompanyUserDTO.setType(Constants.UserType.ZHUBO.getKey());
+ systemUserBiz.companyUpdUser(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
+
+ @Trace(withRequestParameters = false)
+ @PreventRepeat
+ @ApiOperation("淇敼瀵嗙爜")
+ @PostMapping("/updPassword")
+// @RequiresPermissions("system:user:create")
+ public ApiResponse updPassword(@Validated(OperaType.Create.class) @RequestBody CreateCompanyUserDTO createCompanyUserDTO) {
+ systemUserBiz.updPassword(createCompanyUserDTO);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3