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/CompanyController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 400adbf..94d7245 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.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;
@@ -10,8 +11,9 @@
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
-import com.doumee.dao.system.dto.UpdateSystemMenuSortDTO;
import com.doumee.service.business.CompanyService;
+import com.doumee.service.business.ext.ERPSyncService;
+import com.doumee.service.business.impl.hksync.fhk.HkSyncOrgUserFromHKServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -36,6 +38,13 @@
@Autowired
private CompanyService companyService;
+
+ @Autowired
+ private ERPSyncService erpSyncService;
+ @Autowired
+ private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;
+ @Autowired
+ private DataSyncConfig dataSyncConfig;
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -150,18 +159,23 @@
*/
@ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
@GetMapping("/findCompanyTreePage")
-// @RequiresPermissions("business:company:query")
+ @RequiresPermissions("business:company:query")
public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
return ApiResponse.success(companyService.findCompanyTreePage(type));
}
- @ApiOperation("閮ㄩ棬淇℃伅鍚屾")
- @PostMapping("/sync")
-// @RequiresPermissions("business:company:sync")
+ @ApiOperation("鍏ㄩ噺閮ㄩ棬淇℃伅鍚屾")
+ @PostMapping("/syncAll")
+ @RequiresPermissions("business:company:sync")
public ApiResponse sync(){
- //TODO 鎵嬪姩鍚屾 閮ㄩ棬淇℃伅
- return ApiResponse.success("鍚屾鎴愬姛");
+ if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.erp){
+ return ApiResponse.success( erpSyncService.syncCompany(null));
+ }else if(Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) == DataSyncConfig.origin.hk){
+ hkSyncOrgUserFHKService.syncOrgData();
+ return ApiResponse.success("鍚屾鎴愬姛");
+ }
+ return ApiResponse.failed("鏃犳晥鎿嶄綔");
}
}
--
Gitblit v1.9.3