From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +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 | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 485b0fc..470fd3e 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");
@@ -387,7 +385,7 @@
public static BaseResponse parkReservationDeletion(ParkReservationDelRequest param){
log.info("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
+ String res = HKTools.parkDeletion(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse>(){};
BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
@@ -926,7 +924,7 @@
public static BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> fireDeviceStatusSearch(FireDeviceStatuslListRequest param){
log.info("銆愭捣搴锋煡璇㈡秷闃茶澶囬儴浠剁姸鎬併��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireDeviceStatusSearch(toMap(param));
+ String res = HKTools.fireDeviceStatusSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -944,7 +942,7 @@
public static BaseResponse<BaseListPageResponse<SensorStatusListResponse>> sensorStatusSearch(SensorStatusListRequest param){
log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�併��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.sensorStatusSearch(toMap(param));
+ String res = HKTools.sensorStatusSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){};
BaseResponse<BaseListPageResponse<SensorStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -963,7 +961,7 @@
public static BaseResponse<BaseListPageResponse<FireChannelListResponse>> fireChannelSearch(FireChannelListRequest param){
log.info("銆愭捣搴锋煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireChannelSearch(toMap(param));
+ String res = HKTools.fireChannelSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireChannelListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -975,13 +973,31 @@
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;
+ }
+ /**
*璇㈡秷闃茶澶囧垪琛�
* @return
*/
public static BaseResponse<BaseListPageResponse<FireDeviceListResponse>> fireDeviceSearch(FireDeviceListRequest param){
log.info("銆愭捣搴疯娑堥槻璁惧鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireDeviceSearch(toMap(param));
+ String res = HKTools.fireDeviceSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireDeviceListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -1051,13 +1067,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.kqgl;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
@@ -1338,7 +1356,6 @@
log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n" + e.getMessage());
}
return null;
-
}
/**
*鍙戦�佹秷鎭粰LED
--
Gitblit v1.9.3