From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 16 十月 2024 15:59:38 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 74 +++++++++++++++++++++++++++--------- 1 files changed, 55 insertions(+), 19 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 e9f749e..dbb67f0 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,6 +1,5 @@ package com.doumee.core.haikang.service; -import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.doumee.core.haikang.model.HKConstants; @@ -11,14 +10,11 @@ import com.doumee.core.haikang.model.param.request.*; import com.doumee.core.haikang.model.param.respose.*; import com.doumee.core.utils.Constants; +import com.hikvision.artemis.sdk.config.ArtemisConfig; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import oshi.hardware.Sensors; -import sun.management.Sensor; import java.io.InputStream; import java.lang.reflect.Field; @@ -235,6 +231,8 @@ */ public static InputStream getFaceInputStream(FacePictureRequest param) { log.info("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param)); + log.error("********************ArtemisConfig.host***********************************"+ ArtemisConfig.host); + log.error("********************ArtemisConfig.key********************************"+ArtemisConfig.appKey); try { InputStream res = HKTools.getFaceInputStream(JSONObject.toJSONString(param)); log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================鎴愬姛====\n"); @@ -904,17 +902,35 @@ *鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅 * @return */ - public static BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> getWxConfig(WxConfigInfoRequest param){ + public static BaseResponse< WxConfigInfoResponse> getWxConfig(WxConfigInfoRequest param){ log.info("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.getWxConfig(toMap(param)); TypeReference typeReference = - new TypeReference<BaseResponse<BaseListPageResponse<WxConfigInfoResponse>>>(){}; - BaseResponse<BaseListPageResponse<WxConfigInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType()); + new TypeReference<BaseResponse<WxConfigInfoResponse>>(){}; + BaseResponse<WxConfigInfoResponse> 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<GetTodoListResponse>> getTodoListPage(GetTodoListRequest param){ + log.info("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.getTodoListPage(toMap(param)); + TypeReference typeReference = + new TypeReference<BaseResponse<BaseListPageResponse<GetTodoListResponse>>>(){}; + BaseResponse<BaseListPageResponse<GetTodoListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鍒嗛〉鑾峰彇寰呭姙鍒楄〃"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴峰垎椤佃幏鍙栧緟鍔炲垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage()); } return null; } @@ -971,6 +987,24 @@ return result; }catch (Exception e){ log.error("銆愭捣搴锋煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃銆�================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** + *鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰� + * @return + */ + public static BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> findDeviceAlarmPage(FindDeviceAlarmListRequest param){ + log.info("銆愭捣搴峰垎椤垫煡璇㈣澶囦笅鐨勬墍鏈夋姤璀﹁褰曘��================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.findDeviceAlarmPage(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference<BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>>>(){}; + BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴峰垎椤垫煡璇㈣澶囦笅鐨勬墍鏈夋姤璀﹁褰曘��================澶辫触====锛歕n"+ e.getMessage()); } return null; } @@ -1051,13 +1085,15 @@ * @return */ public static String getMenuUrl(Integer type,String token){ - String menuId = HKConstants.MenuPageId.zhaf; + String menuId = HKConstants.MenuPageId.afzx; if(Constants.equalsInteger(type,Constants.ONE)){ - menuId = HKConstants.MenuPageId.wyhq; + menuId = HKConstants.MenuPageId.xkzx; }else if(Constants.equalsInteger(type,Constants.TWO)){ - menuId = HKConstants.MenuPageId.xzbg; + menuId = HKConstants.MenuPageId.ngzx; }else if(Constants.equalsInteger(type,Constants.THREE)){ - menuId = HKConstants.MenuPageId.yyzx; + menuId = HKConstants.MenuPageId.jsc; + }else if(Constants.equalsInteger(type,Constants.FOUR)){ + menuId = HKConstants.MenuPageId.kqgzt; } log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token); try { @@ -1195,20 +1231,20 @@ return null; } /** - *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級 + *浜鸿劯璇勫垎 * @return */ - public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){ - log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<FacePictureCheckResponse> facePictureCheck(FacePictureCheckRequest param){ + log.info("銆愪汉鑴歌瘎鍒嗐��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.facePictureCheck(JSONObject.toJSONString(param)); TypeReference typeReference = - new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){}; - BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType()); - logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ"); + new TypeReference<BaseResponse<FacePictureCheckResponse>>(){}; + BaseResponse<FacePictureCheckResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"浜鸿劯璇勫垎"); return result; }catch (Exception e){ - log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage()); + log.error("銆愪汉鑴歌瘎鍒嗐��================澶辫触====锛歕n"+ e.getMessage()); } return null; } -- Gitblit v1.9.3