From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/HkSyncCloudController.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/HkSyncCloudController.java
index 6566b03..c7e21cf 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/HkSyncCloudController.java
@@ -19,10 +19,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -48,7 +45,7 @@
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ラ棬绂佽澶囨帴鍙�")
     @PostMapping("/syncDevices")
     @CloudRequiredPermission("business:hksync:device")
-    public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param) {
+    public ApiResponse syncHkDevices(@RequestBody AcsDeviceListRequest param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncDeviceService.syncHkDevices(param);
         return ApiResponse.success(result);
     }
@@ -56,7 +53,7 @@
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ュ仠杞﹀簱鎺ュ彛")
     @PostMapping("/syncParks")
     @CloudRequiredPermission("business:hksync:park")
-    public ApiResponse syncHkParks(@RequestBody ParkListRequest param) {
+    public ApiResponse syncHkParks(@RequestBody ParkListRequest param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncParkService.syncHkParks(param);
         return ApiResponse.success(result);
     }
@@ -64,35 +61,35 @@
     @ApiOperation("銆愭捣搴枫�戝叏閲忓悓姝ヨ瀹㈡潈闄愮粍鎺ュ彛")
     @PostMapping("/syncPrivilege")
     @CloudRequiredPermission("business:hksync:privilege")
-    public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param) {
+    public ApiResponse syncPrivilege(@RequestBody PrivilegeGroupRequest param,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncPrivilegeService.syncPrivilege(param);
         return ApiResponse.success(result);
     }
 //    @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戦棬绂佷簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
     @PostMapping("/push/acs")
-    public ApiResponse pushAcs(  HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response) {
+    public ApiResponse pushAcs(  HttpServletRequest request,@RequestBody EventAcsRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncPushService.dealAcsEvent(param,response);
         return ApiResponse.success(result);
     }
 //    @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戣瀹簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
     @PostMapping("/push/visit")
-    public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response) {
+    public ApiResponse pushVisit(@RequestBody EventVisitRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncPushService.dealVisitEvent(param,response);
         return ApiResponse.success(result);
     }
 //    @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝仠杞﹀満浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
     @PostMapping("/push/parks")
-    public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response) {
+    public ApiResponse pushParks(@RequestBody EventParkRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String result = hkSyncPushService.dealParkEvent(param,response);
         return ApiResponse.success(result);
     }
     @PreventRepeat
     @ApiOperation("銆愭捣搴枫�戝彇娑堣闃呬簨浠�")
     @PostMapping("/cancelEventSub")
-    public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response) {
+    public ApiResponse cancelEventSub(@RequestBody EventSubRequest param, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
          hkSyncPushService.cancelEventSub();
         return ApiResponse.success(null);
     }

--
Gitblit v1.9.3