From 6bf26cf68e5188affb9f3fe3694456638769007e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 五月 2024 18:04:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 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 7617064..6d923d2 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
@@ -11,7 +11,6 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
-import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.ext.ERPSyncService;
@@ -69,7 +68,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:member:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberService.deleteById(id);
+ memberService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -82,7 +81,7 @@
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.deleteByIdInBatch(idList);
+ memberService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -117,7 +116,16 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateById(member);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("璁剧疆鎴栧彇娑堜富绠�")
+ @PostMapping("/updateHead")
+ @CloudRequiredPermission("business:member:head")
+ public ApiResponse updateHead(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
+ memberService.updateHead(member);
return ApiResponse.success(null);
}
@@ -125,56 +133,71 @@
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateStatusById(member);
return ApiResponse.success(null);
}
- @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
- @PostMapping("/updateRemoveStatusById")
+ @ApiOperation("鏍规嵁ID 璁剧疆鍦ㄨ亴銆佺鑱� ")
+ @PostMapping("/updateWorkStatus")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- if(list.size()>0){
- memberService.updateRemoveStatusById(list);
- return ApiResponse.success(null);
- }else{
- return ApiResponse.failed("鍙傛暟閿欒");
- }
-
- }
-
- @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
- @PostMapping("/updateVisitsStatusById")
- @CloudRequiredPermission("business:member:update")
- public ApiResponse updateVisitsStatusById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse updateWorkStatus(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
member.setLoginUserInfo(this.getLoginUser(token));
- memberService.updateVisitsStatusById(member);
+ memberService.updateWorkStatus(member);
return ApiResponse.success(null);
}
+
@ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
- @CloudRequiredPermission("business:member:delete")
+ @CloudRequiredPermission("business:member:update")
public ApiResponse batchBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,2);
+ memberService.batchBlock(idList,2,this.getLoginUser(token));
return ApiResponse.success(null);
}
@ApiOperation("鎵归噺鍐荤粨")
@GetMapping("/batchFreeze")
- @CloudRequiredPermission("business:member:delete")
+ @CloudRequiredPermission("business:member:update")
public ApiResponse batchFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList,1);
+ memberService.batchBlock(idList,1,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺绉诲嚭榛戝悕鍗�")
+ @GetMapping("/batchRemoveBlock")
+ @CloudRequiredPermission("business:member:update")
+ public ApiResponse batchCancelBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray ){
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchRemoveBlock(idList,2,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺瑙ｉ櫎鍐荤粨")
+ @GetMapping("/batchRemoveFreeze")
+ @CloudRequiredPermission("business:member:update")
+ public ApiResponse batchRemoveFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray ){
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchRemoveBlock(idList,1,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -184,6 +207,7 @@
@PostMapping("/updateCanVisitById")
@CloudRequiredPermission("business:member:update")
public ApiResponse updateCanVisitById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ member.setLoginUserInfo(this.getLoginUser(token));
memberService.updateCanVisitById(member);
return ApiResponse.success(null);
}
@@ -201,12 +225,6 @@
return ApiResponse.success(memberService.findList(model));
}
- @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ")
- @PostMapping("/findLaborMemberInfoPage")
- @CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
- }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@@ -234,7 +252,7 @@
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
@@ -247,7 +265,7 @@
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@PostMapping("/findVisitPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
@@ -255,7 +273,7 @@
@ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<PageData<Member>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
--
Gitblit v1.9.3