From e057cdcd1132081abd02eae587850349d14fb2f7 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 11:44:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 1a0ddb4..fafb7f7 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -4,6 +4,7 @@
import com.doumee.core.annotation.excel.ExcelExporter;
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.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
@@ -11,6 +12,9 @@
import com.doumee.dao.business.model.Device;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.HkSyncService;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -31,15 +35,42 @@
public class HkSyncController extends BaseController {
@Autowired
- private HkSyncService hkSyncService;
+ private HkSyncDeviceServiceImpl hkSyncDeviceService;
+ @Autowired
+ private HkSyncParkServiceImpl hkSyncParkService;
+ @Autowired
+ private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@PreventRepeat
- @ApiOperation("鍏ㄩ噺鍚屾闂ㄧ璁惧鎺ュ彛")
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
@PostMapping("/getDevices")
- @RequiresPermissions("business:hksync:device")
+// @RequiresPermissions("business:hksync:device")
public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
- hkSyncService.syncHkDevices(param);
- return ApiResponse.success(null);
+ String result = hkSyncDeviceService.syncHkDevices(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);
+ return ApiResponse.success(result);
+ }
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戜簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/push")
+// @RequiresPermissions("business:hksync:privilege")
+ public ApiResponse push(@RequestBody ParkListRequest param) {
+ String result = hkSyncPrivilegeService.syncHkParks(param);
+ return ApiResponse.success(result);
+ }
}
--
Gitblit v1.9.3