From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 c20b9ae..efcf4fc 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
@@ -10,6 +10,7 @@
import com.doumee.service.business.impl.hksync.HkSyncPrivilegeServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +23,7 @@
*/
@Api(tags = "ERP鏁版嵁鍚屾鎺ュ彛")
@RestController
-@RequestMapping("/business/erp")
+@RequestMapping("/business/erpsync")
public class ERPSyncController extends BaseController {
@Autowired
@@ -33,9 +34,9 @@
private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@PreventRepeat
- @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
- @PostMapping("/getDevices")
-// @RequiresPermissions("business:hksync:device")
+ @ApiOperation("銆怑RP銆戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
+ @PostMapping("/syncDevices")
+ //@RequiresPermissions("business:erpsync:device")
public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
--
Gitblit v1.9.3