From af6dd48ed508df2ff33f62cd5c40db3f51f9d2a8 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期三, 20 三月 2024 11:38:13 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 328 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 316 insertions(+), 12 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 c7af861..a4f28f0 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){ @@ -85,7 +86,7 @@ String res = HKTools.delOrg(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse >(){}; - BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + BaseResponse<List<OrgUpdateFailureResponse>> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"娴峰悍鍒犻櫎缁勭粐"); return result; }catch (Exception e){ @@ -156,7 +157,7 @@ try { String res = HKTools.delBatchUser(JSONObject.toJSONString(param)); TypeReference typeReference = - new TypeReference< BaseResponse<OrgOrUserAddFailureResponse>>(){}; + new TypeReference< BaseResponse<List<UserDelResponse>>>(){}; BaseResponse<List<UserDelResponse >> result = JSONObject.parseObject(res, typeReference.getType()); logResult(result,"娴峰悍鎵归噺鏂板浜哄憳"); return result; @@ -169,7 +170,7 @@ *娣诲姞浜鸿劯淇℃伅 * @return */ - public static BaseResponse<FaceAddOrEditesponse> addFace(List<FaceAddRequest> param){ + public static BaseResponse<FaceAddOrEditesponse> addFace( FaceAddRequest param){ log.info("銆愭捣搴锋坊鍔犱汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.addFace(JSONObject.toJSONString(param)); @@ -187,7 +188,7 @@ *缂栬緫浜鸿劯淇℃伅 * @return */ - public static BaseResponse<FaceAddOrEditesponse> editFace(List<FaceEditRequest> param){ + public static BaseResponse<FaceAddOrEditesponse> editFace( FaceEditRequest param){ log.info("銆愭捣搴风紪杈戜汉鑴镐俊鎭��================寮�濮�===="+JSONObject.toJSONString(param)); try { String res = HKTools.editFace(JSONObject.toJSONString(param)); @@ -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()); @@ -602,18 +603,60 @@ *娴峰悍涓�鍗¢�氫换鍔¤繘搴︽煡璇� * @return */ - public static BaseResponse<TaskProgressResponse> taskDataAddition(TaskProgressRequest param){ + public static BaseResponse<TaskProgressNumResponse> taskProgressNum(TaskProgressRequest param){ log.info("銆愭捣搴蜂竴鍗¢�氫换鍔¤繘搴︽煡璇€��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.taskProgressNum(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse<TaskProgressNumResponse> >(){}; + BaseResponse<TaskProgressNumResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍涓�鍗¢�氫换鍔¤繘搴︽煡璇�"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴蜂竴鍗¢�氫换鍔¤繘搴︽煡璇€��================澶辫触====锛歕n"+ e.getMessage()); + }finally { + // saveInterfaceLog(param,res); + } + return null; + } + /** + *娴峰悍涓�鍗¢�氳澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟v2 + * @return + */ + public static BaseResponse<TaskProgressResponse> taskProgress(TaskProgressRequest param){ + log.info("銆愭捣搴蜂竴鍗¢�氳澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呮�绘暟銆�================寮�濮�===="+JSONObject.toJSONString(param)); String res = null; try { res = HKTools.taskProgress(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference< BaseResponse<TaskProgressResponse> >(){}; BaseResponse<TaskProgressResponse> 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()); + }finally { + // saveInterfaceLog(param,res); + } + return null; + } + /** + *娴峰悍鏌ヨ鏉冮檺鏉$洰鍒楄〃 + * @return + */ + public static BaseResponse<AuthItemListResponse> authItemList(AuthItemListRequest param){ + log.info("銆愭捣搴锋煡璇㈡潈闄愭潯鐩垪琛ㄣ��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.authItemList(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse<AuthItemListResponse> >(){}; + BaseResponse<AuthItemListResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鏌ヨ鏉冮檺鏉$洰鍒楄〃"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴锋煡璇㈡潈闄愭潯鐩垪琛ㄣ��================澶辫触====锛歕n"+ e.getMessage()); }finally { // saveInterfaceLog(param,res); } @@ -640,7 +683,268 @@ } return null; } - + /** + *娴峰悍鎵归噺寮�鍗� + * @return + */ + public static BaseResponse<List<CardInfoResponse>> cardBingding(CardBingdingRequest param){ + log.info("銆愭捣搴锋壒閲忓紑鍗°��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.cardBingding(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse <List<CardInfoResponse>> >(){}; + BaseResponse<List<CardInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鎵归噺寮�鍗�"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴锋壒閲忓紑鍗°��================澶辫触====锛歕n"+ e.getMessage()); + }finally { + } + return null; + } + /** + *娴峰悍閫�鍗� + * @return + */ + public static BaseResponse cardDeletion(CardDeletionRequest param){ + log.info("銆愭捣搴烽��鍗°��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.cardDeletion(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 { + } + return null; + } + /** + *娴峰悍鎵归噺鎸傚け + * @return + */ + public static BaseResponse cardLoss(CardLossRequest param){ + log.info("銆愭捣搴锋壒閲忔寕澶便��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.cardLoss(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 { + } + return null; + } + /** + *娴峰悍鎵归噺瑙f寕 + * @return + */ + public static BaseResponse cardUnLoss(CardLossRequest param){ + log.info("銆愭捣搴锋壒閲忚В鎸傘��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.cardUnloss(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse >(){}; + BaseResponse result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鎵归噺瑙f寕"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴锋壒閲忚В鎸傘��================澶辫触====锛歕n"+ e.getMessage()); + }finally { + } + return null; + } + /** + *娴峰悍鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯� + * @return + */ + public static BaseResponse<TaskPersonDetailListResponse> taskPersoDetail(TaskPersonDetailRequest param){ + log.info("銆愭捣搴锋煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呫��================寮�濮�===="+JSONObject.toJSONString(param)); + String res = null; + try { + res = HKTools.taskPersoDetail(JSONObject.toJSONString(param)); + TypeReference typeReference = + new TypeReference< BaseResponse <TaskPersonDetailListResponse>>(){}; + BaseResponse<TaskPersonDetailListResponse> result = JSONObject.parseObject(res, typeReference.getType()); + logResult(result,"娴峰悍鏌ヨ璁惧閫氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯�"); + return result; + }catch (Exception e){ + log.error("銆愭捣搴锋煡璇㈣澶囬�氶亾鐨勪汉鍛樻潈闄愪笅杞借鎯呫��================澶辫触====锛歕n"+ e.getMessage()); + }finally { + } + 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; + } + /** + *澧為噺浜哄憳鏌ヨ锛堝垎椤碉級 + * @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; + } private static void logResult(BaseResponse res,String name) { if(StringUtils.equals(res.getCode(),HKConstants.RESPONSE_SUCCEE)){ log.info("銆�"+name+"銆�================鎴愬姛====\n"+res); -- Gitblit v1.9.3