From 6ef74724e5da3271b77c8953df3c556439eed13d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 14:15:37 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java | 18 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java | 16 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 29 --
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 144 ++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java | 20 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java | 37 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java | 24 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 12
/dev/null | 35 ---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 181 ++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 17 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java | 22 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java | 21 ++
14 files changed, 492 insertions(+), 87 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 95c60b7..a894f13 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -141,9 +141,6 @@
public static final String WMS_GET_INVENTORYLIST_URL ="WMS_GET_INVENTORYLIST_URL" ;
public static final String WMS_OUTBOUND_PLATFROM_URL ="WMS_OUTBOUND_PLATFROM_URL" ;
public static final String TSM_PARAM ="TSM_PARAM" ;
- public static final String TMS_ORDER_LIST_URL ="TMS_ORDER_LIST_URL" ;
- public static final String TMS_ORDER_DETAIL_URL ="TMS_ORDER_DETAIL_URL" ;
- public static final String TMS_LOCK_STATUS_URL ="TMS_LOCK_STATUS_URL" ;
public static final String TMS_INTERFACE_URL_PREFIX ="TMS_INTERFACE_URL_PREFIX" ;
public static final String MYSQL_BACKUP_CDOE ="MYSQL_BACKUP_CDOE" ;
public static final String MYSQL_BACKUP_DIR ="MYSQL_BACKUP_DIR" ;
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
new file mode 100644
index 0000000..74f0936
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -0,0 +1,181 @@
+package com.doumee.core.tms.model;
+
+import com.doumee.core.utils.Constants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+public class TMSContants {
+
+ public interface InterfacePath {
+ String[] getSevenArrivalStatus = new String[]{"/tms/zhyt/getSevenArrivalStatus", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�"};//TMS杩�7鏃ュ埌璐ф儏鍐垫帴鍙ｅ湴鍧�
+ String[] getCurrentTransportationTask = new String[]{ "銆怲MS銆�/zhyt/getCurrentTransportationTask", "銆怲MS銆戝綋鍓嶈繍杈撲换鍔�"};//TMS褰撳墠杩愯緭浠诲姟鎺ュ彛鍦板潃
+ String[] getDistributionOfDeliveryLocations = new String[]{"/tms/zhyt/getDistributionOfDeliveryLocations", "銆怲MS銆戝叏鍥藉埌璐у湴鍒嗗竷鏌ヨ鏌ヨ"};//TMS鍏ㄥ浗鍒拌揣鍦板垎甯冩煡璇㈡煡璇㈡帴鍙ｅ湴鍧�
+ 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[] 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璁㈠崟鐢熷懡鍛ㄦ湡
+ }
+
+ public enum TopStatusLevel {
+ /**
+ * 璁㈠崟鐢熸垚
+ * 杩愬崟閰嶈浇涓�
+ * 浠撳簱鍑哄簱涓�
+ * 杞﹁締杩愯緭涓�
+ * 宸插埌璐�
+ * 宸插叆搴�
+ */
+ ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getKey()}),
+ ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getKey()
+ ,ChildStatusLevel.ysdcx.getKey()
+ ,ChildStatusLevel.shtg.getKey()
+ ,ChildStatusLevel.shwtg.getKey()
+ ,ChildStatusLevel.ysdcx.getKey()}),
+ ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
+ ,ChildStatusLevel.clqddzs.getKey()}),
+ clysz(3, "杞﹁締杩愯緭涓�",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
+ ydh(4,"宸插埌璐�",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
+ yrk (5,"宸插叆搴�",new Integer[]{ChildStatusLevel.ddxhd.getKey()});
+
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private Integer[] chileIndexList ;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ TopStatusLevel(int key, String name, Integer[] chileIndexList) {
+ this.key = key;
+ this.chileIndexList = chileIndexList;
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer[] getChileIndexList() {
+ return chileIndexList;
+ }
+
+ public void setChileIndexList(Integer[] chileIndexList) {
+ this.chileIndexList = chileIndexList;
+ }
+ }
+ public enum ChildStatusLevel {
+ /**
+ 璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛� 0 璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛�
+
+ 杩愯緭鍗曞舰鎴� 1 杩愯緭鍗曞舰鎴�
+ 杩愯緭鍗曟挙閿�锛堝師鍥狅細XXX锛� -2 杩愯緭鍗曟挙閿�锛堝師鍥狅細XXX锛�
+ 杩愯緭鍗曞鏍告湭閫氳繃 -1 杩愯緭鍗曞鏍告湭閫氳繃
+ 杩愯緭鍗曞鏍搁�氳繃 2 杩愯緭鍗曞鏍搁�氳繃
+ 杩愯緭鍗曠‘璁� 杩愯緭鍗曠‘璁�
+ 鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩� 3 杞﹁締宸插埌杈捐璐у湴
+ 杞﹁締鍚繍-鐢靛瓙閿佹苯杩� 4 杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�
+ 杞﹁締鍚繍-APP 4 杞﹁締杩愯緭涓�
+ 鍒拌揪鍗歌揣鍦�-APP 5 杞﹁締宸插埌杈惧嵏璐у湴
+ 鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩� 5 鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚
+ */
+ create(0,0, 0,"璁㈠崟鐢熸垚",null),
+ ysdxc(1,1,1, "杩愯緭鍗曞舰鎴�",null),
+ ysdcx(2, -2,1,"杩愯緭鍗曟挙閿�",null ),
+ shtg(3,-1, 1,"杩愯緭鍗曞鏍告湭閫氳繃",null ),
+ shwtg(4, 2,1,"杩愯緭鍗曞鏍搁�氳繃",null),
+ ysdqr(5,6, 1,"杩愯緭鍗曠‘璁�",null ),
+ ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
+ clqddzs(7, null,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
+ clqdapp(8, 4,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
+ ddzhd(9, 5,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
+ ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
+ ;
+
+ // 鎴愬憳鍙橀噺
+ private Integer key;
+ private Integer orderStatus;
+ private Integer parentIndex;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ ChildStatusLevel(Integer key,Integer orderStatus,Integer parentIndex, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ this.orderStatus = orderStatus;
+ this.parentIndex = parentIndex;
+ }
+ public static Integer getParentIndexByStatus(int orderStatus) {
+ for (ChildStatusLevel c : ChildStatusLevel.values()) {
+ if (c.getOrderStatus() == orderStatus) {
+ return c.parentIndex;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int key,String defualt) {
+ for (ChildStatusLevel c : ChildStatusLevel.values()) {
+ if (c.getKey() == key) {
+ return StringUtils.defaultString(c.getInfo(),StringUtils.defaultString(defualt,c.getName()));
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public int getOrderStatus() {
+ return orderStatus;
+ }
+
+ public void setOrderStatus(int orderStatus) {
+ this.orderStatus = orderStatus;
+ }
+
+ public int getParentIndex() {
+ return parentIndex;
+ }
+
+ public void setParentIndex(int parentIndex) {
+ this.parentIndex = parentIndex;
+ }
+ }
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java
new file mode 100644
index 0000000..30d7b03
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsCircleStatusListRequest.java
@@ -0,0 +1,16 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熻姹傚弬鏁�")
+public class TmsCircleStatusListRequest {
+
+ private String contractNumber ;//鏄� 鍚堝悓鍙�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java
new file mode 100644
index 0000000..fed48a9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsGisListRequest.java
@@ -0,0 +1,18 @@
+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鏌ヨGIS闆嗗悎璇锋眰鍙傛暟")
+public class TmsGisListRequest {
+
+ private String transportCode;// 瀛楃涓� 杩愯緭鍗曞彿
+
+}
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
new file mode 100644
index 0000000..c6e3459
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熻繑鍥炲弬鏁�")
+public class TmsCircleStatusListResponse {
+ /**
+ */
+
+ private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ private String orderStatus ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
+ private String orderStatusDes ;//瀛楃涓� 璁㈠崟鐘舵�佹弿杩�
+
+}
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
new file mode 100644
index 0000000..8910650
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
@@ -0,0 +1,22 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熻繑鍥炲弬鏁�")
+public class TmsCircleStatusResultListResponse {
+ /**
+ */
+
+ private Integer key ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ private String name ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
+ private List<TmsCircleStatusListResponse> secondList ;//浜岀礆鏁版嵁闆嗗悎
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
deleted file mode 100644
index e276007..0000000
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.doumee.core.tms.model.response;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * @author 姹熻箘韫�
- * @date 2023/11/23 14:03
- */
-@Data
-@ApiModel("tms鏌ヨ鍚堝悓鍒楄〃璇锋眰杩斿洖鍙傛暟")
-public class TmsContractListResponse {
- /**
- {
- "code": 0,
- "data": [
- {
- "fromRepertoty": "鍚堣偉鎴愬搧搴�",
- "ncCreateDate": "2023-12-04 10:36:15",
- "toRepertoty": "澶╂触甯備腑蹇冧粨搴�",
- "contractNumber": "112308335",
- "orderStatus": "鍒拌揪鍗歌揣鍦�"
- }
- ],
- "message": "鎿嶄綔鎴愬姛"
- }
- */
- private String contractNumber ;//鍚堝悓鍙�
- private String fromRepertoty ;//鍙戣揣鍦�
- private String toRepertoty ;//鍒拌揣鍦�
- private String plateNumber ;//杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
- private String orderStatus ;//褰撳墠杩愯緭鍗曠姸鎬�
- private String ncCreateDate;// 鍒跺崟鏃堕棿
-
-}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java
new file mode 100644
index 0000000..e59e4b6
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java
@@ -0,0 +1,21 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏌ヨGIS杩斿洖鍙傛暟")
+public class TmsGisListResponse {
+ /**
+ */
+
+ private List<TmsGisStartEndInfoResponse> startAndEndPoint;//闆嗗悎 璧风偣缁堢偣淇℃伅
+ private List<TmsGisStatusInfoResponse> gisList ;//闆嗗悎 璁㈠崟鐘舵�佺爜
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java
new file mode 100644
index 0000000..3d8efab
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStartEndInfoResponse.java
@@ -0,0 +1,37 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏌ヨGIS 璧风偣缁堢偣淇℃伅杩斿洖鍙傛暟")
+public class TmsGisStartEndInfoResponse {
+ /**
+ */
+
+ private String startRepertotyName;// 瀛楃涓� 璧风偣鍚嶇О
+ private String endRepertotyName;// 瀛楃涓� 缁堢偣鍚嶇О
+ private String startLon ;//瀛楃涓� 璧风偣缁忓害
+ private String startLat;// 瀛楃涓� 璧风偣绾害
+ private String endLon ;//瀛楃涓� 缁堢偣缁忓害
+ private String endLat ;//瀛楃涓� 缁堢偣绾害
+ private String plateNumber;// 瀛楃涓� 杞︾墝鍙�
+
+ private String id;//1698530035827830786,
+ private String transportCode;//18451,
+ private String startRepertotyCode;//02001,
+ private String endRepertotyCode;//1134030101,
+ private String volume;//70,
+ private String loadPercent;//0.5385,
+ private String stopNumbers;//0,
+ private String transportDate;//2023-09-04 10:54:52,
+ private String transportMethod;//4,
+ private String generateType;//1,
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
new file mode 100644
index 0000000..96599de
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏌ヨGIS 璁㈠崟鐘舵�佺爜杩斿洖鍙傛暟")
+public class TmsGisStatusInfoResponse {
+ /**
+ */
+
+ private String startRepertotyName;// 瀛楃涓� 璧风偣鍚嶇О
+ private String endRepertotyName;// 瀛楃涓� 缁堢偣鍚嶇О
+ private String startLon ;//瀛楃涓� 璧风偣缁忓害
+ private String startLat;// 瀛楃涓� 璧风偣绾害
+ private String endLon ;//瀛楃涓� 缁堢偣缁忓害
+ private String endLat ;//瀛楃涓� 缁堢偣绾害
+ private String plateNumber;// 瀛楃涓� 杞︾墝鍙�
+
+}
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 bc7496a..e80dbc7 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
@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/23 14:03
@@ -10,26 +12,7 @@
@Data
@ApiModel("tms鍚堝悓璇︽儏杩斿洖鍙傛暟")
public class TmsOrderInfoResponse {
- /**
- {
- "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": "鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�"
- },
- "message": "鎿嶄綔鎴愬姛"
- }
- */
-
+
private String contractNumber ; //鍚堝悓鍙�
private String deliveryEnterprise ; //鍙戣揣鍦�
private String receiveEnterprise ; //鍒拌揣鍦�
@@ -42,5 +25,11 @@
private String driverTel; //
private String orderStatusDesc; //
private String plateName; //": "鐨朇C2585",
+ private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
+ private String deliveryLat ; // 鍙戣揣浠撳簱绾害
+ private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
+ private String receiveLat; // 鍗歌揣浠撳簱绾害
+ List<TmsCircleStatusResultListResponse> cicleStatusList;//鐢熷懡鍛ㄦ湡鏁版嵁
+ List<TmsGisListResponse> gisList;//缁忕含搴﹂泦鍚�
}
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 928be5b..9750228 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
@@ -1174,7 +1174,7 @@
3) 鑷潵姘翠簩姘у寲纰虫帓鏀鹃噺(kg)=鑷潵姘翠娇鐢ㄩ噺(m3)脳0.91锛�*/
data.setCarbon(Constants.formatBigdecimal2Float((carbonElec.multiply(new BigDecimal(0.785)))
.add(carbonGas.multiply(new BigDecimal(0.19)))
- .add(carbonWater.multiply(new BigDecimal(0.91)))));
+ .add(carbonWater.multiply(new BigDecimal(0.91)))).divide(new BigDecimal(1000),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -1258,8 +1258,21 @@
data.setRingPercent("0");
data.setSecondRegionDataList(new ArrayList<>());
}
- return data;
+ if(data.getSecondRegionDataList()!=null && data.getSecondRegionDataList().size()>1){
+ int index =-1;
+ for (int i = 0; i <data.getSecondRegionDataList().size() ; i++) {
+ RegionTopPowerResponse t=data.getSecondRegionDataList().get(i);
+ if(Constants.formatBigdecimal(t.getPercent()).compareTo(new BigDecimal(1)) == 0){
+ index =i;
+ break;
+ }
+ }
+ if(index>-1){
+ data.getSecondRegionDataList().remove(index);//鍒犻櫎鏍硅妭鐐规暟鎹�
+ }
+ }
+ return data;
}
/**
* 杩�12涓按鐢垫皵娌硅�楁暟鎹粺璁�
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 9d3a9a1..3c3cec7 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
@@ -5,13 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
-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.TMSContants;
+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.HttpsUtil;
import com.doumee.core.wms.model.request.*;
@@ -25,6 +21,7 @@
import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,11 +69,109 @@
@Override
public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
- +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_LOCK_STATUS_URL).getCode();
+ + TMSContants.InterfacePath.getElecByContractNumberList[0];
- TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛",JSONObject.toJSONString(param)
+ TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getElecByContractNumberList[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
return response;
+ }
+
+ /**
+ * 杩愯緭鍗昰is杞ㄨ抗
+ * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsGisListResponse> gisList(TmsGisListRequest param){
+
+ if(param.getTransportCode()==null ){
+ return new ArrayList<>();
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getGis[0];
+ TmsBaseResponse<List<TmsGisListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getGis[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<List<TmsGisListResponse>>>(){});
+ if(response ==null){
+ return new ArrayList<>();
+ }else{
+ return response.getData()==null?new ArrayList<>():response.getData();
+ }
+ }
+ /**
+ * 璁㈠崟鐢熷懡鍛ㄦ湡
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param){
+ List<TmsCircleStatusResultListResponse> list =new ArrayList<>();
+ if(param.getContractNumber()==null ){
+ return new ArrayList<>();
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getOrderStatusByContractNumber[0];
+ TmsBaseResponse<List<TmsCircleStatusListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderStatusByContractNumber[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<List<TmsCircleStatusListResponse>>>(){});
+
+ if(response ==null){
+ return new ArrayList<>();
+ }else{
+ /**
+ * ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getKey()}),
+ * ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getKey()
+ * ,ChildStatusLevel.ysdcx.getKey()
+ * ,ChildStatusLevel.shtg.getKey()
+ * ,ChildStatusLevel.shwtg.getKey()
+ * ,ChildStatusLevel.ysdcx.getKey()}),
+ * ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
+ * ,ChildStatusLevel.clqddzs.getKey()}),
+ * clysz(3, "杞﹁締杩愯緭涓�",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
+ * ydh(4,"宸插埌璐�",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
+ * yrk
+ */
+ for (int i = 0; i < 6; i++) {
+ TmsCircleStatusResultListResponse t = new TmsCircleStatusResultListResponse();
+ TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
+ if(i == 0){
+ tem=TMSContants.TopStatusLevel.ddsc;
+ } if(i == 1){
+ tem=TMSContants.TopStatusLevel.ydpzz;
+ } if(i == 2){
+ tem=TMSContants.TopStatusLevel.ckckz;
+ } if(i == 3){
+ tem=TMSContants.TopStatusLevel.clysz;
+ } if(i == 4){
+ tem=TMSContants.TopStatusLevel.ydh;
+ } if(i == 5){
+ tem=TMSContants.TopStatusLevel.yrk;
+ }
+ t.setName(tem.getName());
+ t.setKey(tem.getKey());
+ t.setSecondList(getSecondCircleStatusList(tem,response.getData()));
+ list.add(t);
+ }
+ }
+
+ return list;
+ }
+
+ private List<TmsCircleStatusListResponse> getSecondCircleStatusList(TMSContants.TopStatusLevel tem, List<TmsCircleStatusListResponse> data) {
+ if(data ==null ||data.size()==0){
+ return new ArrayList<>();
+ }
+ List<TmsCircleStatusListResponse> list = new ArrayList<>();
+ Integer[] statusList = tem.getChileIndexList();
+ if(statusList!=null){
+ for(Integer t :statusList){
+ for(TmsCircleStatusListResponse status :data){
+ if(StringUtils.equals(status.getOrderStatus(),t.toString())){
+ list.add(status);
+ }
+ }
+ }
+ }
+ return list;
}
/**
@@ -94,8 +189,8 @@
param.setContractNumbers(null);
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
- +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
- TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�",JSONObject.toJSONString(param)
+ +TMSContants.InterfacePath.getOrderList[0];
+ TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
if(response ==null){
return new ArrayList<>();
@@ -110,15 +205,26 @@
*/
@Override
public TmsOrderInfoResponse orderInfo(TmsOrderInfoRequest param){
- String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
- +systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_DETAIL_URL).getCode();
- TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"銆怲MS銆戝悎鍚岃鎯呮帴鍙�",JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
- if(response ==null){
- return new TmsOrderInfoResponse();
- }else{
- return response.getData()==null?new TmsOrderInfoResponse():response.getData();
+ TmsOrderInfoResponse result = new TmsOrderInfoResponse();
+ if(StringUtils.isBlank(param.getContractNumber())){
+ return result;
}
+ 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)
+ ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+ if(result.getTransportCode()!=null){
+ TmsGisListRequest p = new TmsGisListRequest();
+ p.setTransportCode(result.getTransportCode());
+ result.setGisList(gisList(p));
+ }
+ TmsCircleStatusListRequest p1 = new TmsCircleStatusListRequest();
+ p1.setContractNumber(param.getContractNumber());
+ result.setCicleStatusList(getCicleStatusList(p1));
+ return result;
}
/**
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 0b8a34f..ee29b17 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
@@ -1,12 +1,7 @@
package com.doumee.service.business.third;
-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.request.*;
+import com.doumee.core.tms.model.response.*;
import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
@@ -40,7 +35,8 @@
* @return TmsBaseResponse
*/
List<TmsOrderListResponse> orderList(TmsOrderListRequest param);
-
+ List<TmsGisListResponse> gisList(TmsGisListRequest param);
+ List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
/**
* 鍚堝悓璇︽儏鎺ュ彛
* @param param 鍙傛暟
--
Gitblit v1.9.3