From 2079ba28f20bde46f7736699c97abf0e1564770d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 14 十月 2024 09:30:46 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 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 5d5672e..388c717 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,13 +902,13 @@ *鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅 * @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){ @@ -918,6 +916,24 @@ } 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; + } /** *鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵�� -- Gitblit v1.9.3