From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 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 40cf28e..f514f8d 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,6 +1,7 @@
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;
@@ -11,7 +12,9 @@
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;
@@ -30,6 +33,12 @@
@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;
@@ -71,6 +80,15 @@
return ApiResponse.success(null);
}
+ @ApiOperation("鍛樺伐鏉冮檺涓嬪彂")
+ @GetMapping("/roleAuth/{id}")
+ @RequiresPermissions("business:empower:create")
+ public ApiResponse roleAuthById(@PathVariable Integer id) {
+ memberService.roleAuthById(id);
+ return ApiResponse.success(null);
+ }
+
+
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@RequiresPermissions("business:member:update")
@@ -109,7 +127,7 @@
}
- @ApiOperation("鎵归噺鎷夐粦/鍐荤粨")
+ @ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
@RequiresPermissions("business:member:delete")
public ApiResponse batchBlock(@RequestParam String ids) {
@@ -118,9 +136,23 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- memberService.batchBlock(idList);
+ 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("鏄惁鍙嫓璁跨姸鎬佷慨鏀�")
@@ -160,6 +192,8 @@
}
+
+
/**
*
* 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
@@ -194,6 +228,32 @@
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("鍚屾鎴愬姛");
+ }
+
+
+
+ @ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
+ @PostMapping("/testFreeFz")
+ public ApiResponse testFreeFz() {
+ memberService.memberFreeze();
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3