From 76a7156b6908bf4b0a3d0b2ee18ceefacb510383 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 29 五月 2024 12:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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..ceb9bf9 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
@@ -3,6 +3,7 @@
import com.doumee.api.BaseController;
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.model.ApiResponse;
@@ -12,6 +13,8 @@
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.service.business.MemberService;
@@ -105,7 +108,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 +166,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("鎵归噺鎷夐粦")
@@ -241,8 +245,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));
}
@@ -317,7 +327,6 @@
}
-
@ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
@PostMapping("/testFreeFz")
public ApiResponse testFreeFz(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
@@ -325,4 +334,16 @@
return ApiResponse.success(null);
}
+
+ @LoginNoRequired
+ @ApiOperation("鍙告満娉ㄥ唽")
+ @PostMapping("/registerDriver")
+ public ApiResponse registerDriver(@RequestBody RegisterDriverDTO registerDriverDTO ){
+ memberService.registerDriver(registerDriverDTO);
+ return ApiResponse.success("娉ㄥ唽鎴愬姛");
+ }
+
+
+
+
}
--
Gitblit v1.9.3