From 0c51ea5f39e11279ccebbad241cbb09aa74ee1a2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 13 十二月 2024 20:03:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
index 648f197..ed95c67 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
@@ -2,13 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
+ import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.cars.BaseCarsPageResponse;
import com.doumee.core.haikang.model.cars.BaseCarsResponse;
+ import com.doumee.core.haikang.model.cars.request.CarsAlarmListRequest;
import com.doumee.core.haikang.model.cars.request.CarsDeviceRequest;
import com.doumee.core.haikang.model.cars.request.CarsGpsRequest;
- import com.doumee.core.haikang.model.cars.response.CarsDeviceDetaisResponse;
- import com.doumee.core.haikang.model.cars.response.CarsDeviceResponse;
- import com.doumee.core.haikang.model.cars.response.CarsGpsResponse;
+ import com.doumee.core.haikang.model.cars.response.*;
import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.respose.FindHomeAlarmInfoPageResponse;
@@ -124,6 +124,40 @@
}
return list;
}
+ public static List<CarsAlarmResultListResponse> getAlarmEvemtList(List<CarsDeviceDetaisResponse> detaisResponses , Date date) {
+ List<CarsAlarmResultListResponse> list = new ArrayList<>();
+ if(detaisResponses ==null || detaisResponses.size()==0){
+ return list ;
+ }
+ CarsAlarmListRequest param = new CarsAlarmListRequest();
+ param.setStartTime(DateUtil.getPlusTime2(DateUtil.getStartOfDay(date)));
+ param.setEndTime(DateUtil.getPlusTime2(DateUtil.getEndOfDay(date)));
+ param.setPageNo(1);
+ param.setPageSize(100);
+ for( CarsDeviceDetaisResponse de :detaisResponses ){
+ param.setDeviceCode(de.getTerminalID());
+ BaseCarsPageResponse<CarsAlarmListResponse> data = getAlarmList(param);
+ if(data!=null &&data.getResults()!=null){
+ for(CarsAlarmListResponse model :data.getResults()){
+ CarsAlarmResultListResponse tm = new CarsAlarmResultListResponse();
+ tm.setTime(model.getTime());
+ tm.setCarCode(de.getPlateNum());
+ tm.setType(model.getType());
+ tm.setSubType(model.getSubType());
+ Date tmDate = DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss", tm.getTime() );
+ if(tmDate!=null){
+ tm.setTimeStamp(tmDate.getTime());
+ }
+ tm.setTitle(HKConstants.CarsEventType.getName(tm.getType(),tm.getSubType()));
+ list.add(tm);
+ }
+ }
+ }
+ Collections.sort(list, (o1, o2) -> {
+ return (int) (o1.getTimeStamp() - o2.getTimeStamp()); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
+ return list;
+ }
private static CarsDeviceDetaisResponse getFromListById(String key, List<CarsDeviceDetaisResponse> list) {
for(CarsDeviceDetaisResponse dd :list){
@@ -220,7 +254,7 @@
String url = BASE_URL + "device/list/";
TreeMap<String, String> BASE_PARAMS = getBaseParams();
if(StringUtils.isNotBlank(param.getProductKey())){
- BASE_PARAMS.put("productKey", "");//璁惧鍨嬪彿绉橀挜
+ BASE_PARAMS.put("productKey", param.getProductKey());//璁惧鍨嬪彿绉橀挜
}
BASE_PARAMS.put("pageSize",Constants.equalsInteger(param.getPageSize(),0)? "100":param.getPageSize().toString());//椤甸潰澶у皬
BASE_PARAMS.put("pageNo", Constants.equalsInteger(param.getPageNo(),0)? "1":param.getPageNo().toString());//褰撳墠椤�
@@ -233,4 +267,25 @@
}
return null;
}
+ public static BaseCarsPageResponse<CarsAlarmListResponse> getAlarmList(CarsAlarmListRequest param) {
+ String url = BASE_URL + "alarm/list/";
+ TreeMap<String, String> BASE_PARAMS = getBaseParams();
+ if(StringUtils.isNotBlank(param.getStartTime())){
+ BASE_PARAMS.put("startTime", param.getStartTime());
+ }
+ if(StringUtils.isNotBlank(param.getEndTime())){
+ BASE_PARAMS.put("endTime", param.getEndTime());
+ }
+ BASE_PARAMS.put("deviceCode", param.getDeviceCode());
+ BASE_PARAMS.put("pageSize",Constants.equalsInteger(param.getPageSize(),0)? "100":param.getPageSize().toString());//椤甸潰澶у皬
+ BASE_PARAMS.put("pageNo", Constants.equalsInteger(param.getPageNo(),0)? "1":param.getPageNo().toString());//褰撳墠椤�
+ String str = sendRequest(url,BASE_PARAMS);
+ TypeReference typeReference =
+ new TypeReference<BaseCarsResponse<BaseCarsPageResponse<CarsAlarmListResponse>>>(){};
+ BaseCarsResponse<BaseCarsPageResponse<CarsAlarmListResponse>> result = JSONObject.parseObject(str, typeReference.getType());
+ if(result!=null && Constants.equalsInteger(result.getStatus(),0)){
+ return result.getData();
+ }
+ return null;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3