From 6e2e6d490b2ff38e098bb708bf4ee459631934f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 19:14:00 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java | 9 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java | 2 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 40 +++++++++----------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 5 ++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java | 2 +
6 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index d391173..270afdc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -19,7 +19,8 @@
private String fromRepertoty ;//鍚� 瀛楃涓� 鍙戣揣鍦�
private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
-
+ private String ncCreateDateTimeEnd;//鎴鏃堕棿
+ private String ncCreateDateTimeStart;// 寮�濮嬫椂闂�
private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
index f412829..bc7496a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
@@ -13,21 +13,19 @@
/**
{
"code": 0,
- "data": [
- {
- "contractNumber": "112718591",
- "ncCreateDate": "2024-06-20 09:08:01",
- "deliveryEnterprise": "铓屽煚鎴愬搧搴�",
- "receiveEnterprise": "瀹垮窞甯傚嵎鐑熼厤閫佷腑蹇�",
- "transportCode": "39828",
- "transportDate": "2024-06-20 09:04:46.0",
- "driverName": "鐜嬩粯鍏�",
- "driverTel": "19955211695",
- "plateName": "鐨朇C2585",
- "orderStatus": "5",
- "orderStatusDesc": "鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�"
- }
- ],
+ "data": {
+ "contractNumber": "112718591",
+ "ncCreateDate": "2024-06-20 09:08:01",
+ "deliveryEnterprise": "铓屽煚鎴愬搧搴�",
+ "receiveEnterprise": "瀹垮窞甯傚嵎鐑熼厤閫佷腑蹇�",
+ "transportCode": "39828",
+ "transportDate": "2024-06-20 09:04:46.0",
+ "driverName": "鐜嬩粯鍏�",
+ "driverTel": "19955211695",
+ "plateName": "鐨朇C2585",
+ "orderStatus": "5",
+ "orderStatusDesc": "鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�"
+ },
"message": "鎿嶄綔鎴愬姛"
}
*/
@@ -38,11 +36,11 @@
private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
private String orderStatus ; //褰撳墠杩愯緭鍗曠姸鎬�
private String ncCreateDate; // 鍒跺崟鏃堕棿
- private String transportDate; //
- private String transportCode; //
- private String driverName; //
- private String driverTel; //
- private String orderStatusDesc; //
-
+ private String transportDate; //
+ private String transportCode; //
+ private String driverName; //
+ private String driverTel; //
+ private String orderStatusDesc; //
+ private String plateName; //": "鐨朇C2585",
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
index 417157d..81d5f4c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -33,7 +33,12 @@
private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
private String orderStatus; // 褰撳墠杩愯緭鍗曠姸鎬�
private String ncCreateDate; // 鍒跺崟鏃堕棿
-
-
+ private String deliveryEnterprise; // 鍙戣揣鍦� 鍙戣揣浠撳簱鍚嶇О
+ private String receiveEnterprise; // 鍒拌揣鍦� 鍗歌揣浠撳簱鍚嶇О
+ private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
+ private String deliveryLat ; // 鍙戣揣浠撳簱绾害
+ private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
+ private String receiveLat; // 鍗歌揣浠撳簱绾害
+ private String transportCode; // 杩愯緭鍗曞彿 鍙兘涓虹┖锛堟棤杩愯緭鍗曠殑鎯呭喌锛�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
index eb4e3d8..a47a04f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/OnSitDispatchBoardVO.java
@@ -19,6 +19,8 @@
@ApiModelProperty(value = "绌洪棽鏈堝彴鏁伴噺")
private int freePlatform;
+ @ApiModelProperty(value = "鐩戞帶瑙嗛鎾斁鎻掍欢鍦板潃")
+ private String videoPluginUrl;
@ApiModelProperty(value = "棰勭害杞﹁締")
private int reservationCar;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
index f6a3ad5..b22fbb0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/SecurityBoardVO.java
@@ -52,6 +52,8 @@
@ApiModelProperty(value = "褰撳墠鎶ヨ鎬绘暟")
private int errTotal;
+ @ApiModelProperty(value = "鐩戞帶瑙嗛鎾斁鎻掍欢鍦板潃")
+ private String videoPluginUrl;
@ApiModelProperty(value = "鍐呰繍杞︼紙瀹夋嘲鑷湁杞︼級")
private int internalJobCarTotal;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index c5dbbcc..b23de23 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1445,9 +1445,14 @@
(int) retentionList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.THREE)
&&Constants.equalsInteger(i.getCarType(),Constants.RetentionCarType.outTruck)).count()
);
+ data.setVideoPluginUrl(getVideoUrl());
return data;
}
+ private String getVideoUrl() {
+ return systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()+"plugin/VideoWebPlugin.exe";
+ }
+
private void getParkingCarsNum(SecurityBoardVO data) {
try {
BaseResponse<ParkingStatisticResponse> response = HKService.getParkingStatistics();
--
Gitblit v1.9.3