From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 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..2de1007 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;
@@ -15,10 +16,15 @@
 import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
 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.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 /**
  * @author 姹熻箘韫�
@@ -40,47 +46,54 @@
 
     @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
-    @PostMapping("/getDevices")
-//    @RequiresPermissions("business:hksync:device")
-    public ApiResponse getDevices(@RequestBody AcsDeviceListRequest param) {
+    @PostMapping("/syncDevices")
+    @RequiresPermissions("business:hksync:device")
+    public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
         String result = hkSyncDeviceService.syncHkDevices(param);
         return ApiResponse.success(result);
     }
     @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
-    @PostMapping("/getParks")
-//    @RequiresPermissions("business:hksync:park")
-    public ApiResponse getParks(@RequestBody ParkListRequest param) {
+    @PostMapping("/syncParks")
+    @RequiresPermissions("business:hksync:park")
+    public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
         String result = hkSyncParkService.syncHkParks(param);
         return ApiResponse.success(result);
     }
     @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
-    @PostMapping("/getPrivilege")
-//    @RequiresPermissions("business:hksync:privilege")
-    public ApiResponse getPrivilege(@RequestBody PrivilegeGroupRequest param) {
+    @PostMapping("/syncPrivilege")
+    @RequiresPermissions("business:hksync:privilege")
+    public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
         String result = hkSyncPrivilegeService.syncPrivilege(param);
         return ApiResponse.success(result);
     }
-    @PreventRepeat
+//    @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);
     }
-    @PreventRepeat
+//    @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
     @PostMapping("/push/visit")
     public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response) {
         String result = hkSyncPushService.dealVisitEvent(param,response);
         return ApiResponse.success(result);
     }
-    @PreventRepeat
+//    @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
     @PostMapping("/push/parks")
     public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response) {
         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