From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 13 八月 2024 13:38:19 +0800 Subject: [PATCH] 修复bug --- server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 43 ++++++++++++++----------------------------- 1 files changed, 14 insertions(+), 29 deletions(-) diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java index efcf4fc..92bd26b 100644 --- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java +++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java @@ -2,12 +2,10 @@ import com.doumee.api.BaseController; import com.doumee.core.annotation.pr.PreventRepeat; -import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest; -import com.doumee.core.haikang.model.param.request.ParkListRequest; +import com.doumee.core.erp.model.openapi.request.erp.OrgListRequest; +import com.doumee.core.erp.model.openapi.request.erp.UserListRequest; import com.doumee.core.model.ApiResponse; -import com.doumee.service.business.impl.hksync.HkSyncDeviceServiceImpl; -import com.doumee.service.business.impl.hksync.HkSyncParkServiceImpl; -import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl; +import com.doumee.service.business.ext.ERPSyncService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -25,36 +23,23 @@ @RestController @RequestMapping("/business/erpsync") public class ERPSyncController extends BaseController { - @Autowired - private HkSyncDeviceServiceImpl hkSyncDeviceService; - @Autowired - private HkSyncParkServiceImpl hkSyncParkService; - @Autowired - private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService; + private ERPSyncService erpSyncService; @PreventRepeat - @ApiOperation("銆怑RP銆戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�") - @PostMapping("/syncDevices") - //@RequiresPermissions("business:erpsync:device") - public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) { - String result = hkSyncDeviceService.syncHkDevices(param); + @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP缁勭粐鎺ュ彛") + @PostMapping("/getCompanies") + @RequiresPermissions("business:erpsync:company") + public ApiResponse getCompanies(@RequestBody OrgListRequest param) { + String result = erpSyncService.syncCompany(param); return ApiResponse.success(result); } @PreventRepeat - @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛") - @PostMapping("/getParks") -// @RequiresPermissions("business:hksync:park") - public ApiResponse getParks(@RequestBody ParkListRequest param) { - String result = hkSyncParkService.syncHkParks(param); - return ApiResponse.success(result); - } - @PreventRepeat - @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛") - @PostMapping("/getPrivilege") -// @RequiresPermissions("business:hksync:privilege") - public ApiResponse getPrivilege(@RequestBody ParkListRequest param) { - String result = hkSyncPrivilegeService.syncHkParks(param); + @ApiOperation("銆怑RP銆戝叏閲忓悓姝RP浜哄憳鎺ュ彛") + @PostMapping("/getUsers") + @RequiresPermissions("business:erpsync:users") + public ApiResponse getUsers(@RequestBody UserListRequest param) { + String result = erpSyncService.syncUsers(param); return ApiResponse.success(result); } } -- Gitblit v1.9.3