From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 a8b19f2..65d569e 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
@@ -15,9 +15,12 @@
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.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
+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;
import com.doumee.core.utils.DESUtil;
import com.doumee.dao.business.model.Device;
@@ -30,11 +33,9 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.Cacheable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -56,6 +57,8 @@
private HkSyncPlatformsServiceImpl hkSyncPlatformsService;
@Autowired
private HkSyncDeviceServiceImpl hkSyncDeviceService;
+ @Autowired
+ private BoardService boardService;
@Autowired
private HkSyncParkServiceImpl hkSyncParkService;
@Autowired
@@ -261,8 +264,8 @@
String hkToken = DESUtil.generateTokenToHk(loginUserInfo.getUsername(),Integer.valueOf(
systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_TOKEN_VALIDITY).getCode()
),redisTemplate);
- String url = 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){
@@ -295,6 +298,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