From 5dc5e8d0a24e0b0111bb9e9703285c3c3e3342e4 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 26 三月 2025 16:48:09 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 87 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 insertions(+), 5 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 aad1de4..ab3c0f5 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,13 @@ 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.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 +38,19 @@ ArtemisConfig.appKey = "23154099"; ArtemisConfig.appSecret = "88wFsg3xfn7o8QMsWEO2"; HKConstants.https = "https://"; + + ParkReservationAddRequest request = new ParkReservationAddRequest(); + request.setPlateNo("鐨朅90LL0"); + request.setParkSyscode("1c4cdb8b66ed4c23bacb385c3fb6c46b"); + request.setPhoneNo("15345690849"); + request.setOwner("鏂芥棴杈�"); + request.setAllowTimes(Constants.ONE+""); + request.setIsCharge(Constants.ONE+""); + request.setStartTime( DateUtil.getISO8601Timestamp2(new Date()) ); + request.setEndTime( "2025-03-27T00:00:00+08:00" ); + String response = parkAddition(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 +72,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; @@ -322,6 +339,23 @@ 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); + } /** * 鑾峰彇闂ㄧ鐐瑰垪琛� @@ -417,6 +451,12 @@ 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<>(); @@ -448,6 +488,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); } /** * 璁垮鏉冮檺缁� @@ -796,7 +852,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); } /** * 瀹夐槻鐪嬫澘-鍥尯瀹夐槻璁惧-鍚勭被鍨嬭澶囩姸鎬佹暟鎹垪琛� @@ -846,6 +904,15 @@ 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); + } /** *娑堥槻鐪嬫澘-4鎶ヨ淇℃伅缁熻 * @param body @@ -874,12 +941,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