From 3a992a2be8c1cc815719ac76cd7242dd7a2f7c2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 八月 2024 17:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 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 63329d4..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,18 +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;
@@ -40,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);
}
@@ -93,4 +107,16 @@
hkSyncPushService.cancelEventSub();
return ApiResponse.success(null);
}
+ @ApiOperation("銆愭捣搴枫�戞湀鍙板伐浣滅姸鎬佷簨浠舵帹閫�")
+ @PostMapping("/platform/workstatus")
+ public ApiResponse workstatus(@RequestBody EventPlatWorkstatusRequest param, HttpServletResponse response) {
+ hkSyncPushService.dealWorkstatusEvent(param,response);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("銆愭捣搴枫�戞湀鍙拌溅杈嗙姸鎬佷簨浠舵帹閫�")
+ @PostMapping("/platform/carstatus")
+ public ApiResponse carstatus(@RequestBody EventPlatCarstatusRequest param, HttpServletResponse response) {
+ hkSyncPushService.dealCarstatusEvent(param,response);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3