From d2902daad7261ac7d0148dbb9f33f39e52d433f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 16 八月 2024 18:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 7b55f11..019195d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -10,6 +10,7 @@
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.tomcat.util.bcel.Const;
@@ -324,7 +325,7 @@
* @return
*/
public static String acsDeviceTimeRangeList(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceList,body);
+ return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceTimeRangeList,body);
}
/**
* 璁垮棰勭害
@@ -625,11 +626,14 @@
}
/**
* 鑾峰彇鏈堝彴鐘舵��
- * @param body
* @return
*/
- public static String platformStatus(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,body);
+ public static String platformStatus(String param) {
+ if(StringUtils.isNotBlank(param)){
+ return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus+"?platformIds="+param,null);
+ }else{
+ return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,null);
+ }
}
/**
* 鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
--
Gitblit v1.9.3