From f6f097390b999e261f4369313ee6c6afa1b8c276 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十二月 2024 19:37:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 12 -
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 25 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 51 +++++-
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java | 17 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java | 20 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 40 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java | 16 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java | 29 +++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 91 ++++++++----
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java | 27 +++
18 files changed, 274 insertions(+), 91 deletions(-)
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 099da4a..8ecd0a5 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 42d942c..d46799d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -6,10 +6,7 @@
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
+import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
@@ -51,7 +48,7 @@
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
@LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
+ public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
return ApiResponse.success(tmsService.orderList(request));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 643d77e..5698d26 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
@@ -71,6 +72,13 @@
BoardCarsListVO data = boardService.platformJobCarsList();
return ApiResponse.success(data);
}
+ @LoginNoRequired
+ @ApiOperation("姹借溅鍛婅浜嬩欢闆嗗悎鏁版嵁")
+ @GetMapping("/carsEventList")
+ public ApiResponse<List<CarsAlarmResultListResponse>> carsEventList() {
+ List<CarsAlarmResultListResponse> data = boardService.carsEventList();
+ return ApiResponse.success(data);
+ }
@LoginNoRequired
@ApiOperation("鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎")
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 ed95c67..e29c243 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
@@ -34,6 +34,8 @@
private static final String DEFAULT_CHARSET = "UTF-8";
private static final String REGION_ID = "cn-hangzhou";
private static final String VERSION = "2.1.0";
+
+ public static List<CarsDeviceDetaisResponse> HK_CARS_LIST= null;
public static String BASE_URL = "https://open.hikvisionauto.com:14021/v2/";
private static TreeMap<String, String> getBaseParams() {
Map<String, String> params = Maps.newHashMap();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index af560be..cb2e90c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -14,11 +14,11 @@
String[] getRealTimeInventory = new String[]{"/tms/zhyt/getRealTimeInventory", "銆怲MS銆戝疄鏃跺簱瀛樻煡璇�"};//TMS瀹炴椂搴撳瓨鏌ヨ鎺ュ彛鍦板潃
String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound", "銆怲MS銆戝嚭鍏ュ簱璁板綍鏌ヨ"};//TMS鍑哄叆搴撹褰曟煡璇㈡帴鍙ｅ湴鍧�
String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝湪閫旀槑缁嗗垪琛�"};//TMS鍦ㄩ�旀槑缁嗗垪琛ㄦ帴鍙ｅ湴鍧�
- String[] getOrderList = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
+ String[] getOrderList = new String[]{"/tms/zhyt/getOrderList", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
String[] getElecByContractNumberList = new String[]{"/tms/zhyt/getElecByContractNumberList", "銆怲MS銆戝悎鍚屼笂閿佺姸鎬�"};//TMS鍚堝悓涓婇攣鐘舵�佹帴鍙ｅ湴鍧�
String[] getOrderDetailByContractNumber = new String[]{"/tms/zhyt/getOrderDetailByContractNumber", "銆怲MS銆戝悎鍚岃鎯�"};//TMS鍚堝悓璇︽儏鎺ュ彛鍦板潃
String[] getGis = new String[]{"/tms/zhyt/getGis", "銆怲MS銆戞牴鎹繍杈撳崟鍙锋煡璇is杞�"};//TMS鏍规嵁杩愯緭鍗曞彿鏌ヨgis杞ㄦ帴鍙ｅ湴鍧�
- String[] getOrderStatusByContractNumber = new String[]{";//", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
+ String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
}
public enum TopStatusLevel {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
new file mode 100644
index 0000000..efd2fe5
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鍒楄〃椤电爜璇锋眰鍙傛暟")
+public class TmsOrderListPagerRequest {
+
+
+ private Integer page ;//鏄� 鏁板瓧 褰撳墠椤�
+ private Integer rows ;//鏄� 鏁板瓧 姣忛〉鏁版嵁閲廋reateDateTimeEnd;//鎴鏃堕棿
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
new file mode 100644
index 0000000..e2b6122
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
@@ -0,0 +1,27 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鍒楄〃璇锋眰鍙傛暟")
+public class TmsOrderListParamRequest {
+
+
+ private List<String> permissionDomainIdList; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ private List<String> contractNumbers; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+ private String contractNumber; // 鍚� 鍚堝悓鍙烽泦鍚�
+ private String deliveryEnterprise ;//鍚� 瀛楃涓� 鍙戣揣鍦�
+ private String receiveEnterprise ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
+ 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/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index 270afdc..52a9fb0 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
@@ -10,17 +10,11 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("tms鍚堝悓鍒楄〃璇锋眰鍙傛暟")
+@ApiModel("tms鍚堝悓鍒楄〃鍒嗛〉璇锋眰鍙傛暟")
public class TmsOrderListRequest {
- private List<String> permissionDomainIdList; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
- private List<String> contractNumbers; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
- private String fromRepertoty ;//鍚� 瀛楃涓� 鍙戣揣鍦�
- private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
- private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
- private String ncCreateDateTimeEnd;//鎴鏃堕棿
- private String ncCreateDateTimeStart;// 寮�濮嬫椂闂�
- private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
+ private TmsOrderListParamRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ private TmsOrderListPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
new file mode 100644
index 0000000..0c519f9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
@@ -0,0 +1,16 @@
+package com.doumee.core.tms.model.response;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TmsBasePageResponse<T> {
+ private int totalCount;// number False 鎬昏褰曟潯鏁�
+ private int totalPage;// 鎬婚〉鏁� Integer
+ private int currentPage ;//褰撳墠椤� Integer
+ private int pageSize;// 鏌ヨ鏁版嵁璁板綍鎬绘暟 Long
+ @JSONField(name="rows",alternateNames = {"results","list"})
+ private List<T> rows ;// object[] False 鏉冮檺缁勫璞″垪琛�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
index ed3a608..0ff38e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,17 +9,27 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熻繑鍥炲弬鏁�")
+@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熺姸鎬佹槑缁嗚繑鍥炲弬鏁�")
public class TmsCircleStatusListResponse {
/**
*/
-
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�" )
private String orderStatusDes ;//瀛楃涓� 璁㈠崟鐘舵�佹弿杩�
-
+ @ApiModelProperty(value = "鐘舵�佽褰曟椂闂�" )
private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佺爜" )
private Integer orderStatus;// 瀛楃涓� 璁㈠崟鐘舵�佺爜
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佽褰曠被鍨�" )
private Integer type;// 瀛楃涓� 璁㈠崟鐘舵�佽褰曠被鍨�
+ @ApiModelProperty(value = "鎾ら攢鍘熷洜" )
private String canCelReason;// 瀛楃涓� 鎾ら攢鍘熷洜
+ @ApiModelProperty(value = "鍙风爜" )
private String tel ;//瀛楃涓� 鍙风爜
+
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佸敮涓�鏍囪瘑" )
+ private Integer statusKey;// 瀛楃涓� 璁㈠崟鐘舵�佺爜
+
+ private long timeStamp;//
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
index 8910650..91f44ba 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -14,9 +15,11 @@
public class TmsCircleStatusResultListResponse {
/**
*/
-
- private Integer key ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
- private String name ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
+ @ApiModelProperty(value = "绱㈠紩鍊�" )
+ private int key ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ @ApiModelProperty(value = "闃舵鍚嶇О" )
+ private String name ;//瀛楃涓�
+ @ApiModelProperty(value = "浜岀礆鏁版嵁闆嗗悎" )
private List<TmsCircleStatusListResponse> secondList ;//浜岀礆鏁版嵁闆嗗悎
}
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 21e0d04..a0e66fb 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
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -13,22 +14,42 @@
@ApiModel("tms鍚堝悓璇︽儏杩斿洖鍙傛暟")
public class TmsOrderInfoResponse {
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
private String contractNumber ; //鍚堝悓鍙�
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String deliveryEnterprise ; //鍙戣揣鍦�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String receiveEnterprise ; //鍒拌揣鍦�
- private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+// @ApiModelProperty(value = "杞︾墝鍙�" )
+// private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
private String orderStatus ; //褰撳墠杩愯緭鍗曠姸鎬�
+ @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
private String ncCreateDate; // 鍒跺崟鏃堕棿
+ @ApiModelProperty(value = "杩愯緭濡傛湡" )
private String transportDate; //
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
private String transportCode; //
+ @ApiModelProperty(value = "鍙告満濮撳悕" )
private String driverName; //
+ @ApiModelProperty(value = "鍙告満鐢佃瘽" )
private String driverTel; //
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
private String orderStatusDesc; //
+ @ApiModelProperty(value = "杞︾墝鍙�" )
private String plateName; //": "鐨朇C2585",
+ @ApiModelProperty(value = "鍙戣揣浠撳簱缁忓害" )
private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鍙戣揣浠撳簱绾害" )
private String deliveryLat ; // 鍙戣揣浠撳簱绾害
+ @ApiModelProperty(value = "鍗歌揣浠撳簱缁忓害" )
private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鍗歌揣浠撳簱绾害" )
private String receiveLat; // 鍗歌揣浠撳簱绾害
- private List<TmsGisListResponse> gisList;
+ @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
+ private String plannedArrivedDate; // 璁″垝鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "gis杞ㄨ抗缁忕含搴﹂泦鍚�" )
+ private List<TmsGisListResponse> gisList;
+ @ApiModelProperty(value = "鐢熷懡鍛ㄦ湡闆嗗悎" )
private List<TmsCircleStatusResultListResponse> cicleStatusList;
}
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 81d5f4c..fde4887 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
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -27,18 +28,36 @@
"message": "鎿嶄綔鎴愬姛"
}
*/
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
private String contractNumber; // 鍚堝悓鍙�
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String fromRepertoty; // 鍙戣揣鍦�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String toRepertoty ; //鍒拌揣鍦�
- private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String plateName; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
private String orderStatus; // 褰撳墠杩愯緭鍗曠姸鎬�
+ @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
private String ncCreateDate; // 鍒跺崟鏃堕棿
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String deliveryEnterprise; // 鍙戣揣鍦� 鍙戣揣浠撳簱鍚嶇О
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String receiveEnterprise; // 鍒拌揣鍦� 鍗歌揣浠撳簱鍚嶇О
- private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
- private String deliveryLat ; // 鍙戣揣浠撳簱绾害
- private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
- private String receiveLat; // 鍗歌揣浠撳簱绾害
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
private String transportCode; // 杩愯緭鍗曞彿 鍙兘涓虹┖锛堟棤杩愯緭鍗曠殑鎯呭喌锛�
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+ private String orderStatusDesc; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鍙戣揣鍦扮含搴�" )
+ private String deliveryLon; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鍙戣揣鍦扮粡搴�" )
+ private String deliveryLat; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鏀惰揣鍦扮含搴�" )
+ private String receiveLon; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鏀惰揣鍦扮粡搴�" )
+ private String receiveLat; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
+ private String plannedArrivedDate; // 鐘舵�佹弿杩�
+ private long timeStamp;//鏃堕棿鎴�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index 34f2c0d..a026c36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -58,6 +58,19 @@
}
Constants.DEALING_HK_NOTICE_LIST =true;
try {
+ List<String> users = new ArrayList<>();
+ users.add(username);
+ List<Integer> userIds = new ArrayList<>();
+ List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .in(Member::getPhone,users)
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ Member tu= getFromUserList(username,userList);
+ if(tu!=null){
+ userIds.add(tu.getId());
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
+ }
Date date = new Date();
List<GetTodoListResponse> allHkList = new ArrayList<>();
boolean hasNext = true;
@@ -88,16 +101,10 @@
}
curPage++;
}
- if(allHkList!=null && allHkList.size()>0){
- List<Notices> list = new ArrayList<>();
- List<String> users = new ArrayList<>();
- for(GetTodoListResponse data :allHkList){
- users.add(data.getUserId());
- }
- List<Integer> userIds = new ArrayList<>();
- List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
- .in(Member::getPhone,users)
- .eq(Member::getIsdeleted,Constants.ZERO));
+
+
+ if(allHkList!=null && allHkList.size()>0){
+ List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
if(u==null){
@@ -132,14 +139,17 @@
notices.setType(Constants.noticesObjectType.hknotice);
list.add(notices);
}
- if(list.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
+ if(list.size()>0){
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
+ if(userIds.size()>0){
+ //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+ noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+ .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+ .in(Notices::getUserId, userIds));
+ }
+
}catch (Exception e){
e.printStackTrace();
}finally {
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 afbc248..3789e72 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
@@ -182,7 +182,7 @@
toatalNum =1;
}
data.setTotalNum(new BigDecimal(toatalNum));
- data.setUseRate(data.getTotalNum().divide(data.getNum(),2,BigDecimal.ROUND_UP));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_UP));
return data;
}
@@ -670,6 +670,7 @@
List<PlatformJob> dataList = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
.selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -680,7 +681,7 @@
TransportMeasureVO data = new TransportMeasureVO();
data.setPlanDate(date);
data.setPlanTimes(0);
- data.setPlanTaskNum(new BigDecimal(random.nextInt(0)));
+ data.setPlanTaskNum(new BigDecimal( 0));
data.setFinishTaskNum(new BigDecimal(0));
for(PlatformJob job :dataList){
if(queryType == 2){
@@ -847,44 +848,50 @@
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
- new MPJLambdaWrapper<PlatformJob>()
- .selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
-// .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(month)+") and month(create_date) = month("+DateUtil.getPlusTime2(month)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(month)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
List<PlatformJob> monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastMonth)+") and month(create_date) = month("+DateUtil.getPlusTime2(lastMonth)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastMonth)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and done_date<= '"
+ +DateUtil.getPlusTime2(lastMonth)+"'"));
List<PlatformJob> yearNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
- .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getType,PlatformJob::getType)
+// .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(year)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(year)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(year)+"') and done_date<= '"+DateUtil.getPlusTime2(year)+"'"));
List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getId)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"') and done_date<= '"+DateUtil.getPlusTime2(lastYear)+"'"));
data.setMonthOutTotal(getSumTotalByList(monthNum,0,null));//鏈湀鍑哄簱閲�
- data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湁鍑哄簱閲�
+ data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湀鍑哄簱閲�
data.setYearOutTotal(getSumTotalByList(yearNum,null,null) );//鏈勾鍑哄簱閲�
data.setYearLastOutTotal(getSumTotalByList(yearLastNum,null,null) );//鍘诲勾鍑哄簱閲�
data.setMonthOutTimes(monthNum!=null?monthNum.size():0);
@@ -900,19 +907,30 @@
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
- .apply(" and to_days(create_date) <to_days(now())"));
+ .apply(" to_days(create_date) <to_days(now())"));
- //==========浠婂ぉ鍑哄叆搴撲换鍔�
- List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ //==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
+ List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply(" to_days(done_date) = to_days(now())"));
+ //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔�----
+ List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .apply(" to_days(create_date) = to_days(now())"));
BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
@@ -920,8 +938,8 @@
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
- data.setCurrentInDoneNum(getSumTotalByList(currentNum,0,1));//浠婃棩瀹屾垚閲�
- data.setCurrentOutDoneNum(getSumTotalByList(currentNum,1,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
//------------浠婃棩鍑哄叆搴撴晥鐜�----------------
BigDecimal outHours = getTotalDoneTimes(currentNum,0);//
@@ -933,15 +951,15 @@
data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
//------------鏈湀鍑哄叆搴撴晥鐜�----------------
- BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
+// BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());
- BigDecimal outYearHours = getTotalDoneTimes(yearNum,0).add(outHours);//
- BigDecimal inYearHours = getTotalDoneTimes(yearNum,1).add(inHours);//
- if(outYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthOutRate(outMonthNum.divide(outYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ BigDecimal outMonthHours = getTotalDoneTimes(monthNum,0).add(outHours);//
+ BigDecimal inMonthHours = getTotalDoneTimes(monthNum,1).add(inHours);//
+ if(outMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthOutRate(data.getMonthOutTotal().divide(outMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
- if(inYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthInRate(inMonthNum.divide(inYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ if(inMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
return data;
}
@@ -1015,12 +1033,20 @@
// if(Constants.formatBigdecimal(job.getIoQty()).compareTo(new BigDecimal(0)) >0){
// r.add( job.getIoQty());
// }else{
- r.add(Constants.formatBigdecimal(job.getTotalNum()));
+ r = r.add(Constants.formatBigdecimal(job.getTotalNum()));
// }
}
return Constants.formatBigdecimal0Float(r);
}
+ @Override
+ public List<CarsAlarmResultListResponse> carsEventList(){
+
+ if(HKCarOpenService.HK_CARS_LIST == null){
+ HKCarOpenService.HK_CARS_LIST = HKCarOpenService.getAllCarsDetais();
+ }
+ return HKCarOpenService.getAlarmEvemtList( HKCarOpenService.HK_CARS_LIST,new Date());
+ }
@Override
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
@@ -1057,7 +1083,8 @@
.groupBy(PlatformJob::getCarCodeFront));
data.setBusyNum( busyNum!=null ?busyNum.size():0);//鍦ㄩ�旀湁浠诲姟鏁伴噺
data.setIdleNum(codes.size() -data.getBusyNum());//鏃犱换鍔＄┖闂叉暟閲�
- data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
+ HKCarOpenService.HK_CARS_LIST = detaisResponses;
+// data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
if(busyNum != null){
FLAG: for(CarsDeviceDetaisResponse model:detaisResponses){
for(PlatformJob job : busyNum){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 7772152..f0f2918 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
@@ -154,7 +155,9 @@
}
}
}
-
+ Collections.sort(list, (o1, o2) -> {
+ return o2.getKey() - o1.getKey(); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -169,19 +172,26 @@
for(TmsCircleStatusListResponse status :data){
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),t )){
status.setOrderStatusDes(TMSContants.ChildStatusLevel.getInfo(status.getOrderStatus(),null));
list.add(status);
}
+ Date td =DateUtil.fromStringToDate("yyy-MM-dd HH:mm:ss",status.getRecordDate());
+ if(td!=null){
+ status.setTimeStamp(td.getTime());
+ }
}
}
}
+ Collections.sort(list, (o1, o2) -> {
+ return (int) (o2.getTimeStamp() - o1.getTimeStamp()); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -192,21 +202,36 @@
* @return TmsBaseResponse
*/
@Override
- public List<TmsOrderListResponse> orderList(TmsOrderListRequest param){
- if(StringUtils.isBlank(param.getPhoneNumber())){
- param.setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
+ public TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param){
+ if(param == null){
+ param = new TmsOrderListRequest();
+ }
+ if(param.getParameters() == null){
+ param.setParameters( new TmsOrderListParamRequest());
+ }
+ if(param.getPager() == null){
+ param.setPager( new TmsOrderListPagerRequest());
+ }
+ if(param.getPager().getPage() == null){
+ param.getPager().setPage(1);
+ }
+ if(param.getPager().getRows() == null){
+ param.getPager().setRows(10);
+ }
+ if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
+ param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
}
- if(param.getContractNumbers()==null || param.getContractNumbers().size()==0){
- param.setContractNumbers(null);
+ if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
+ param.getParameters().setContractNumbers(null);
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderList[0];
- TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
+ TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>>>(){});
if(response ==null){
- return new ArrayList<>();
+ return new TmsBasePageResponse<>();
}else{
- return response.getData()==null?new ArrayList<>():response.getData();
+ return response.getData()==null?new TmsBasePageResponse<>():response.getData();
}
}
/**
@@ -222,7 +247,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderDetailByContractNumber[0];
- TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],JSONObject.toJSONString(param)
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],param.getContractNumber()
,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
if(response!=null && response.getData()!=null){
result =response.getData();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index d024f45..c7f9572 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.third;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
@@ -89,4 +90,6 @@
BoardStockListVO stockList();
List<GeneralVO> todayTotalInList();
+
+ List<CarsAlarmResultListResponse> carsEventList();
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index ee29b17..96842a4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -34,7 +34,7 @@
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
- List<TmsOrderListResponse> orderList(TmsOrderListRequest param);
+ TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
List<TmsGisListResponse> gisList(TmsGisListRequest param);
List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
/**
--
Gitblit v1.9.3