From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 7 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 88e2aa9..d305617 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
@@ -1,9 +1,14 @@
package com.doumee.core.haikang.model;
import com.alibaba.fastjson.JSONObject;
+import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
+import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
+import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
@@ -34,6 +39,12 @@
ArtemisConfig.appKey = "23154099";
ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2";
HKConstants.https = "https://";
+
+ VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest();
+ request.setAppointRecordIds(new String[]{"鐨朅90LL0"});
+ String response = iccmCancelAppointment(JSONObject.toJSONString(request));
+ System.out.println(response);
+
/* CarPictureRequest param = new CarPictureRequest();
param.setPicUri( "HKIMG=/pic?0dd400=4c40ip-feo831-933*9o4=3=2109*2l0001893117*0t7=6*2ps==014b*=787d*069d70361-95754d-9*l108od0b192=001");
param.setAswSyscode("3fa3e5e3-db3e-41ba-97fc-39c948778dfe");
@@ -55,9 +66,9 @@
throw new RuntimeException(e);
}*/
- FacePictureCheckRequest param = new FacePictureCheckRequest();
- param.setFacePicUrl("http://10.50.250.253:8088/file/member/20241016/d0cded86-a55d-43be-bc01-4f628a1400cf.jpg");
- System.out.println(facePictureCheck(JSONObject.toJSONString(param)));
+// FacePictureCheckRequest param = new FacePictureCheckRequest();
+// param.setFacePicUrl("http://10.50.250.253:8088/file/member/20241016/d0cded86-a55d-43be-bc01-4f628a1400cf.jpg");
+// System.out.println(facePictureCheck(JSONObject.toJSONString(param)));
}
public static InterfaceLogService interfaceLogService = null;
@@ -312,6 +323,34 @@
public static String getTodoListPage(Map<String, String> body) throws Exception{
return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
}
+
+ /**
+ *娑堥槻鐪嬫澘-4娓╂箍搴︽暟鎹�
+ * @param body
+ * @return
+ */
+ public static String temperatureHumidityDataStatistic(String body) {
+ return startDoPostStringArtemisAdmin(HKConstants.InterfacePath.temperatureHumidityDataStatistic,body);
+ }
+
+ /**
+ *娑堥槻鐪嬫澘-4鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕-鑳借�楃湅鏉�
+ * @param body
+ * @return
+ */
+ public static String regionDataRanking(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.regionDataRanking,body);
+ }
+
+ /**
+ *娑堥槻鐪嬫澘-4鏍规嵁鏃堕棿鍜屾椂闂寸淮搴﹁幏鍙栧洯鍖鸿兘鑰楁暟鎹�
+ * @param body
+ * @return
+ */
+ public static String energyTotal(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.energyTotal,body);
+ }
+
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
* @param body
@@ -387,12 +426,29 @@
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
}
+
+
+ public static String startDoPostStringArtemisAdmin(String[] pathStr,String body){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ header.put("userId", "admin");
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path,pathStr[1]);
+ return result;
+ }
+
public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
String result = ArtemisHttpUtil.doGetArtemis(path, body, null, null, header);
saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
+ }
+ public static String startDoGetStringArtemis(String[] pathStr,Map<String,String> querys ,Map<String, String> header ){
+ Map<String, String> path = getPath(pathStr[0]);
+ String result = ArtemisHttpUtil.doGetArtemis(path, querys, null, null, header);
+ saveInterfaceLog(JSONObject.toJSONString(querys),result,path,pathStr[1]);
return result;
}
public static String startDoGetStringArtemisJson(String[] pathStr,Map<String,String> body ){
@@ -409,15 +465,15 @@
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
+
+
public static String startDoPostStringArtemis(String[] pathStr,Map<String, String> querys,Map<String, String> header,String body){
Map<String, String> path = getPath(pathStr[0]);
header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
saveInterfaceLog(body,result,path,pathStr[1]);
return result;
-
}
/**
* 绛剧璁垮棰勭害
@@ -426,6 +482,22 @@
*/
public static String visitOut(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.visitOut,body);
+ }
+ /**
+ * iccm绛剧璁垮棰勭害
+ * @param body
+ * @return
+ */
+ public static String iccmSignoff(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmSignoff,body);
+ }
+ /**
+ * iccm鍙栨秷璁垮棰勭害
+ * @param body
+ * @return
+ */
+ public static String iccmCancelAppointment(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.iccmCancelAppointment,body);
}
/**
* 璁垮鏉冮檺缁�
@@ -774,7 +846,9 @@
* @return
*/
public static String ruleEventSearch(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,body);
+ Map<String,String> header = new HashMap<>();
+ header.put("User-Id","admin");
+ return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,null,header,body);
}
/**
* 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛�
@@ -824,6 +898,23 @@
public static String getFireDevStatusList(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusList,body);
}
+
+ /**
+ * 鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁�
+ * @param body
+ * @return
+ */
+ public static String findDeviceStatistics(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceStatistics,body);
+ }
+ /**
+ * 銆愭捣搴锋秷闃茬湅鏉裤�戞牴鎹潯浠舵煡璇㈢洰褰曚笅鏈夋潈闄愮殑璧勬簮鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String resourcesByParams(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.resourcesByParams,body);
+ }
/**
*娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
* @param body
@@ -832,6 +923,7 @@
public static String findAlarmBaseDataStatistic(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
}
+
/**
*瀹夐槻鐪嬫澘-- b
* @param body
@@ -851,12 +943,22 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.userOpenidSave,null,header,body);
}
/**
+ *閫氳繃openId鎴杣serName绛夊垹闄ょ粦瀹氫俊鎭�
+ * @param param
+ * @return
+ */
+ public static String userOpenidDel(Map<String,String> param) {
+ Map<String,String> header = new HashMap<>();
+ header.put("userId","admin");
+ return startDoGetStringArtemis(HKConstants.InterfacePath.userOpenidDel,param,header);
+ }
+ /**
*鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
* @param body
* @return
*/
public static String minitorDataSearch(String body) {
- return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearch,body);
+ return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearchV1,body);
}
/**
* 缁熻鍥尯鎬讳綋鐨勫畨闃茶澶囨暟閲忥紝鍦ㄧ嚎鏁般�佸湪绾跨巼銆佺绾挎暟銆佺绾跨巼
--
Gitblit v1.9.3