From a8c8e4281c0298ce9a946b1d65166a2fe438ce1c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 09:04:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 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 45f38c0..e9f749e 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,5 +1,6 @@
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;
@@ -15,6 +16,9 @@
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;
@@ -383,7 +387,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());
@@ -897,6 +901,116 @@
return null;
}
/**
+ *鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<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());
+ logResult(result,"娴峰悍鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋牴鎹厤缃井淇″叕浼楀彿缂栧彿鏌ヨ寰俊鍏紬鍙蜂俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ *鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> fireDeviceStatusSearch(FireDeviceStatuslListRequest param){
+ log.info("銆愭捣搴锋煡璇㈡秷闃茶澶囬儴浠剁姸鎬併��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireDeviceStatusSearch(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> 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<SensorStatusListResponse>> sensorStatusSearch(SensorStatusListRequest param){
+ log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�併��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.sensorStatusSearch(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<SensorStatusListResponse>> 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<FireChannelListResponse>> fireChannelSearch(FireChannelListRequest param){
+ log.info("銆愭捣搴锋煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireChannelSearch(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireChannelListResponse>> 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(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireDeviceListResponse>> 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<NhEventPageListResponse>> nhEventPageList(NhEventPageListRequest param){
+ log.info("銆愭捣搴峰垎椤佃幏鍙栧憡璀︿簨浠躲��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.nhEventPageList(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<NhEventPageListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<NhEventPageListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍒嗛〉鑾峰彇鍛婅浜嬩欢");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰垎椤佃幏鍙栧憡璀︿簨浠躲��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*鏌ヨ璁垮鏉ヨ璁板綍锛堝凡鐧昏锛夛紙鍒嗛〉锛�
* @return
*/
@@ -939,11 +1053,11 @@
public static String getMenuUrl(Integer type,String token){
String menuId = HKConstants.MenuPageId.zhaf;
if(Constants.equalsInteger(type,Constants.ONE)){
-
+ menuId = HKConstants.MenuPageId.wyhq;
}else if(Constants.equalsInteger(type,Constants.TWO)){
-
+ menuId = HKConstants.MenuPageId.xzbg;
}else if(Constants.equalsInteger(type,Constants.THREE)){
-
+ menuId = HKConstants.MenuPageId.yyzx;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
@@ -1224,7 +1338,6 @@
log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n" + e.getMessage());
}
return null;
-
}
/**
*鍙戦�佹秷鎭粰LED
--
Gitblit v1.9.3