From c5cc7da07c7f202f336468c0cd0d2789b4775b03 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 11:31:15 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
index 78dad97..7343cc6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java
@@ -1,10 +1,13 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
+import com.doumee.biz.system.SystemUserBiz;
import com.doumee.config.DataSyncConfig;
import com.doumee.config.annotation.CloudRequiredPermission;
+import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
@@ -12,14 +15,19 @@
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberImport;
import com.doumee.dao.admin.request.MemberQuery;
+import com.doumee.dao.business.dto.RegisterDriverDTO;
+import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
+import com.doumee.dao.system.dto.UpdatePwdDto;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromSelfServiceImpl;
import io.swagger.annotations.*;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -40,11 +48,15 @@
@Autowired
private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
@Autowired
+ private HkSyncOrgUserFromSelfServiceImpl hkSyncOrgUserFromSelfService;
+ @Autowired
private DataSyncConfig dataSyncConfig;
@Autowired
private MemberService memberService;
+ @Autowired
+ private SystemUserBiz systemUserBiz;
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
@@ -85,7 +97,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -105,7 +117,7 @@
memberService.updateFace(member);
return ApiResponse.success(null);
}
- @ApiOperation("鍚屾浜鸿劯淇℃伅")
+ @ApiOperation("鎵归噺鎺堟潈涓嬪彂")
@PostMapping("/batchRoleAuth")
public ApiResponse batchRoleAuth(@RequestBody Member memberRole, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberRole.setLoginUserInfo(this.getLoginUser(token));
@@ -163,10 +175,11 @@
@PostMapping("/importExcel")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ @ApiImplicitParam(name = "缁勭粐绫诲瀷 0鐩稿叧鏂� 1鍐呴儴缁勭粐", value = "companyType", required = true, paramType = "query", dataType = "Integer",example = "0",dataTypeClass = Integer.class),
})
- @RequiresPermissions("business:worktype:create")
- public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success(memberService.importBatch(file,this.getLoginUser(token)));
+ @CloudRequiredPermission("business:member:create")
+ public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file,@ApiParam(value = "companyType") Integer companyType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(memberService.importBatch(file,companyType,this.getLoginUser(token)));
}
@ApiOperation("鎵归噺鎷夐粦")
@@ -221,8 +234,6 @@
return ApiResponse.success(null);
}
-
-
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
@@ -241,8 +252,14 @@
@ApiOperation("鏌ヨ鍏ㄩ儴")
@PostMapping("/list")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<List<Member>> findPage (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<List<Member>> list (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findList(model));
+ }
+ @ApiOperation("鏌ヨ鍏ㄩ儴鍙告満")
+ @PostMapping("/driveList")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<List<Member>> findDriveList (@RequestBody Member model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(memberService.findDriveList(model));
}
@@ -307,15 +324,17 @@
@ApiOperation("鍏ㄩ噺淇℃伅鍚屾")
@PostMapping("/syncAll")
@CloudRequiredPermission("business:member:sync")
- public ApiResponse sync(){
+ public ApiResponse sync(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
erpSyncService.syncUsers(null);
}else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
- hkSyncOrgUserFHKService.syncUserData();
+ hkSyncOrgUserFHKService.syncUserData(this.getLoginUser(token));
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.self){
+ hkSyncOrgUserFromSelfService.syncUserData(this.getLoginUser(token));
+ return ApiResponse.success("鍚屾鎴愬姛");
}
return ApiResponse.success("鍚屾鎴愬姛");
}
-
@ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
@@ -325,4 +344,24 @@
return ApiResponse.success(null);
}
+
+ @LoginNoRequired
+ @ApiOperation("鍙告満娉ㄥ唽")
+ @PostMapping("/registerDriver")
+ public ApiResponse registerDriver(@RequestBody RegisterDriverDTO registerDriverDTO ){
+ memberService.registerDriver(registerDriverDTO);
+ return ApiResponse.success("娉ㄥ唽鎴愬姛");
+ }
+
+
+
+ @Trace(withRequestParameters = false)
+ @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
+ @PostMapping("/updatePwd")
+ public ApiResponse updatePwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated @RequestBody UpdatePwdDto dto) {
+ dto.setUserId(this.getLoginUser(token).getId());
+ systemUserBiz.updatePwd(dto);
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3