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 | 252 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 240 insertions(+), 12 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 75523a2..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,11 +426,35 @@ 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 ){ + 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; } @@ -402,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; - } /** * 绛剧璁垮棰勭害 @@ -419,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); } /** * 璁垮鏉冮檺缁� @@ -574,10 +653,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); } /** * 鏍规嵁閰嶇疆寰俊鍏紬鍙风紪鍙锋煡璇㈠井淇″叕浼楀彿淇℃伅 @@ -764,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); } /** * 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛� @@ -775,12 +859,156 @@ 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); + } + + /** + * 鍒嗛〉鏌ヨ璁惧鐨勪互鍙婁笅灞炰紶鎰熷櫒鏁版嵁鐨勭姸鎬佺粺璁� + * @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 + * @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); + } + /** + *閫氳繃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.minitorDataSearchV1,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); } /** * 鑾峰彇鏈堝彴鐘舵�� @@ -888,9 +1116,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