From b0ea50dd24a7ed5ada38dc6c8209f78fc09f0441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 17:45:33 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 267 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 252 insertions(+), 15 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 796dcde..1a63ab1 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
@@ -4,6 +4,7 @@
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.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseRequst;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
@@ -23,13 +24,13 @@
* 鑾峰彇鏍圭粍缁囨暟鎹�
* @return
*/
- public static BaseResponse<OrgListResponse> getRootOrg(BaseRequst param){
+ public static BaseResponse<OrgInfoResponse> getRootOrg(BaseRequst param){
log.info("銆愭捣搴疯幏鍙栨牴缁勭粐銆�================寮�濮�====");
try {
String res = HKTools.getRootOrg ();
TypeReference typeReference =
- new TypeReference< BaseResponse<OrgListResponse>>(){};
- BaseResponse<OrgListResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ new TypeReference< BaseResponse<OrgInfoResponse>>(){};
+ BaseResponse<OrgInfoResponse> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍鑾峰彇鏍圭粍缁�");
return result;
}catch (Exception e){
@@ -152,16 +153,16 @@
* @return
*/
public static BaseResponse<List<UserDelResponse>> delBatchUser(UserDelRequest param){
- log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋壒閲忓垹闄や汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.delBatchUser(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<List<UserDelResponse>>>(){};
BaseResponse<List<UserDelResponse >> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍鎵归噺鏂板浜哄憳");
+ logResult(result,"娴峰悍鎵归噺鍒犻櫎浜哄憳");
return result;
}catch (Exception e){
- log.error("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
+ log.error("銆愭捣搴锋壒閲忓垹闄や汉鍛樸��================澶辫触====锛歕n"+ e.getMessage());
}
return null;
}
@@ -170,13 +171,12 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> addFace( FaceAddRequest param){
- log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�====" );
try {
String res = HKTools.addFace(JSONObject.toJSONString(param));
- TypeReference typeReference =
- new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
+ TypeReference typeReference = new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍娣诲姞浜鸿劯淇℃伅");
+ logResult(res,"娴峰悍娣诲姞浜鸿劯淇℃伅");
return result;
}catch (Exception e){
log.error("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
@@ -188,13 +188,14 @@
* @return
*/
public static BaseResponse<FaceAddOrEditesponse> editFace( FaceEditRequest param){
- log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�====" );
+ String res =null;
try {
- String res = HKTools.editFace(JSONObject.toJSONString(param));
+ res = HKTools.editFace(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<FaceAddOrEditesponse>>(){};
BaseResponse<FaceAddOrEditesponse> result = JSONObject.parseObject(res, typeReference.getType());
- logResult(result,"娴峰悍缂栬緫浜鸿劯淇℃伅");
+ logResult(res,"娴峰悍缂栬緫浜鸿劯淇℃伅");
return result;
}catch (Exception e){
log.error("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================澶辫触====锛歕n"+ e.getMessage());
@@ -208,7 +209,7 @@
public static BaseResponse delFace(List<FaceEditRequest> param){
log.info("銆愭捣搴峰垹闄や汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.editFace(JSONObject.toJSONString(param));
+ String res = HKTools.delFace(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse>(){};
BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
@@ -782,7 +783,240 @@
}
return null;
}
-
+ /**
+ *鏌ヨ璁垮棰勭害璁板綍锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<AppointmentInfoResponse>> appointmentRecords(AppointmentListRequest param){
+ log.info("銆愭捣搴疯瀹㈤绾﹁褰曟煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.appointmentRecords(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<AppointmentInfoResponse>>>(){};
+ BaseResponse<BaseListPageResponse<AppointmentInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍璁垮棰勭害璁板綍鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈤绾﹁褰曟煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鏌ヨ璁垮鏉ヨ璁板綍锛堝凡鐧昏锛夛紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<VisitingInfoResponse>> visitingRecords(VisitingInfoRequest param){
+ log.info("銆愭捣搴疯瀹㈡潵璁胯褰曟煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.visitingRecords(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<VisitingInfoResponse>>>(){};
+ BaseResponse<BaseListPageResponse<VisitingInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍璁垮鏉ヨ璁板綍鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯瀹㈡潵璁胯褰曟煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍏ㄩ噺缁勭粐鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<OrgInfoResponse>> orgAllList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰叏閲忕粍缁囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.orgAllList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<OrgInfoResponse>>> (){};
+ BaseResponse<BaseListPageResponse<OrgInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍏ㄩ噺缁勭粐鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰叏閲忕粍缁囨煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *澧為噺缁勭粐鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<OrgTimeRangeInfoResponse>> orgTimeRangeList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰閲忕粍缁囨煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.orgTimeRangeList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<OrgTimeRangeInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<OrgTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍澧為噺缁勭粐鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰閲忕粍缁囨煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍏ㄩ噺浜哄憳鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<UserInfoResponse>> userAllList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰叏閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.userAllList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<UserInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<UserInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍏ㄩ噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰叏閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍏ㄩ噺浜哄憳鏌ヨ2锛堟牴鎹潯浠舵煡璇㈠垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<UserInfoResponse>> personList(UserByParamListRequest param){
+ log.info("銆愭捣搴锋牴鎹潯浠舵煡璇汉鍛樺垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.personList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<UserInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<UserInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鏍规嵁鏉′欢鏌ヨ浜哄憳鍒楄〃");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴锋牴鎹潯浠舵煡璇汉鍛樺垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *澧為噺浜哄憳鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<UserTimeRangeInfoResponse>> userTimeRangeList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.userTimeRangeList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<UserTimeRangeInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<UserTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍏ㄩ噺杞﹁締鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<VehicleInfoResponse>> vehicleList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰叏閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.vehicleList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<VehicleInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<VehicleInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍏ㄩ噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰叏閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *杩囪溅璁板綍鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<ParkCrossRecordInfoResponse>> parkCrossRecords(ParkCrossRecordListRequest param){
+ log.info("銆愭捣搴疯繃杞﹁褰曟煡璇㈡煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.parkCrossRecords(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<ParkCrossRecordInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<ParkCrossRecordInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍杩囪溅璁板綍鏌ヨ鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯繃杞﹁褰曟煡璇㈡煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> vehicleTimeRangeList(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.vehicleTimeRangeList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *澧為噺杞﹁締鏌ヨ锛堝垎椤碉級
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> facePictureCheck(TimeRangeListRequest param){
+ log.info("銆愭捣搴峰閲忎汉鍛樻煡璇€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.facePictureCheck(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<VehicleTimeRangeInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍澧為噺浜哄憳鏌ヨ");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰閲忎汉鍛樻煡璇€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇闂ㄧ璁惧鍦ㄧ嚎鐘舵�侊紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<AscDeviceStatusInfoResponse>> acsDeviceStatus(AcsDeviceStatusListRequest param){
+ log.info("銆愭捣搴疯幏鍙栭棬绂佽澶囧湪绾跨姸鎬併��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.acsDeviceStatus(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<AscDeviceStatusInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<AscDeviceStatusInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇闂ㄧ璁惧鍦ㄧ嚎鐘舵��");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栭棬绂佽澶囧湪绾跨姸鎬併��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> tempCarInRecords(TempCarInRecordListRequest param){
+ log.info("銆愭捣搴锋煡璇㈠満鍐呰溅鍋滆溅淇℃伅銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.tempCarInRecords(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<TempCarInRecordInfoResponse>> 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);
@@ -790,6 +1024,9 @@
log.error("銆�"+name+"銆�================澶辫触====锛歕n"+ res);
}
}
+ private static void logResult(String res,String name) {
+ log.info("銆�"+name+"銆�================缁撴灉====\n"+res);
+ }
}
--
Gitblit v1.9.3