From ad6dfb8323ab40ca8fe4fed94722c755d89c3203 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 28 二月 2024 15:14:47 +0800 Subject: [PATCH] 整理 --- server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 151 insertions(+), 2 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 d1ae433..0929320 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 @@ -1,16 +1,23 @@ package com.doumee.api.business; import com.doumee.api.BaseController; +import com.doumee.config.DataSyncConfig; import com.doumee.core.annotation.excel.ExcelExporter; import com.doumee.core.annotation.pr.PreventRepeat; 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; import com.doumee.dao.business.model.Member; +import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.MemberService; +import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -20,12 +27,18 @@ /** * @author 姹熻箘韫� - * @date 2023/11/23 18:16 + * @date 2023/11/30 15:33 */ @Api(tags = "浜哄憳淇℃伅琛�") @RestController @RequestMapping("/business/member") public class MemberController extends BaseController { + @Autowired + private ERPSyncService erpSyncService; + @Autowired + private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService; + @Autowired + private DataSyncConfig dataSyncConfig; @Autowired private MemberService memberService; @@ -36,6 +49,14 @@ @RequiresPermissions("business:member:create") public ApiResponse create(@RequestBody Member member) { return ApiResponse.success(memberService.create(member)); + } + + @PreventRepeat + @ApiOperation("鍒涘缓鍔冲姟浜哄憳淇℃伅") + @PostMapping("/laborMemberCreate") + @RequiresPermissions("business:member:create") + public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){ + return ApiResponse.success(memberService.laborMemberCreate(member)); } @ApiOperation("鏍规嵁ID鍒犻櫎") @@ -67,11 +88,84 @@ return ApiResponse.success(null); } + @ApiOperation("鏍规嵁ID 绂佸惎鐢� ") + @PostMapping("/updateStatusById") + @RequiresPermissions("business:member:update") + public ApiResponse updateStatusById(@RequestBody Member member){ + memberService.updateStatusById(member); + return ApiResponse.success(null); + } + + @ApiOperation("浜哄憳绉婚櫎/瑙e喕") + @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,2); + return ApiResponse.success(null); + } + + @ApiOperation("鎵归噺鍐荤粨") + @GetMapping("/batchFreeze") + @RequiresPermissions("business:member:delete") + public ApiResponse batchFreeze(@RequestParam String ids) { + String [] idArray = ids.split(","); + List<Integer> idList = new ArrayList<>(); + for (String id : idArray) { + idList.add(Integer.valueOf(id)); + } + memberService.batchBlock(idList,1); + return ApiResponse.success(null); + } + + + + @ApiOperation("鏄惁鍙嫓璁跨姸鎬佷慨鏀�") + @PostMapping("/updateCanVisitById") + @RequiresPermissions("business:member:update") + public ApiResponse updateCanVisitById(@RequestBody Member member){ + memberService.updateCanVisitById(member); + return ApiResponse.success(null); + } + @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") @RequiresPermissions("business:member:query") public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) { return ApiResponse.success(memberService.findPage(pageWrap)); + } + + @ApiOperation("鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ") + @PostMapping("/findLaborMemberInfoPage") + @RequiresPermissions("business:member:query") + public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){ + return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap)); } @ApiOperation("瀵煎嚭Excel") @@ -87,4 +181,59 @@ public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(memberService.findById(id)); } + + + /** + * + * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅 + * @param pageWrap + * @return + */ + @ApiOperation("鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅") + @PostMapping("/findMemberInfoPage") + @RequiresPermissions("business:member:query") + public ApiResponse<PageData<MemberInfoDTO>> findMemberInfoPage(@RequestBody PageWrap<MemberQuery> 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)); + } + + @ApiOperation("鏍规嵁绫诲瀷鏌ヨ浜哄憳淇℃伅") + @PostMapping("/findTypeMemberInfo") + //@RequiresPermissions("business:member:query") + public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member) { + return ApiResponse.success(memberService.findList(member)); + } + + @ApiOperation("鍏ㄩ噺淇℃伅鍚屾") + @PostMapping("/syncAll") + @RequiresPermissions("business:member:sync") + public ApiResponse sync(){ + if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){ + erpSyncService.syncUsers(null); + }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){ + hkSyncOrgUserFHKService.syncUserData(); + } + return ApiResponse.success("鍚屾鎴愬姛"); + } + } -- Gitblit v1.9.3