From deb2a67c1a9824b288ce4a7a228347ffd60964fe Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 24 九月 2024 18:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 9 ++++-----
1 files changed, 4 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 485b0fc..31f76aa 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
@@ -926,7 +926,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 +944,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 +963,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());
@@ -981,7 +981,7 @@
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());
@@ -1338,7 +1338,6 @@
log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n" + e.getMessage());
}
return null;
-
}
/**
*鍙戦�佹秷鎭粰LED
--
Gitblit v1.9.3