From 955873b451cadfbc71bf21f4f7f8717d8a10936a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 19:27:50 +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 | 175 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 141 insertions(+), 34 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 3c3cec7..645a5b9 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
@@ -2,32 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
-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.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.DateUtil;
import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.wms.model.request.*;
-import com.doumee.core.wms.model.response.WmsBaseDataResponse;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.service.business.impl.SmsEmailServiceImpl;
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;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -134,25 +124,34 @@
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;
+ }
+ if(i == 1){
+ tem=TMSContants.TopStatusLevel.ydh;
+ }
+ if(i == 2){
+ tem=TMSContants.TopStatusLevel.clysz;
+ }
+ if(i == 4){
+ tem=TMSContants.TopStatusLevel.ckckz;
+ }
+ if(i == 3){
+ tem=TMSContants.TopStatusLevel.ydpzz;
+ }
+ if(i == 5){
+ tem=TMSContants.TopStatusLevel.ddsc;
}
t.setName(tem.getName());
t.setKey(tem.getKey());
t.setSecondList(getSecondCircleStatusList(tem,response.getData()));
- list.add(t);
+ if(t.getSecondList()!=null & t.getSecondList().size()>0){
+ list.add(t);
+ }
}
}
-
+ Collections.sort(list, (o1, o2) -> {
+ return o2.getKey() - o1.getKey(); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -165,12 +164,28 @@
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.getType(),TMSContants.StatusCode.app)) {
+ 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.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;
}
@@ -181,21 +196,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();
}
}
/**
@@ -211,7 +241,8 @@
}
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();
@@ -226,6 +257,82 @@
result.setCicleStatusList(getCicleStatusList(p1));
return result;
}
+ /**
+ * 鍏ㄥ浗鍒拌揣鍦板垎甯冩煡璇㈡煡璇�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsDistributionOfDeliveryLocResponse> getDistributionOfDeliveryLocations(TmsFacrotyCodeListRequest param){
+ List<TmsDistributionOfDeliveryLocResponse> result = new ArrayList<>();
+ if( param.getFacrotyCodeList() == null || param.getFacrotyCodeList().size() == 0){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add("0");
+ }
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getDistributionOfDeliveryLocations[0];
+ TmsBaseResponse< List<TmsDistributionOfDeliveryLocResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getDistributionOfDeliveryLocations[1],
+ JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse< List<TmsDistributionOfDeliveryLocResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 瀹炴椂搴撳瓨鏌ヨ
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsInventoryListResponse> getRealTimeInventory( ){
+ List<TmsInventoryListResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getRealTimeInventory[0];
+ TmsBaseResponse< List<TmsInventoryListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getRealTimeInventory[1]
+ ,"{}"
+ ,new TypeReference< TmsBaseResponse< List<TmsInventoryListResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 鏌ヨ5涓巶鐨勮繍鍔涜祫婧愬埄鐢ㄦ儏鍐�
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsTotalAndReportVehicleQtyResponse> getTotalAndReportVehicleQty( ){
+ List<TmsTotalAndReportVehicleQtyResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getTotalAndReportVehicleQty[0];
+ TmsBaseResponse< List<TmsTotalAndReportVehicleQtyResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getTotalAndReportVehicleQty[1]
+ ,"{}"
+ ,new TypeReference< TmsBaseResponse< List<TmsTotalAndReportVehicleQtyResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+
+ return result;
+ }
+ /**
+ * 鎸囧畾鏃堕棿鑼冨洿鍐呯疮璁″嚭搴撻噺
+ * @return TmsBaseResponse
+ */
+ @Override
+ public List<TmsOutQtyAndVehicleQtyResponse> getOutQtyAndVehicleQty(TmsOutQtyAndVehicleQtyRequest param ){
+ List<TmsOutQtyAndVehicleQtyResponse> result = new ArrayList<>();
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getOutQtyAndVehicleQty[0];
+ TmsBaseResponse< List<TmsOutQtyAndVehicleQtyResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOutQtyAndVehicleQty[1]
+ ,JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse< List<TmsOutQtyAndVehicleQtyResponse>>>(){});
+ if(response!=null && response.getData()!=null){
+ result =response.getData();
+ }
+ return result;
+ }
/**
* 鍙戣捣 tms鎺ュ彛璇锋眰
--
Gitblit v1.9.3