From 915dcb3800c0cbd63f53e33f9638715b93c9ea6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 18:18:33 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java |  124 +++++++++++++++++++++++------------------
 1 files changed, 70 insertions(+), 54 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 79f3e8a..0ccc401 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
@@ -11,6 +11,7 @@
 import com.doumee.core.haikang.model.param.BaseResponse;
 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;
@@ -22,33 +23,22 @@
 import java.io.InputStream;
 import java.util.List;
 
-@Service
+//@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){
+    public  static  BaseResponse<OrgListResponse>  getRootOrg(BaseRequst param){
         log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�====");
         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());
@@ -60,7 +50,7 @@
      * 淇敼缁勭粐鏁版嵁
      * @return
      */
-    public  BaseResponse editOrg(OrgEditRequest param){
+    public  static  BaseResponse editOrg(OrgEditRequest param){
         log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
         try {
 
@@ -68,7 +58,7 @@
             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,7 +69,7 @@
      *鎵归噺鏂板缁勭粐鏁版嵁
      * @return
      */
-    public  BaseResponse<OrgOrUserAddResponse>  addBatchOrg(List<OrgAddRequest> param){
+    public  static  BaseResponse<OrgOrUserAddResponse>  addBatchOrg(List<OrgAddRequest> param){
         log.error("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
         try {
 
@@ -87,7 +77,7 @@
             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,7 +88,7 @@
      *鎵归噺鍒犻櫎缁勭粐鏁版嵁
      * @return
      */
-    public  BaseResponse   delBatchOrg(OrgDelRequest param){
+    public  static  BaseResponse   delBatchOrg(OrgDelRequest param){
         log.error("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
         try {
 
@@ -106,7 +96,7 @@
             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 +107,14 @@
      *鏂板浜哄憳淇℃伅锛堟敮鎸佷汉鑴告暟鎹級
      * @return
      */
-    public  BaseResponse<UserAddResponse>  addUser(UserAddRequest param){
+    public  static  BaseResponse<UserAddResponse>  addUser(UserAddRequest param){
         log.error("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+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 +125,14 @@
      *淇敼浜哄憳淇℃伅锛堜笉鏀寔浜鸿劯鏁版嵁锛�
      * @return
      */
-    public  BaseResponse editUser(UserAddRequest param){
+    public  static  BaseResponse editUser(UserAddRequest param){
         log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+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 +143,14 @@
      *鎵归噺鏂板浜哄憳淇℃伅(鏃犱汉鑴革級
      * @return
      */
-    public  BaseResponse<OrgOrUserAddResponse>  addBatchUser(List<UserAddRequest> param){
+    public  static  BaseResponse<OrgOrUserAddResponse>  addBatchUser(List<UserAddRequest> param){
         log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+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 +161,14 @@
      *鎵归噺鍒犻櫎浜哄憳淇℃伅
      * @return
      */
-    public  BaseResponse<OrgOrUserAddFailureResponse>  delBatchUser(List<UserAddRequest> param){
+    public  static  BaseResponse<OrgOrUserAddFailureResponse>  delBatchUser(List<UserAddRequest> param){
         log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+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 +179,14 @@
      *娣诲姞浜鸿劯淇℃伅
      * @return
      */
-    public  BaseResponse<FaceAddOrEditesponse>  addFace(List<FaceAddRequest> param){
+    public  static  BaseResponse<FaceAddOrEditesponse>  addFace(List<FaceAddRequest> param){
         log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+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 +197,14 @@
      *缂栬緫浜鸿劯淇℃伅
      * @return
      */
-    public  BaseResponse<FaceAddOrEditesponse>  editFace(List<FaceEditRequest> param){
+    public  static  BaseResponse<FaceAddOrEditesponse>  editFace(List<FaceEditRequest> param){
         log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+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 +215,14 @@
      *鍒犻櫎浜鸿劯淇℃伅
      * @return
      */
-    public  BaseResponse   delFace(List<FaceEditRequest> param){
+    public  static  BaseResponse   delFace(List<FaceEditRequest> param){
         log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+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());
@@ -259,14 +249,14 @@
      *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級
      * @return
      */
-    public  BaseResponse<List<ParkListResponse>>   parkList(ParkListRequest param){
+    public  static  BaseResponse<List<ParkListResponse>>   parkList(ParkListRequest param){
         log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+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 +267,14 @@
      *鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級
      * @return
      */
-    public  BaseResponse<List<EntranceListResponse>>   entranceList(EntranceListRequest param){
+    public  static  BaseResponse<List<EntranceListResponse>>   entranceList(EntranceListRequest param){
         log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+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 +285,14 @@
      *鍥哄畾杞﹁締鍏呭�硷紙鍖呮湡锛�
      * @return
      */
-    public  BaseResponse   carChargeAddtion(CarChargeAddRequest param){
+    public  static  BaseResponse   carChargeAddtion(CarChargeAddRequest param){
         log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+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 +303,14 @@
      *鍥哄畾杞﹁締鍙栨秷鍖呮湡
      * @return
      */
-    public  BaseResponse   carChargeDeletion(CarChargeDelRequest param){
+    public  static  BaseResponse   carChargeDeletion(CarChargeDelRequest param){
         log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+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 +321,14 @@
      *杞︿綅棰勭害
      * @return
      */
-    public  BaseResponse<ParkReservationAddResponse>   parkReservationAddition(ParkReservationAddRequest param){
+    public  static  BaseResponse<ParkReservationAddResponse>   parkReservationAddition(ParkReservationAddRequest param){
         log.error("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+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 +339,14 @@
      *杞︿綅鍙栨秷棰勭害
      * @return
      */
-    public  BaseResponse   parkReservationDeletion(ParkReservationDelRequest param){
+    public  static  BaseResponse   parkReservationDeletion(ParkReservationDelRequest param){
         log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+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 +357,14 @@
      *璁垮棰勭害
      * @return
      */
-    public  BaseResponse<VisitAppointmentResponse>   visitAppiontment(VisitAppointmentRequest param){
+    public  static  BaseResponse<VisitAppointmentResponse>   visitAppiontment(VisitAppointmentRequest param){
         log.error("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+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());
@@ -385,14 +375,14 @@
      *璁垮鍏嶇櫥璁伴绾�
      * @return
      */
-    public  BaseResponse<VisitAppointmentVistorResponse>   visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
+    public  static  BaseResponse<VisitAppointmentVistorResponse>   visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
         log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+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 +393,14 @@
      *璁垮鏉冮檺缁勫垪琛ㄦ煡璇紙鍒嗛〉锛�
      * @return
      */
-    public  BaseResponse<PrivilegeGroupListResponse>   privilegeGroup(PrivilegeGroupRequest param){
+    public  static  BaseResponse<PrivilegeGroupListResponse>   privilegeGroup(PrivilegeGroupRequest param){
         log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param));
         try {
             String res = HKTools.privilegeGroup(JSONObject.toJSONString(param));
             TypeReference typeReference =
                     new TypeReference< BaseResponse<PrivilegeGroupListResponse> >(){};
             BaseResponse<PrivilegeGroupListResponse>   result = JSONObject.parseObject(res, typeReference.getType());
-            log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================鎴愬姛====\n"+res);
+            logResult(result,"娴峰悍璁垮鏉冮檺缁勫垪琛ㄦ煡璇�");
             return  result;
         }catch (Exception e){
             log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================澶辫触====锛歕n"+ e.getMessage());
@@ -421,20 +411,46 @@
      *闂ㄧ璁惧鏌ヨ锛堝垎椤碉級
      * @return
      */
-    public  BaseResponse<AcsDeviceListResponse>   acsDeviceList(AcsDeviceListRequest param){
+    public  static  BaseResponse<AcsDeviceListResponse>   acsDeviceList(AcsDeviceListRequest param){
         log.error("銆愭捣搴烽棬绂佽澶囨煡璇€��================寮�濮�===="+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.error("銆愭捣搴蜂簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param));
+        try {
+            String 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());
+        }
+        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