From a1e663eeb588f419b1622ca07b23fb9d44292ee9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
index 54e296f..144d6dc 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java
@@ -1,20 +1,15 @@
package com.doumee.api.business;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.haikang.model.param.request.AcsDeviceListRequest;
-import com.doumee.core.haikang.model.param.request.EventSubRequest;
-import com.doumee.core.haikang.model.param.request.ParkListRequest;
-import com.doumee.core.haikang.model.param.request.PrivilegeGroupRequest;
+import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatCarstatusRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatWorkstatusRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
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.impl.hksync.HkSyncPushServiceImpl;
+import com.doumee.dao.business.model.Device;
+import com.doumee.service.business.impl.hksync.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,12 +37,29 @@
private HkSyncPrivilegeServiceImpl hkSyncPrivilegeService;
@Autowired
private HkSyncPushServiceImpl hkSyncPushService;
-
+ @Autowired
+ private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ユ湀鍙颁俊鎭帴鍙�")
+ @PostMapping("/syncPlatforms")
+ @RequiresPermissions("business:hksync:platforms")
+ public ApiResponse syncPlatforms(@RequestBody PlatformsListRequest param) {
+ String result = hkSyncPlatformsService.syncPlatforms(param);
+ return ApiResponse.success(result);
+ }
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ユ湀鍙扮姸鎬佷俊鎭帴鍙�")
+ @PostMapping("/syncPlatformStatus")
+ @RequiresPermissions("business:hksync:platforms")
+ public ApiResponse syncPlatformStatus(@RequestBody PlatformStatusRequest param) {
+ String result = hkSyncPlatformsService.getPlatformStatus(param);
+ return ApiResponse.success(result);
+ }
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
@PostMapping("/syncDevices")
@RequiresPermissions("business:hksync:device")
- public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
+ public ApiResponse syncHkDevices(@RequestBody Device param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
}
--
Gitblit v1.9.3