From 5d680ab70930ae9ff897e18a9a49288144347e33 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 15:03:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 32 ++++++++++++----
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 5 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 11 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisListResponse.java | 21 ++++++++++
5 files changed, 58 insertions(+), 13 deletions(-)
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 74f0936..af560be 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
@@ -34,9 +34,9 @@
ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getKey()
,ChildStatusLevel.ysdcx.getKey()
,ChildStatusLevel.shtg.getKey()
- ,ChildStatusLevel.shwtg.getKey()
- ,ChildStatusLevel.ysdcx.getKey()}),
+ ,ChildStatusLevel.shwtg.getKey()}),
ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
+ ,ChildStatusLevel.sqzyzwc.getKey()
,ChildStatusLevel.clqddzs.getKey()}),
clysz(3, "杞﹁締杩愯緭涓�",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
ydh(4,"宸插埌璐�",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
@@ -78,6 +78,22 @@
this.chileIndexList = chileIndexList;
}
}
+ public interface StatusCode{
+ /**
+ * 1-鍑嗚繍璇�
+ * 2-鐢靛瓙閿佹苯杩�
+ * 3-鐢靛瓙閿侀潪姹借繍
+ * 4-GIS
+ * 5-APP
+ * 6-浜哄伐鏇存柊
+ */
+ int zyz =1;
+ int dzsqy =2;
+ int dzsfqy =3;
+ int gis =4;
+ int app =5;
+ int rggx =6;
+ }
public enum ChildStatusLevel {
/**
璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛� 0 璁㈠崟鐢熸垚锛堝彂璐т粨搴撹仈绯荤數璇濓細0551-63451234锛�
@@ -98,11 +114,11 @@
ysdcx(2, -2,1,"杩愯緭鍗曟挙閿�",null ),
shtg(3,-1, 1,"杩愯緭鍗曞鏍告湭閫氳繃",null ),
shwtg(4, 2,1,"杩愯緭鍗曞鏍搁�氳繃",null),
- ysdqr(5,6, 1,"杩愯緭鍗曠‘璁�",null ),
+ sqzyzwc(5,6, 1,"鐢宠鍑嗚繍璇佸畬鎴�","杞﹁締鍑嗚繍璇佺敵璇峰畬鎴�" ),
ddzhddzs(6,3,2,"鍒拌揪瑁呰揣鍦�-鐢靛瓙閿佹苯杩�","杞﹁締宸插埌杈捐璐у湴" ),
- clqddzs(7, null,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
- clqdapp(8, 4,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
- ddzhd(9, 5,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
+ clqddzs(7, 4,2,"杞﹁締鍚繍-鐢靛瓙閿佹苯杩�","杞﹁締瑁呰揣瀹屾垚锛岀數瀛愰攣宸蹭笂閿�" ),
+ clqdapp(8, 7,3,"杞﹁締鍚繍-APP","杞﹁締杩愯緭涓�" ),
+ ddzhd(9, 8,4,"鍒拌揪鍗歌揣鍦�-APP","杞﹁締宸插埌杈惧嵏璐у湴" ),
ddxhd(10, 5,5,"鍒拌揪鍗歌揣鍦�-鐢靛瓙閿佹苯杩�","鐢靛瓙閿佸凡瑙ｉ攣锛岃繍杈撲换鍔″凡瀹屾垚" ),
;
@@ -129,9 +145,9 @@
}
return null;
}
- public static String getInfo(int key,String defualt) {
+ public static String getInfo(int orderStatus,String defualt) {
for (ChildStatusLevel c : ChildStatusLevel.values()) {
- if (c.getKey() == key) {
+ if (c.getOrderStatus() == orderStatus) {
return StringUtils.defaultString(c.getInfo(),StringUtils.defaultString(defualt,c.getName()));
}
}
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 c6e3459..69d1322 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
@@ -14,7 +14,7 @@
*/
private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
- private String orderStatus ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
+ private Integer orderStatus ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
private String orderStatusDes ;//瀛楃涓� 璁㈠崟鐘舵�佹弿杩�
}
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/TmsOrderInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
index e80dbc7..21e0d04 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
@@ -29,7 +29,6 @@
private String deliveryLat ; // 鍙戣揣浠撳簱绾害
private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
private String receiveLat; // 鍗歌揣浠撳簱绾害
-
- List<TmsCircleStatusResultListResponse> cicleStatusList;//鐢熷懡鍛ㄦ湡鏁版嵁
- List<TmsGisListResponse> gisList;//缁忕含搴﹂泦鍚�
+ private List<TmsGisListResponse> gisList;
+ private List<TmsCircleStatusResultListResponse> cicleStatusList;
}
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 3c3cec7..afd5b16 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
@@ -165,7 +165,16 @@
if(statusList!=null){
for(Integer t :statusList){
for(TmsCircleStatusListResponse status :data){
- if(StringUtils.equals(status.getOrderStatus(),t.toString())){
+ if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
+ && Constants.equalsInteger(status.getOrderStatus(),TMSContants.StatusCode.app)) {
+ status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
+ }
+ if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
+ && Constants.equalsInteger(status.getOrderStatus(),TMSContants.StatusCode.app)) {
+ status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
+ }
+ if(Constants.equalsInteger(status.getOrderStatus(),t )){
+ status.setOrderStatusDes(TMSContants.ChildStatusLevel.getInfo(status.getOrderStatus(),null));
list.add(status);
}
}
--
Gitblit v1.9.3