From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 251 insertions(+), 39 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 0d7e426..88e2aa9 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
+import com.doumee.core.haikang.model.param.request.FacePictureCheckRequest;
import com.doumee.core.haikang.service.HKService;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
@@ -28,11 +29,12 @@
public static void main(String[] args) throws Exception {
- ArtemisConfig.host = "10.50.60.253";
- ArtemisConfig.appKey = "27786546";
- ArtemisConfig.appSecret = "kC5dohxU7CvEqgGhVt4R";
+ ArtemisConfig.host = "10.50.250.253:1443";
+
+ ArtemisConfig.appKey = "23154099";
+ ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2";
HKConstants.https = "https://";
- CarPictureRequest param = new CarPictureRequest();
+ /* 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");
InputStream is = HKService.getCarPicture(param);
@@ -51,7 +53,11 @@
outStream.close(); //鍐欏叆鏁版嵁
} catch ( Exception e) {
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)));
}
public static InterfaceLogService interfaceLogService = null;
@@ -234,26 +240,15 @@
Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture[0]);
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
- log.error("=========================ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("=========================ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- try {
- log.error("-------------------------ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("-------------------------ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
- if (200==resp.getStatusLine().getStatusCode()) {
- HttpEntity entity = resp.getEntity();
- InputStream in = entity.getContent();
- return in;
- }else{
- log.error("浜鸿劯涓嬭浇鍑洪敊");
- throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
- }
- }catch (Exception e){
- e.printStackTrace();
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ log.error("浜鸿劯涓嬭浇鍑洪敊");
+ throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
}
- log.error("+++++++++++++++++++++++++ArtemisConfig.host***********************************"+ ArtemisConfig.host);
- log.error("+++++++++++++++++++++++++ArtemisConfig.key********************************"+ArtemisConfig.appKey);
- return null;
}
/**
* 鑾峰彇璁垮璁板綍涓殑鍥剧墖
@@ -308,6 +303,14 @@
}else{
throw new Exception("鏌ヨ杞﹁締鎶撴媿鍥剧墖涓嬭浇鍑洪敊");
}
+ }
+ /**
+ * 鍒嗛〉鑾峰彇寰呭姙鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String getTodoListPage(Map<String, String> body) throws Exception{
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getTodoListPage,body);
}
/**
* 鑾峰彇闂ㄧ鐐瑰垪琛�
@@ -375,15 +378,7 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.visitCancel,body);
}
- 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, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
- saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
- return result;
- }
public static String startDoPostStringArtemis(String[] pathStr,String body ){
Map<String, String> path = getPath(pathStr[0]);
Map<String, String> header = new HashMap<>();
@@ -391,7 +386,21 @@
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 startDoGetStringArtemisJson(String[] pathStr,Map<String,String> body ){
+ Map<String, String> path = getPath(pathStr[0]);
+ Map<String, String> header = new HashMap<>();
+ String result = ArtemisHttpUtil.doGetArtemis(path, body, null, "application/json", header);
+ saveInterfaceLog(JSONObject.toJSONString(body),result,path,pathStr[1]);
+ return result;
}
public static String startDoPostStringArtemis(String[] pathStr,String param,String body ){
Map<String, String> path = getPath(pathStr[0]+StringUtils.defaultString(param,""));
@@ -572,10 +581,13 @@
* 鏍规嵁寰俊鍏紬鍙蜂俊鎭幏鍙朅ccessToken
* @return
*/
- public static String wxAccessToken(String configId,String tagId) {
- String[] wxAccessToken= HKConstants.InterfacePath.wxAccessToken;
- wxAccessToken[0] = HKConstants.InterfacePath.wxAccessToken+"?tagId="+tagId+"&configId"+configId;
- return startDoPostStringArtemis(wxAccessToken,"");
+ public static String wxAccessToken(HashMap<String,String> params ) {
+// String[] wxAccessToken= new String[2];
+// String url = HKConstants.InterfacePath.wxAccessToken[0]+"?tagId="+tagId+"&configId="+configId;
+// String t = HKConstants.InterfacePath.wxAccessToken[1];
+// wxAccessToken[0] = url;
+// wxAccessToken[1] = t;
+ return startDoGetStringArtemisJson(HKConstants.InterfacePath.wxAccessToken,params);
}
/**
* 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅
@@ -741,6 +753,162 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.platformsList,body);
}
/**
+ * 鑾峰彇娑堥槻浼犳劅鍣ㄥ垪琛�
+ * @param body
+ * @return
+ */
+ public static String pageFireChannel(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.pageFireChannel,body);
+ }
+ /**
+ * 鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬乿2
+ * @param body
+ * @return
+ */
+ public static String pageSensorStatus(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.pageSensorStatus,body);
+ }
+ /**
+ * 瀹夐槻鐪嬫澘-浠婃棩鍛婅浜嬩欢-鏍规嵁eventType瀛楁3
+ * @param body
+ * @return
+ */
+ public static String ruleEventSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.ruleEventSearch,body);
+ }
+ /**
+ * 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛�
+ * @param body
+ * @return
+ */
+ public static String getSecureDevStatusList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getSecureDevStatusList,body);
+ }
+ /**
+ * 鑳借�楃湅鏉�-6鎸夋湀鏌ヨ杩�12涓湀鐨勭敤鐢垫�婚噺鏁版嵁
+ * @param body
+ * @return
+ */
+ public static String energyTrend(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.energyTrend,body);
+ }
+ /**
+ * 娑堥槻缁翠繚缁熻
+ * @param body
+ * @return
+ */
+ public static String fireStatistic(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatistic,body);
+ }
+ /**
+ * 娑堥槻缁翠繚姣忔湀鏂板缁熻
+ * @param body
+ * @return
+ */
+ public static String fireStatisticMonth(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireStatisticMonth,body);
+ }
+ /**
+ * 娑堥槻鐪嬫澘-娑堥槻璁惧鍦ㄧ绾�1
+ * @param body
+ * @return
+ */
+ public static String getFireDevStatusTotal(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusTotal,body);
+ }
+ /**
+ * 娑堥槻鐪嬫澘-鍚勭被鍨嬭澶囧湪绾跨巼2
+ * @param body
+ * @return
+ */
+ public static String getFireDevStatusList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getFireDevStatusList,body);
+ }
+ /**
+ *娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻
+ * @param body
+ * @return
+ */
+ public static String findAlarmBaseDataStatistic(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findAlarmBaseDataStatistic,body);
+ }
+ /**
+ *瀹夐槻鐪嬫澘-- b
+ * @param body
+ * @return
+ */
+ public static String findHomeAlarmInfoPage(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findHomeAlarmInfoPage,body);
+ }
+ /**
+ *淇濆瓨鐢ㄦ埛鍙妎penId缁戝畾淇℃伅寰俊鍏紬鍙�
+ * @param body
+ * @return
+ */
+ public static String userOpenidSave(String body) {
+ Map<String,String> header = new HashMap<>();
+ header.put("userId","admin");
+ return startDoPostStringArtemis(HKConstants.InterfacePath.userOpenidSave,null,header,body);
+ }
+ /**
+ *鍒嗛〉鏌ヨ璁惧鐩戞祴鍘嗗彶鏁版嵁
+ * @param body
+ * @return
+ */
+ public static String minitorDataSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.minitorDataSearch,body);
+ }
+ /**
+ * 缁熻鍥尯鎬讳綋鐨勫畨闃茶澶囨暟閲忥紝鍦ㄧ嚎鏁般�佸湪绾跨巼銆佺绾挎暟銆佺绾跨巼
+ * @param body
+ * @return
+ */
+ public static String getSecureDevStatusTotal(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.getSecureDevStatusTotal,body);
+ }
+ /**
+ * 缁熷畨闃茬湅鏉�--鍥尯瀹炴椂杞︽暟閲�4
+ * @return
+ */
+ public static String getParkingStatistics() {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getParkingStatistics,null);
+ }
+ /**
+ * 鑳借�楃湅鏉�-1.鑾峰彇鏈湀鐢ㄨ兘鎬婚噺-鑷劧鏈�
+ * @return
+ */
+ public static String getCurrentMonthDataByMeterType(Map<String,String> powerType) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getCurrentMonthDataByMeterType,powerType);
+ }
+ /**
+ * 鑳借�楃湅鏉�-2.鑾峰彇鍖哄煙鐢ㄨ兘鍓峃浣�
+ * @return
+ */
+ public static String regionTopPower(Map<String,String> params) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.regionTopPower,params);
+ }
+ /**
+ * 鑳借�楃湅鏉�-3.鑾峰彇鍚勫尯鍩熺敤鑳藉強鎬昏兘鑰�
+ * @return
+ */
+ public static String regionEnergyList(Map<String,String> params) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.regionEnergyList,params);
+ }
+ /**
+ * 鑳借�楃湅鏉�-4.鑾峰彇涓婃湀鐢ㄨ兘璐圭敤锛屼竴澶╁埛鏂帮紝鍑屾櫒鏌愪釜鐐瑰埛
+ * @return
+ */
+ public static String lastMonthFeeByMeterType(Map<String,String> params) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.lastMonthFeeByMeterType,params);
+ }
+ /**
+ * 鑳借�楃湅鏉�-5.鍥尯瀹炴椂璐熻嵎鏇茬嚎
+ * @return
+ */
+ public static String energyTodayLoadData( ) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.energyTodayLoadData,null);
+ }
+ /**
* 鑾峰彇鏈堝彴鐘舵��
* @return
*/
@@ -751,6 +919,50 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,null);
}
}
+
+ /**
+ * 鑾峰彇鑿滃崟
+ * @param body
+ * @return
+ */
+ public static String getHkMenu(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.getMenus,body);
+ }
+ /**
+ * 鍒嗛〉鑾峰彇鍖哄煙鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String pageRegions(Map<String,String> header,String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.pageRegions,null,header,body);
+ }
+ /**
+ * 鍒嗛〉鑾峰彇鐩戞帶鐐硅祫婧�
+ * @param body
+ * @return
+ */
+ public static String pageCameras(Map<String,String> header,String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.pageCameras,null,header,body);
+ }
+ /**
+ * 鑾峰彇鐩戞帶鐐归瑙堝彇娴乁RL
+ * @param body
+ * @return
+ */
+ public static String cameraPreviewURLs(Map<String,String> header,String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.cameraPreviewURLs,null,header,body);
+ }
+
+
+ /**
+ * 鍙戦�佺煭淇￠獙璇佺爜
+ * @param body
+ * @return
+ */
+ public static String sendSms(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sendSms,body);
+ }
+
/**
* 鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
* @param body
@@ -802,9 +1014,9 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.applyST,body);
}
- public static String getMenuUrl(String menuId, String token) {
+ public static String getMenuUrl(String componentId,String menuId, String token) {
String url = HKConstants.InterfacePath.goMenuUrl[0];
- url = url.replace("${menuId}", menuId).replace("${token}",token);
+ url = url.replace("${componentId}",componentId).replace("${menuId}", menuId).replace("${token}",token);
return url;
}
}
--
Gitblit v1.9.3