From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 151 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 112 insertions(+), 39 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 b4b788b..c53ce61 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
@@ -1,29 +1,19 @@
package com.doumee.core.haikang.service;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.haikang.model.param.request.*;
-import com.doumee.core.haikang.model.param.respose.*;
-import com.doumee.core.utils.Constants;
+import com.alibaba.fastjson.TypeReference;
import com.doumee.core.haikang.model.HKConstants;
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 com.doumee.core.haikang.model.param.request.*;
+import com.doumee.core.haikang.model.param.respose.*;
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;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import com.alibaba.fastjson.TypeReference;
import java.io.InputStream;
-import java.util.Date;
import java.util.List;
@Slf4j
@@ -34,7 +24,7 @@
* @return
*/
public static BaseResponse<OrgListResponse> getRootOrg(BaseRequst param){
- log.error("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�====");
+ log.info("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�====");
try {
String res = HKTools.getRootOrg ();
TypeReference typeReference =
@@ -52,7 +42,7 @@
* @return
*/
public static BaseResponse editOrg(OrgEditRequest param){
- log.error("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴蜂慨鏀圭粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.editOrg(JSONObject.toJSONString(param));
@@ -71,9 +61,8 @@
* @return
*/
public static BaseResponse<OrgOrUserAddResponse> addBatchOrg(List<OrgAddRequest> param){
- log.error("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋柊澧炵粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
try {
-
String res = HKTools.addBatchOrg(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<OrgOrUserAddResponse>>(){};
@@ -90,7 +79,7 @@
* @return
*/
public static BaseResponse delBatchOrg(OrgDelRequest param){
- log.error("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.delOrg(JSONObject.toJSONString(param));
@@ -109,7 +98,7 @@
* @return
*/
public static BaseResponse<UserAddResponse> addUser(UserAddRequest param){
- log.error("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.addUser(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -127,7 +116,7 @@
* @return
*/
public static BaseResponse editUser(UserAddRequest param){
- log.error("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴蜂慨鏀逛汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.editUser(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -145,7 +134,7 @@
* @return
*/
public static BaseResponse<OrgOrUserAddResponse> addBatchUser(List<UserAddRequest> param){
- log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.addBatchUser(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -163,7 +152,7 @@
* @return
*/
public static BaseResponse<OrgOrUserAddFailureResponse> delBatchUser(List<UserAddRequest> param){
- log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.delBatchUser(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -181,7 +170,7 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> addFace(List<FaceAddRequest> param){
- log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.addFace(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -199,7 +188,7 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> editFace(List<FaceEditRequest> param){
- log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.editFace(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -217,7 +206,7 @@
* @return
*/
public static BaseResponse delFace(List<FaceEditRequest> param){
- log.error("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.editFace(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -235,7 +224,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");
@@ -245,13 +234,58 @@
}
return null;
}
+ /**
+ * 鑾峰彇璁垮璁板綍涓殑鍥剧墖
+ * @return
+ */
+ public static InputStream getVisitPicture(VisitPictureRequest param) {
+ log.info("銆愭捣搴疯瀹㈠浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ InputStream res = HKTools.getVisitPicture(JSONObject.toJSONString(param));
+ log.error("銆愭捣搴疯瀹㈠浘鐗囨祦銆�================鎴愬姛====\n");
+ return res;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈠浘鐗囨祦銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇闂ㄧ浜嬩欢鐨勫浘鐗�
+ * @return
+ */
+ public static InputStream getDevicePicture(DevicePictureRequest param) {
+ log.info("銆愭捣搴烽棬绂佷簨浠跺浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ InputStream res = HKTools.getDevicePicture(JSONObject.toJSONString(param));
+ log.error("銆愭捣搴烽棬绂佷簨浠跺浘鐗囨祦銆�================鎴愬姛====\n");
+ return res;
+ }catch (Exception e){
+ log.error("銆愭捣搴烽棬绂佷簨浠跺浘鐗囨祦銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ * 鏌ヨ杞﹁締鎶撴媿鍥剧墖
+ * @return
+ */
+ public static InputStream getCarPicture(CarPictureRequest param) {
+ log.info("銆愭捣搴疯溅杈嗘姄鎷嶅浘鐗囧浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ InputStream res = HKTools.getCarPicture(JSONObject.toJSONString(param));
+ log.error("銆愭捣搴疯溅杈嗘姄鎷嶅浘鐗囧浘鐗囨祦銆�================鎴愬姛====\n");
+ return res;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯溅杈嗘姄鎷嶅浘鐗囧浘鐗囨祦銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
/**
*鑾峰彇杞﹀簱鍒楄〃鏁版嵁锛堝叏閲忥級
* @return
*/
public static BaseResponse<List<ParkListResponse>> parkList(ParkListRequest param){
- log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯幏鍙栬溅搴撳垪琛ㄦ暟鎹��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.parkList(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -269,7 +303,7 @@
* @return
*/
public static BaseResponse<List<EntranceListResponse>> entranceList(EntranceListRequest param){
- log.error("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣鑾峰彇杞﹀簱鍒楄〃鏁版嵁銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.entranceList(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -287,7 +321,7 @@
* @return
*/
public static BaseResponse carChargeAddtion(CarChargeAddRequest param){
- log.error("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴峰浐瀹氳溅杈嗗厖鍊笺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.carChargeAddtion(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -305,7 +339,7 @@
* @return
*/
public static BaseResponse carChargeDeletion(CarChargeDelRequest param){
- log.error("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴峰浐瀹氳溅杈嗗彇娑堝寘鏈熴��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -323,7 +357,7 @@
* @return
*/
public static BaseResponse<ParkReservationAddResponse> parkReservationAddition(ParkReservationAddRequest param){
- log.error("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯溅浣嶉绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.parkAddition(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -341,7 +375,7 @@
* @return
*/
public static BaseResponse parkReservationDeletion(ParkReservationDelRequest param){
- log.error("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯溅浣嶅彇娑堥绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.carChargeDeletion(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -359,7 +393,7 @@
* @return
*/
public static BaseResponse<VisitAppointmentResponse> visitAppiontment(VisitAppointmentRequest param){
- log.error("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈤绾︺��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.visitAppiontment(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -377,7 +411,7 @@
* @return
*/
public static BaseResponse cancelVisitAppiontment(VisitAppointmentCancelRequest param){
- log.error("銆愭捣搴疯瀹㈤绾﹀彇娑堛��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈤绾﹀彇娑堛��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.visitCancel(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -395,7 +429,7 @@
* @return
*/
public static BaseResponse outVisitAppiontment(VisitAppointmentOutRequest param){
- log.error("銆愭捣搴疯瀹㈤绾︾绂汇��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈤绾︾绂汇��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.visitOut(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -413,7 +447,7 @@
* @return
*/
public static BaseResponse<VisitAppointmentVistorResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
- log.error("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -431,7 +465,7 @@
* @return
*/
public static BaseResponse<PrivilegeGroupListResponse> privilegeGroup(PrivilegeGroupRequest param){
- log.error("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴疯瀹㈡潈闄愮粍鍒楄〃鏌ヨ銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.privilegeGroup(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -445,11 +479,29 @@
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 static BaseResponse<AcsDeviceListResponse> acsDeviceList(AcsDeviceListRequest param){
- log.error("銆愭捣搴烽棬绂佽澶囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴烽棬绂佽澶囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.acsDeviceList(JSONObject.toJSONString(param));
TypeReference typeReference =
@@ -467,7 +519,7 @@
* @return
*/
public static BaseResponse eventSub(EventSubRequest param){
- log.error("銆愭捣搴蜂簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴蜂簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param));
String res = null;
try {
res = HKTools.eventSub(JSONObject.toJSONString(param));
@@ -483,6 +535,27 @@
}
return null;
}
+ /**
+ *浜嬩欢璁㈤槄
+ * @return
+ */
+ public static BaseResponse cancelEventSub(EventSubRequest param){
+ log.info("銆愭捣搴峰彇娑堜簨浠惰闃呫��================寮�濮�===="+JSONObject.toJSONString(param));
+ String res = null;
+ try {
+ res = HKTools.cancelEventSub(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)){
--
Gitblit v1.9.3