From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 79bd91b..66055b0 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
@@ -3,6 +3,7 @@
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.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.event.acs.EventAcsRequest;
@@ -18,7 +19,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
/**
* @author 姹熻箘韫�
@@ -40,32 +45,32 @@
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
- @PostMapping("/getDevices")
+ @PostMapping("/syncDevices")
// @RequiresPermissions("business:hksync:device")
- public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
+ public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
String result = hkSyncDeviceService.syncHkDevices(param);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
- @PostMapping("/getParks")
+ @PostMapping("/syncParks")
// @RequiresPermissions("business:hksync:park")
- public ApiResponse getParks(@RequestBody ParkListRequest param) {
+ public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
String result = hkSyncParkService.syncHkParks(param);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
- @PostMapping("/getPrivilege")
+ @PostMapping("/syncPrivilege")
// @RequiresPermissions("business:hksync:privilege")
- public ApiResponse getPrivilege(@RequestBody PrivilegeGroupRequest param) {
+ public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
String result = hkSyncPrivilegeService.syncPrivilege(param);
return ApiResponse.success(result);
}
@PreventRepeat
@ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/acs")
- public ApiResponse pushAcs(@RequestBody EventAcsRequest param, HttpServletResponse response) {
+ public ApiResponse pushAcs( HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) {
String result = hkSyncPushService.dealAcsEvent(param,response);
return ApiResponse.success(result);
}
@@ -83,4 +88,11 @@
String result = hkSyncPushService.dealParkEvent(param,response);
return ApiResponse.success(result);
}
+ @PreventRepeat
+ @ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
+ @PostMapping("/cancelEventSub")
+ public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response) {
+ hkSyncPushService.cancelEventSub();
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3