From 98661dae111965b72b758a14d687b3218c2e2089 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 15:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
index 07d58fd..40cf28e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+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;
@@ -78,13 +79,49 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏍规嵁ID 绂佸惎鐢� 鎷夐粦")
+ @ApiOperation("鏍规嵁ID 绂佸惎鐢� ")
@PostMapping("/updateStatusById")
@RequiresPermissions("business:member:update")
public ApiResponse updateStatusById(@RequestBody Member member){
memberService.updateStatusById(member);
return ApiResponse.success(null);
}
+
+ @ApiOperation("浜哄憳绉婚櫎/瑙ｅ喕")
+ @PostMapping("/updateRemoveStatusById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateRemoveStatusById(@RequestBody List<Member> list){
+ if(list.size()>0){
+ memberService.updateRemoveStatusById(list);
+ return ApiResponse.success(null);
+ }else{
+ return ApiResponse.failed("鍙傛暟閿欒");
+ }
+
+ }
+
+ @ApiOperation("浜哄憳鎷夐粦/鍐荤粨")
+ @PostMapping("/updateVisitsStatusById")
+ @RequiresPermissions("business:member:update")
+ public ApiResponse updateVisitsStatusById(@RequestBody Member member){
+ memberService.updateVisitsStatusById(member);
+ return ApiResponse.success(null);
+ }
+
+
+ @ApiOperation("鎵归噺鎷夐粦/鍐荤粨")
+ @GetMapping("/batchBlock")
+ @RequiresPermissions("business:member:delete")
+ public ApiResponse batchBlock(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ memberService.batchBlock(idList);
+ return ApiResponse.success(null);
+ }
+
@ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@PostMapping("/updateCanVisitById")
@@ -131,8 +168,32 @@
*/
@ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅")
@PostMapping("/findMemberInfoPage")
- // @RequiresPermissions("business:member:query")
+ @RequiresPermissions("business:member:query")
public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> pageWrap){
- return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ if(pageWrap.getModel().getType().equals(Constants.memberType.visitor)){
+ return ApiResponse.success(memberService.findVisitPage(pageWrap));
+ }else if(pageWrap.getModel().getType().equals(Constants.memberType.internal)){
+ return ApiResponse.success(memberService.findMemberInfoPage(pageWrap));
+ }else {
+ return ApiResponse.success(null);
+ }
}
+
+ @ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
+ @PostMapping("/findVisitPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ return ApiResponse.success(memberService.findVisitPage(pageWrap));
+ }
+
+
+ @ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
+ @PostMapping("/findUnusualPage")
+ @RequiresPermissions("business:member:query")
+ public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ return ApiResponse.success(memberService.findUnusualPage(pageWrap));
+ }
+
+
+
}
--
Gitblit v1.9.3