From 8c4dfb07d551ceb372887ff8f22bd1f574d0347b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 31 十月 2025 11:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index fe24fd8..5d1cdd4 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -7,6 +7,7 @@
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.config.jwt.JwtProperties;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
@@ -15,7 +16,10 @@
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.dao.web.response.platformReport.CarmeraListVO;
+import com.doumee.service.business.third.BoardService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
@@ -54,6 +58,8 @@
private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
@Autowired
private HkSyncDeviceServiceImpl hkSyncDeviceService;
+ @Autowired
+ private BoardService boardService;
@Autowired
private HkSyncParkServiceImpl hkSyncParkService;
@Autowired
@@ -166,6 +172,14 @@
String result = hkSyncPushService.dealVisitEvent(param,response);
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴枫�戝叾浠栬闃呬簨浠惰闃呮帹閫佸鎺ュ鐞嗘帴鍙�")
+ @PostMapping("/push/notice")
+ @LoginNoRequired
+ public ApiResponse pushNotice(@RequestBody EventVisitRequest param, HttpServletResponse response){
+ String result = hkSyncPushService.dealVisitEvent(param,response);
+
+ return ApiResponse.success(result);
+ }
@ApiOperation("銆愭捣搴枫�戣瀹CCM浜嬩欢璁㈤槄鎺ㄩ�佸鎺ュ鐞嗘帴鍙�")
@PostMapping("/push/visitIccm")
@LoginNoRequired
@@ -259,8 +273,8 @@
String hkToken = DESUtil.generateTokenToHk(loginUserInfo.getUsername(),Integer.valueOf(
systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_TOKEN_VALIDITY).getCode()
),redisTemplate);
- String url = (type==6?"":(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
- systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode()))
+ String url = (systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HTTPS).getCode() +
+ systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_HOST).getCode())
+ HKService.getMenuUrl(type,hkToken);
try {
if(redisTemplate!=null&& jwtProperties!=null){
@@ -293,6 +307,36 @@
return ApiResponse.success(result);
}
+ @ApiOperation("銆愭捣搴枫�戣幏鍙栧叏閮ㄧ洃鎺у尯鍩熸爲褰㈢粨鏋�")
+ @PostMapping("/regionList")
+ public ApiResponse<List<PageRegionInfoResponse> > getRegionList(HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ){
+ CarmeraListVO param =new CarmeraListVO();
+ param.setWithCameras(0);
+ List<PageRegionInfoResponse> result = new ArrayList<>();
+ try {
+// result = boardService.getRegionTree( param);
+ //------TODO---------娴嬭瘯妯℃嫙鏁版嵁----start-----
+ for (int i = 0; i < 5; i++) {
+ PageRegionInfoResponse t = new PageRegionInfoResponse();
+ t.setName("鎬诲尯鍩焈"+i);
+ t.setIndexCode(i+"_code");
+ t.setChildList(new ArrayList<>());
+ for (int j = 0; j < 5; j++) {
+ PageRegionInfoResponse t1 = new PageRegionInfoResponse();
+ t1.setName("瀛愬尯鍩焈"+i+"_"+j);
+ t1.setIndexCode(i+"_"+j+"_ChildCode");
+ t1.setParentIndexCode(t.getIndexCode());
+ t.getChildList().add(t1);
+ }
+ result.add(t);
+ }
+ //------TODO---------娴嬭瘯妯℃嫙鏁版嵁----end-----
+ }catch (Exception e){
+
+ }
+ return ApiResponse.success(result);
+ }
+
@ApiOperation("銆愭捣搴枫�戣缃甃ED灞忔枃妗�")
--
Gitblit v1.9.3