From 0d9abc81a7dd9e628445472b478fa23926f71216 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 14 十二月 2023 14:39:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 80 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 2ca62e8..c8884e4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -8,6 +8,7 @@
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
+import com.doumee.core.haikang.model.param.request.event.parks.EventParkInfoRequest;
import com.doumee.core.haikang.model.param.request.event.parks.EventParkRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitDataRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitInfoRequest;
@@ -399,7 +400,23 @@
String result = null;
log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========寮�濮�=========锛歕n"+JSONObject.toJSONString(param));
try {
-
+ if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+ return null;
+ }
+ //闂ㄧ浜嬩欢闆嗗悎
+ List<EventParkInfoRequest> events = param.getParams().getEvents();
+ List<CarEvent> list = new ArrayList<>();
+ for(EventParkInfoRequest request : events){
+ if(request.getData() ==null ||StringUtils.isBlank(request.getData().getPlateNo())){
+ continue;
+ }
+ //灏佽浜嬩欢淇℃伅琛ㄥ璞�
+ list.add(getParkEventModelByRequest(request));
+ }
+ if(list.size()>0){
+ //鎻掑叆闂ㄧ璁板綍
+ carEventMapper.insertBatchSomeColumn(list);
+ }
log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========鎴愬姛=======");
}catch (Exception e){
@@ -409,6 +426,67 @@
return null;
}
+ /**
+ * 鏍规嵁鎺ㄩ�佹暟鎹皝瑁呭仠杞︿簨浠跺璞′俊鎭�
+ * @param request
+ * @return
+ */
+ private CarEvent getParkEventModelByRequest(EventParkInfoRequest request) {
+ CarEvent event = new CarEvent();
+ event.setIsdeleted(Constants.ZERO);
+ event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
+ event.setVehicleType(request.getData().getVehicleType());
+ event.setVehicleColor(request.getData().getVehicleColor());
+ event.setVehicleClass(request.getData().getVehicleClass());
+ event.setTimestr(request.getData().getTime());
+ event.setTimeout(request.getTimeout());
+ event.setSvrIndex(request.getSrcIndex());
+ event.setSubModel(request.getData().getSubModel());
+ event.setSubLogo(request.getData().getSubLogo());
+ event.setStatus(request.getStatus());
+ event.setSrcType(request.getSrcType());
+ event.setSrcParentIndex(request.getSrcParentIndex());
+ event.setSrcName(request.getSrcName());
+ event.setSrcIndex(request.getSrcIndex());
+ event.setRoadwayType(request.getData().getRoadwayType());
+ event.setRoadwayName(request.getData().getRoadwayName());
+ event.setRoadwayIndex(request.getData().getRoadwayIndex());
+ event.setPlateType(request.getData().getPlateType());
+ event.setTimeout(request.getTimeout());
+ event.setPlateNos(request.getData().getPlateNo());
+ event.setPlateColor(request.getData().getPlateColor());
+ event.setPlateBelieve(request.getData().getPlateBelieve());
+ event.setParkName(request.getData().getParkName());
+ event.setParkIndex(request.getData().getParkIndex());
+ event.setMainLogo(request.getData().getMainLogo());
+ event.setInoutType(request.getData().getInoutType());
+ event.setHappenTime(request.getHappenTime());
+ event.setGateName(request.getData().getGateName());
+ event.setGateIndex(request.getData().getGateIndex());
+ event.setEventType(request.getEventType());
+ event.setEventIndex(request.getData().getEventIndex());
+ event.setEventCmd(request.getData().getEventCmd());
+ event.setCardNo(request.getData().getCardNo());
+ event.setCarAttributeName(request.getData().getCarAttributeName());
+ if(request.getData().getInResult()!=null && request.getData().getInResult().getRlsResult() !=null ){
+ //鏀捐鏂瑰紡
+ event.setReleaseWay(request.getData().getInResult().getRlsResult().getReleaseWay());
+ event.setReleaseAuth(request.getData().getInResult().getRlsResult().getReleaseAuth());
+ event.setReleaseReason(request.getData().getInResult().getRlsResult().getReleaseReason());
+ event.setReleaseResult(request.getData().getInResult().getRlsResult().getReleaseResult());
+ event.setReleaseResultEx(request.getData().getInResult().getRlsResult().getReleaseResultEx());
+ }
+
+ if(request.getData().getPicUrl()!=null){
+ //杞﹁締鍜屽拰杞︾墝鐓х墖
+ event.setVehiclePicUrl(getHkImgUrl(request.getData().getPicUrl().getVehiclePicUrl()));
+ event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
+ }
+
+ return event;
+
+ }
+
private void saveInterfaceLog(Object param, String path,String result) {
InterfaceLog hkMonitoryLogDO=new InterfaceLog();
hkMonitoryLogDO.setType(1);
--
Gitblit v1.9.3