From 50353c2ae43cdddb8433358f4ba66bef30c5d628 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index a790359..69c2337 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -1,19 +1,16 @@
 package com.doumee.core.haikang.service;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
 import com.doumee.core.haikang.model.HKConstants;
 import com.doumee.core.haikang.model.HKTools;
 import com.doumee.core.haikang.model.param.BaseListPageResponse;
 import com.doumee.core.haikang.model.param.BaseRequst;
 import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.BaseListPageRequest;
 import com.doumee.core.haikang.model.param.request.*;
 import com.doumee.core.haikang.model.param.respose.*;
 import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.HttpsUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +22,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 @Slf4j
 public class HKService {
@@ -1431,6 +1427,103 @@
         return  null;
     }
     /**
+     *鍒嗛〉鑾峰彇鍖哄煙鍒楄〃锛堝垎椤碉級
+     * @return
+     */
+    public  static  BaseResponse<BaseListPageResponse<PageRegionInfoResponse>>   pageRegions(BaseListPageRequest param){
+        log.info("銆愭捣搴峰垎椤佃幏鍙栧尯鍩熷垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            Map<String ,String> header = new HashMap<>();
+//            header.put("userId",param.getUserId());
+            String res = HKTools.pageRegions(header,JSONObject.toJSONString(param));
+            TypeReference typeReference =
+                    new TypeReference< BaseResponse<BaseListPageResponse<PageRegionInfoResponse>> >(){};
+            BaseResponse<BaseListPageResponse<PageRegionInfoResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
+            logResult(result,"娴峰悍鍒嗛〉鑾峰彇鍖哄煙鍒楄〃");
+            return  result;
+        }catch (Exception e){
+            log.error("銆愭捣搴峰垎椤佃幏鍙栧尯鍩熷垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage());
+        }
+        return  null;
+    }
+    /**
+     *鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL
+     * @return
+     */
+    public  static  BaseResponse<CamerasPreviewURLsResponse>   cameraPreviewURLs(CameraPreviewURLsRequest param){
+        log.info("銆愭捣搴疯幏鍙栫洃鎺х偣棰勮鍙栨祦URL銆�================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            Map<String ,String> header = new HashMap<>();
+//            header.put("userId",param.getUserId());
+//            header.put("domainId ",param.getDomainId());
+            String res = HKTools.cameraPreviewURLs(header,JSONObject.toJSONString(param));
+            TypeReference typeReference =
+                    new TypeReference< BaseResponse<CamerasPreviewURLsResponse> >(){};
+            BaseResponse<CamerasPreviewURLsResponse> result = JSONObject.parseObject(res, typeReference.getType());
+            logResult(result,"娴峰悍鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL");
+            return  result;
+        }catch (Exception e){
+            log.error("銆愭捣搴疯幏鍙栫洃鎺х偣棰勮鍙栨祦URL銆�================澶辫触====锛歕n"+ e.getMessage());
+        }
+        return  null;
+    }
+    /**
+     *鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧愶紙鍒嗛〉锛�
+     * @return
+     */
+    public  static  BaseResponse<BaseListPageResponse<PageCameraInfoResponse>>   pageCameras(BaseListPageRequest param){
+        log.info("銆愭捣搴峰垎椤佃幏鍙栫洃鎺х偣璧勬簮銆�================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            Map<String ,String> header = new HashMap<>();
+            header.put("userId",param.getUserId());
+            String res = HKTools.pageCameras(header,JSONObject.toJSONString(param));
+            TypeReference typeReference =
+                    new TypeReference< BaseResponse<BaseListPageResponse<PageCameraInfoResponse>> >(){};
+            BaseResponse<BaseListPageResponse<PageCameraInfoResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
+            logResult(result,"娴峰悍鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�");
+            return  result;
+        }catch (Exception e){
+            log.error("銆愭捣搴峰垎椤佃幏鍙栫洃鎺х偣璧勬簮銆�================澶辫触====锛歕n"+ e.getMessage());
+        }
+        return  null;
+    }
+    /**
+     *鑾峰彇娑堥槻浼犳劅鍣ㄥ垪琛紙鍒嗛〉锛�
+     * @return
+     */
+    public  static  BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>>   pageFireChannel(BaseListPageRequest param){
+        log.info("銆愭捣搴峰垎椤佃幏鍙栨秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            String res = HKTools.pageFireChannel(JSONObject.toJSONString(param));
+            TypeReference typeReference =
+                    new TypeReference< BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>> >(){};
+            BaseResponse<BaseListPageResponse<PageFireChannelInfoResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
+            logResult(result,"娴峰悍鍒嗛〉鑾峰彇娑堥槻浼犳劅鍣ㄥ垪琛�");
+            return  result;
+        }catch (Exception e){
+            log.error("銆愭捣搴峰垎椤佃幏鍙栨秷闃蹭紶鎰熷櫒鍒楄〃銆�================澶辫触====锛歕n"+ e.getMessage());
+        }
+        return  null;
+    }
+    /**
+     *鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬乿2锛堝垎椤碉級
+     * @return
+     */
+    public  static  BaseResponse<BaseListPageResponse<PageSensorStatusResponse>>   pageSensorStatus(SensorStatusListRequest param){
+        log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�乿2銆�================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            String res = HKTools.pageSensorStatus(JSONObject.toJSONString(param));
+            TypeReference typeReference =
+                    new TypeReference< BaseResponse<BaseListPageResponse<PageSensorStatusResponse>> >(){};
+            BaseResponse<BaseListPageResponse<PageSensorStatusResponse>>   result = JSONObject.parseObject(res, typeReference.getType());
+            logResult(result,"娴峰悍鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬乿2");
+            return  result;
+        }catch (Exception e){
+            log.error("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�乿2銆�================澶辫触====锛歕n"+ e.getMessage());
+        }
+        return  null;
+    }
+    /**
      *鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
      * @return
      */

--
Gitblit v1.9.3