From 5c63d3fa13956182f999a02ebd291161cf1b32bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 03 一月 2025 18:22:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
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 5854665..9132ddb 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
@@ -168,6 +168,10 @@
for(Integer t :statusList){
for(TmsCircleStatusListResponse status :data){
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
+ && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.rggx)) {
+ continue;
+ }
+ if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
}
@@ -220,7 +224,7 @@
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getDriverTaskList[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskList[0];
TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse> > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskList[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsDriveTaskListResponse>>>(){});
if(response ==null || response.getData() == null){
@@ -241,7 +245,7 @@
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getDriverTaskDetail[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.getDriverTaskDetail[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getDriverTaskDetail[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null || response.getData() == null){
@@ -261,7 +265,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.driverStart[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverStart[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverStart[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null || !StringUtils.equals(response.getCode(),"0")){
@@ -283,7 +287,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.driverArrival[0];
- url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
+// url = "http://10.163.4.56:8088"+TMSContants.InterfacePath.driverArrival[0];
TmsBaseResponse<TmsDriveTaskInfoResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.driverArrival[1],JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsDriveTaskInfoResponse>>(){});
if(response ==null ||!StringUtils.equals(response.getCode(),"0")){
--
Gitblit v1.9.3