From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 93eecb0..9311b3f 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;
@@ -215,4 +224,25 @@
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