From 0883b709d59a21fcd930208387be9ea07076886a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 八月 2024 17:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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..f13409d 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);
}
/**
* 璁垮棰勭害
@@ -333,6 +334,22 @@
*/
public static String visitAppiontment(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.visitAppiontment,body);
+ }
+ /**
+ * 璁垮棰勭害
+ * @param body
+ * @return
+ */
+ public static String iccmAppointment(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointment,body);
+ }
+ /**
+ * 璁垮鍏嶇櫥璁伴绾�
+ * @param body
+ * @return
+ */
+ public static String iccmAppointmentMDJ(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentMDJ,body);
}
/**
* 璁垮鍏嶇櫥璁伴绾�
@@ -510,6 +527,15 @@
public static String appointmentRecords(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.appointmentRecords,body);
}
+
+ /**
+ * 鑾峰彇璁垮棰勭害璁板綍鍒楄〃 iccm
+ * @param body
+ * @return
+ */
+ public static String iccmAppointmentRecords(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmAppointmentRecords,body);
+ }
/**
* 鑾峰彇鍏ㄩ噺缁勭粐鍒楄〃
* @param body
@@ -625,11 +651,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