From 1140f80aefef30b543c99aaed47bcbca731b24e2 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 08 十二月 2023 18:21:40 +0800 Subject: [PATCH] 海康接口对接开发 --- server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 232 ++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 153 insertions(+), 79 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java index 4e57687..123e5b6 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java +++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java @@ -9,8 +9,11 @@ import com.doumee.core.haikang.model.HKTools; import com.doumee.core.haikang.model.param.BaseRequst; import com.doumee.core.haikang.model.param.BaseResponse; +import com.doumee.dao.business.model.InterfaceLog; +import com.doumee.service.business.InterfaceLogService; import com.hikvision.artemis.sdk.config.ArtemisConfig; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,55 +23,43 @@ import com.alibaba.fastjson.TypeReference; import java.io.InputStream; +import java.util.Date; import java.util.List; -@Service @Slf4j public class HKService { private Logger logger = LoggerFactory.getLogger(HKService.class); - @Autowired - private SystemDictDataBiz systemDictDataBiz; - - @PostConstruct - public int initHkConfig(){ - ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode(); - ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode(); - ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode(); - HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode(); - return 0; - } /** * 鑾峰彇鏍圭粍缁囨暟鎹� * @return */ - public BaseResponse<OrgListResponse> getRootOrg(BaseRequst param){ - log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�===="); + public static BaseResponse<OrgListResponse> getRootOrg(BaseRequst param){ + log.info("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�===="); try { String res = HKTools.getRootOrg (); TypeReference typeReference = new TypeReference< BaseResponse<OrgListResponse>>(){}; BaseResponse<OrgListResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鑾峰彇鏍圭粍缁�"); return result; }catch (Exception e){ log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================澶辫触====锛歕n"+ e.getMessage()); } return null; - } /** * 淇敼缁勭粐鏁版嵁 * @return */ - public BaseResponse editOrg(OrgEditRequest param){ - log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse editOrg(OrgEditRequest param){ + log.info("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.editOrg(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍淇敼缁勭粐"); return result; }catch (Exception e){ log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================澶辫触====锛歕n"+ e.getMessage()); @@ -79,15 +70,15 @@ *鎵归噺鏂板缁勭粐鏁版嵁 * @return */ - public BaseResponse<OrgOrUserAddResponse> addBatchOrg(List<OrgAddRequest> param){ - log.error("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<OrgOrUserAddResponse> addBatchOrg(List<OrgAddRequest> param){ + log.info("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.addBatchOrg(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<OrgOrUserAddResponse>>(){}; BaseResponse<OrgOrUserAddResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴锋柊澧炵粍缁囥��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鏂板缁勭粐"); return result; }catch (Exception e){ log.error("銆愭捣搴锋柊澧炵粍缁囥��================澶辫触====锛歕n"+ e.getMessage()); @@ -98,15 +89,15 @@ *鎵归噺鍒犻櫎缁勭粐鏁版嵁 * @return */ - public BaseResponse delBatchOrg(OrgDelRequest param){ - log.error("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse delBatchOrg(OrgDelRequest param){ + log.info("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.delOrg(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse >(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴峰垹闄ょ粍缁囥��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鍒犻櫎缁勭粐"); return result; }catch (Exception e){ log.error("銆愭捣搴峰垹闄ょ粍缁囥��================澶辫触====锛歕n"+ e.getMessage()); @@ -117,14 +108,14 @@ *鏂板浜哄憳淇℃伅锛堟敮鎸佷汉鑴告暟鎹級 * @return */ - public BaseResponse<UserAddResponse> addUser(UserAddRequest param){ - log.error("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<UserAddResponse> addUser(UserAddRequest param){ + log.info("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.addUser(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<UserAddResponse>>(){}; BaseResponse<UserAddResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴锋柊澧炰汉鍛樸��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鏂板浜哄憳"); return result; }catch (Exception e){ log.error("銆愭捣搴锋柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage()); @@ -135,14 +126,14 @@ *淇敼浜哄憳淇℃伅锛堜笉鏀寔浜鸿劯鏁版嵁锛� * @return */ - public BaseResponse editUser(UserAddRequest param){ - log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse editUser(UserAddRequest param){ + log.info("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.editUser(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<UserAddResponse>>(){}; BaseResponse<UserAddResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍淇敼浜哄憳"); return result; }catch (Exception e){ log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================澶辫触====锛歕n"+ e.getMessage()); @@ -153,14 +144,14 @@ *鎵归噺鏂板浜哄憳淇℃伅(鏃犱汉鑴革級 * @return */ - public BaseResponse<OrgOrUserAddResponse> addBatchUser(List<UserAddRequest> param){ - log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<OrgOrUserAddResponse> addBatchUser(List<UserAddRequest> param){ + log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.addBatchUser(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<OrgOrUserAddResponse>>(){}; BaseResponse<OrgOrUserAddResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鎵归噺鏂板浜哄憳"); return result; }catch (Exception e){ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage()); @@ -171,14 +162,14 @@ *鎵归噺鍒犻櫎浜哄憳淇℃伅 * @return */ - public BaseResponse<OrgOrUserAddFailureResponse> delBatchUser(List<UserAddRequest> param){ - log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<OrgOrUserAddFailureResponse> delBatchUser(List<UserAddRequest> param){ + log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.delBatchUser(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<OrgOrUserAddFailureResponse>>(){}; BaseResponse<OrgOrUserAddFailureResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鎵归噺鏂板浜哄憳"); return result; }catch (Exception e){ log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage()); @@ -189,14 +180,14 @@ *娣诲姞浜鸿劯淇℃伅 * @return */ - public BaseResponse<FaceAddOrEditesponse> addFace(List<FaceAddRequest> param){ - log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<FaceAddOrEditesponse> addFace(List<FaceAddRequest> param){ + log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.addFace(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){}; BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍娣诲姞浜鸿劯淇℃伅"); return result; }catch (Exception e){ log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage()); @@ -207,14 +198,14 @@ *缂栬緫浜鸿劯淇℃伅 * @return */ - public BaseResponse<FaceAddOrEditesponse> editFace(List<FaceEditRequest> param){ - log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<FaceAddOrEditesponse> editFace(List<FaceEditRequest> param){ + log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.editFace(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){}; BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍缂栬緫浜鸿劯淇℃伅"); return result; }catch (Exception e){ log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage()); @@ -225,14 +216,14 @@ *鍒犻櫎浜鸿劯淇℃伅 * @return */ - public BaseResponse delFace(List<FaceEditRequest> param){ - log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse delFace(List<FaceEditRequest> param){ + log.info("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.editFace(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鍒犻櫎浜鸿劯淇℃伅"); return result; }catch (Exception e){ log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage()); @@ -244,7 +235,7 @@ * @return */ public static InputStream getFaceInputStream(FacePictureRequest param) { - log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param)); + log.info("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param)); try { InputStream res = HKTools.getFaceInputStream(JSONObject.toJSONString(param)); log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================鎴愬姛====\n"); @@ -259,14 +250,14 @@ *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級 * @return */ - public BaseResponse<List<ParkListResponse>> parkList(ParkListRequest param){ - log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<List<ParkListResponse>> parkList(ParkListRequest param){ + log.info("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.parkList(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<List<ParkListResponse>>>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鑾峰彇杞﹀簱鍒楄〃鏁版嵁"); return result; }catch (Exception e){ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================澶辫触====锛歕n"+ e.getMessage()); @@ -277,14 +268,14 @@ *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級 * @return */ - public BaseResponse<List<EntranceListResponse>> entranceList(EntranceListRequest param){ - log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<List<EntranceListResponse>> entranceList(EntranceListRequest param){ + log.info("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.entranceList(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<List<EntranceListResponse>>>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鑾峰彇杞﹀簱鍒楄〃鏁版嵁"); return result; }catch (Exception e){ log.error("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================澶辫触====锛歕n"+ e.getMessage()); @@ -295,14 +286,14 @@ *鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛� * @return */ - public BaseResponse carChargeAddtion(CarChargeAddRequest param){ - log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse carChargeAddtion(CarChargeAddRequest param){ + log.info("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.carChargeAddtion(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鍥哄畾杞﹁締鍏呭��"); return result; }catch (Exception e){ log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================澶辫触====锛歕n"+ e.getMessage()); @@ -313,14 +304,14 @@ *鍥哄畾杞﹁締鍙栨秷鍖呮湡 * @return */ - public BaseResponse carChargeDeletion(CarChargeDelRequest param){ - log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse carChargeDeletion(CarChargeDelRequest param){ + log.info("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍鍥哄畾杞﹁締鍙栨秷鍖呮湡"); return result; }catch (Exception e){ log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================澶辫触====锛歕n"+ e.getMessage()); @@ -331,14 +322,14 @@ *杞︿綅棰勭害 * @return */ - public BaseResponse<ParkReservationAddResponse> parkReservationAddition(ParkReservationAddRequest param){ - log.error("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<ParkReservationAddResponse> parkReservationAddition(ParkReservationAddRequest param){ + log.info("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.parkAddition(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<ParkReservationAddResponse>>(){}; BaseResponse<ParkReservationAddResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯溅浣嶉绾︺��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍杞︿綅棰勭害"); return result; }catch (Exception e){ log.error("銆愭捣搴疯溅浣嶉绾︺��================澶辫触====锛歕n"+ e.getMessage()); @@ -349,14 +340,14 @@ *杞︿綅鍙栨秷棰勭害 * @return */ - public BaseResponse parkReservationDeletion(ParkReservationDelRequest param){ - log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse parkReservationDeletion(ParkReservationDelRequest param){ + log.info("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse>(){}; BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍杞︿綅鍙栨秷棰勭害"); return result; }catch (Exception e){ log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================澶辫触====锛歕n"+ e.getMessage()); @@ -367,14 +358,14 @@ *璁垮棰勭害 * @return */ - public BaseResponse<VisitAppointmentResponse> visitAppiontment(VisitAppointmentRequest param){ - log.error("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<VisitAppointmentResponse> visitAppiontment(VisitAppointmentRequest param){ + log.info("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.visitAppiontment(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<VisitAppointmentResponse>>(){}; BaseResponse<VisitAppointmentResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯瀹㈤绾︺��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍璁垮棰勭害"); return result; }catch (Exception e){ log.error("銆愭捣搴疯瀹㈤绾︺��================澶辫触====锛歕n"+ e.getMessage()); @@ -382,17 +373,53 @@ return null; } /** + *璁垮棰勭害鍙栨秷 + * @return + */ + public static BaseResponse cancelVisitAppiontment(VisitAppointmentCancelRequest param){ + log.info("銆愭捣搴疯瀹㈤绾﹀彇娑堛��================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.visitCancel(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse>(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍璁垮棰勭害鍙栨秷"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴疯瀹㈤绾﹀彇娑堛��================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** + *璁垮棰勭害绛剧 + * @return + */ + public static BaseResponse outVisitAppiontment(VisitAppointmentOutRequest param){ + log.info("銆愭捣搴疯瀹㈤绾︾绂汇��================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.visitOut(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse>(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍璁垮棰勭害绛剧"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴疯瀹㈤绾︾绂汇��================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** *璁垮鍏嶇櫥璁伴绾� * @return */ - public BaseResponse<VisitAppointmentVistorResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){ - log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<VisitAppointmentVistorResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){ + log.info("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<VisitAppointmentVistorResponse> >(){}; BaseResponse<VisitAppointmentVistorResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================鎴愬姛====\n"+res); + logResult(result,"娴峰悍璁垮鍏嶇櫥璁伴绾�"); return result; }catch (Exception e){ log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================澶辫触====锛歕n"+ e.getMessage()); @@ -403,14 +430,14 @@ *璁垮鏉冮檺缁勫垪琛ㄦ煡璇紙鍒嗛〉锛� * @return */ - public BaseResponse<PrivilegeGroupResponse> privilegeGroup(PrivilegeGroupRequest param){ - log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<PrivilegeGroupListResponse> privilegeGroup(PrivilegeGroupRequest param){ + log.info("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.privilegeGroup(JSONObject.toJSONString(param)); TypeReference typeReference = - new TypeReference< BaseResponse<PrivilegeGroupResponse> >(){}; - BaseResponse<PrivilegeGroupResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================鎴愬姛====\n"+res); + new TypeReference< BaseResponse<PrivilegeGroupListResponse> >(){}; + BaseResponse<PrivilegeGroupListResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍璁垮鏉冮檺缁勫垪琛ㄦ煡璇�"); return result; }catch (Exception e){ log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================澶辫触====锛歕n"+ e.getMessage()); @@ -418,23 +445,70 @@ return null; } /** + *娴峰悍闂ㄧ鐐规煡璇紙鍒嗛〉锛� + * @return + */ + public static BaseResponse<DoorsListResponse> doorSearch(DoorsListRequest param){ + log.info("銆愭捣搴烽棬绂佺偣鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param)); + try { + String res = HKTools.doorSearch(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse<DoorsListResponse> >(){}; + BaseResponse<DoorsListResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍闂ㄧ鐐规煡璇�"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴烽棬绂佺偣鏌ヨ銆�================澶辫触====锛歕n"+ e.getMessage()); + } + return null; + } + /** *闂ㄧ璁惧鏌ヨ锛堝垎椤碉級 * @return */ - public BaseResponse<AcsDeviceListResponse> acsDeviceList(AcsDeviceListRequest param){ - log.error("銆愭捣搴烽棬绂佽澶囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param)); + public static BaseResponse<AcsDeviceListResponse> acsDeviceList(AcsDeviceListRequest param){ + log.info("銆愭捣搴烽棬绂佽澶囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.acsDeviceList(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<AcsDeviceListResponse> >(){}; BaseResponse<AcsDeviceListResponse> result = JSONObject.parseObject(res, typeReference.getType()); - log.error("銆愭捣搴烽棬绂佽澶囨煡璇€��================鎴愬姛====\n"+res); + logResult(result,"娴峰悍闂ㄧ璁惧鏌ヨ"); return result; }catch (Exception e){ log.error("銆愭捣搴烽棬绂佽澶囨煡璇€��================澶辫触====锛歕n"+ e.getMessage()); } return null; } + /** + *浜嬩欢璁㈤槄 + * @return + */ + public static BaseResponse eventSub(EventSubRequest param){ + log.info("銆愭捣搴蜂簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.eventSub(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse >(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍浜嬩欢璁㈤槄"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴蜂簨浠惰闃呫��================澶辫触====锛歕n"+ e.getMessage()); + }finally { + // saveInterfaceLog(param,res); + } + return null; + } + + private static void logResult(BaseResponse res,String name) { + if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){ + log.info("銆�"+name+"銆�================鎴愬姛====\n"+res); + }else{ + log.error("銆�"+name+"銆�================澶辫触====锛歕n"+ res); + } + } } -- Gitblit v1.9.3