From e2f8fb1fbe26ba6d92f3e5dfcaeb0c69abe76b25 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 十二月 2023 14:28:57 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.java | 6 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java | 6 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 54 +++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.java
index 13da555..6e7d72e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/event/parks/EventParkDataRequest.java
@@ -2,9 +2,13 @@
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class EventParkDataRequest {
private Integer alarmCar ;// Number 鏄惁榛戝悕鍗曟爣璇嗭紙1-榛戝悕鍗� 0-闈為粦鍚嶅崟锛� 鍚�
+
+ private String carAttributeName ;// String 杞﹁締灞炴�у悕绉� 鍚� 64
private String cardNo ;// String 鍗″彿 鍚� 16
private Integer eventCmd;// Number 浜嬩欢鍙� 鏄� 1:鍘嬬嚎浜嬩欢2:涓婁紶鍥剧墖3:鍏ュ満4:鍑哄満5:杞︾墝鐭6:鍥剧墖閲嶄紶
private String eventIndex;// String 浜嬩欢缂栧彿 鏄� 64
@@ -16,7 +20,7 @@
private String parkName ;// String 鍋滆溅搴撳悕绉� 鏄� 64
private EventParkPicRequest picUrl ;//Object 鍚�
private String svrIndex;// String 鍥剧墖鏈嶅姟鍣ㄧ紪鍙� 鍚� 32
- private Integer plateBelieve ;//Number 杞︾墝缃俊搴� 鏄� 鍙栧�艰寖鍥达細0鈥�100
+ private BigDecimal plateBelieve ;//Number 杞︾墝缃俊搴� 鏄� 鍙栧�艰寖鍥达細0鈥�100
private Integer plateColor ;//Number 杞︾墝棰滆壊 鏄� 鍙傝闄勫綍A.15 杞︾墝棰滆壊
private String plateNo ;//String 杞︾墝鍙� 鏄� 32
private Integer plateType;// Number 杞︾墝绫诲瀷 鏄� 鍙傝闄勫綍A.14 杞︾墝绫诲瀷
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
index c34cbb5..0e5319e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarEvent.java
@@ -70,7 +70,7 @@
@ApiModelProperty(value = "浜嬩欢绫诲瀷")
@ExcelColumn(name="浜嬩欢绫诲瀷")
- private String eventType;
+ private Integer eventType;
@ApiModelProperty(value = "浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶", example = "1")
@ExcelColumn(name="浜嬩欢鐘舵��,0-鐬椂 1-寮�濮�2-鍋滄4-浜嬩欢鑱斿姩缁撴灉鏇存柊5-浜嬩欢鍥剧墖寮傛涓婁紶")
@@ -78,7 +78,7 @@
@ApiModelProperty(value = "鑴夊啿瓒呮椂鏃堕棿")
@ExcelColumn(name="鑴夊啿瓒呮椂鏃堕棿")
- private String timeout;
+ private Integer timeout;
@ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@ExcelColumn(name="浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
@@ -158,7 +158,7 @@
@ApiModelProperty(value = "杞︾墝棰滆壊")
@ExcelColumn(name="杞︾墝棰滆壊")
- private String plateColor;
+ private Integer plateColor;
@ApiModelProperty(value = "杞︾墝缃俊搴�", example = "1")
@ExcelColumn(name="杞︾墝缃俊搴�")
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 5f9b1fa..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
@@ -426,8 +426,62 @@
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;
--
Gitblit v1.9.3