From 0ed0fe199bbe27eafc9927f9bceceb5d6aa036ad Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 12 十月 2024 16:23:54 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 99 ---------------------------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 13 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 23 ++++++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java | 33 +++++++++++
5 files changed, 64 insertions(+), 106 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 dd26eaf..d297d31 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
@@ -672,105 +672,6 @@
}
- public enum NoticeType {
-
- ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
- TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
- THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
- FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
- //缁繚閫氱煡
- SIX(6, "","","","","",""),
- //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
- SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
- EIGHT(8, "","","","","",""),
- NINE(9, "","","","","",""),
- ;
-
- // 鎴愬憳鍙橀噺
- private int status;
- private String insuranceApplyDetail;
- private String applyChangeDetail;
- private String changeFactoryDetail;
- private String dispatchUnitDetail;
- private String taxesDetail;
- private String settleClaimsDetail;
-
- // 鏋勯�犳柟娉�
- NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail
- , String changeFactoryDetail,String dispatchUnitDetail
- , String taxesDetail,String settleClaimsDetail) {
- this.status = status;
- this.insuranceApplyDetail = insuranceApplyDetail;
- this.applyChangeDetail = applyChangeDetail;
- this.changeFactoryDetail = changeFactoryDetail;
- this.dispatchUnitDetail = dispatchUnitDetail;
- this.taxesDetail = taxesDetail;
- this.settleClaimsDetail = settleClaimsDetail;
- }
-
-
- // get set 鏂规硶
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
- }
-
- public String getInsuranceApplyDetail() {
- return insuranceApplyDetail;
- }
-
- public void setInsuranceApplyDetail(String name) {
- this.insuranceApplyDetail = insuranceApplyDetail;
- }
-
- public String getApplyChangeDetail() {
- return applyChangeDetail;
- }
-
- public void setApplyChangeDetail(String info) {
- this.applyChangeDetail = applyChangeDetail;
- }
-
- public String getChangeFactoryDetail() {
- return changeFactoryDetail;
- }
-
- public void setChangeFactoryDetail(String info) {
- this.changeFactoryDetail = changeFactoryDetail;
- }
-
- public String getDispatchUnitDetail() {
- return dispatchUnitDetail;
- }
-
- public void setDispatchUnitDetail(String info) {
- this.dispatchUnitDetail = dispatchUnitDetail;
- }
-
- public String getTaxesDetail() {
- return taxesDetail;
- }
-
- public void setTaxesDetail(String info) {
- this.taxesDetail = taxesDetail;
- }
-
- public String getSettleClaimsDetail() {
- return settleClaimsDetail;
- }
-
- public void setSettleClaimsDetail(String info) {
- this.settleClaimsDetail = settleClaimsDetail;
- }
-
-
- }
-
public enum PlatformWarnEvent {
STOP_TIMEOUT(0, "鍋滈潬瓒呮椂","${carCode}鏈堝彴鍋滈潬瓒呮椂" ),
STOP_ERROR(1, "鍋滈潬閿欒","${carCode}鏈堝彴鍋滈潬閿欒" ),
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
index 33158ca..2f2bb09 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java
@@ -2,8 +2,16 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+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.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.service.business.third.TmsService;
import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -11,12 +19,14 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
+import java.util.List;
/**
* @author 姹熻箘韫�
@@ -31,6 +41,8 @@
@Autowired
private WmsService wmsService;
+ @Autowired
+ private TmsService tmsService;
@ApiOperation("銆怶MS銆戞帹閫佸叆搴撳崟閫氱煡浠诲姟")
@PostMapping("/push/inboundNotice")
@@ -69,6 +81,27 @@
doPringParam(request,"銆怶MS銆戞帹閫佸嚭鍏ュ簱浣滀笟瀹屾垚閫氱煡浠诲姟");
return new WmsBaseResponse();
}
+ @ApiOperation("銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛")
+ @LoginNoRequired
+ @PostMapping("/tms/lockStatusQuery")
+ public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) {
+
+ return tmsService.lockStatusQuery(request);
+ }
+ @ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
+ @LoginNoRequired
+ @PostMapping("/tms/orderList")
+ public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
+
+ return tmsService.orderList(request);
+ }
+ @ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
+ @LoginNoRequired
+ @PostMapping("/tms/orderInfo")
+ public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
+
+ return tmsService.orderInfo(request);
+ }
public static void doPringParam(HttpServletRequest request,String name) {
try {
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 716c37b..ad24e60 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
@@ -27,7 +27,7 @@
}
*/
- private String contratNumber ; //鍚堝悓鍙�
+ private String contractNumber ; //鍚堝悓鍙�
private String fromRepertotyName ; //鍙戣揣鍦�
private String toRepertoty ; //鍒拌揣鍦�
private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
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 8da7117..a4defe8 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
@@ -6,9 +6,11 @@
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.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
@@ -58,7 +60,7 @@
* 鐢靛瓙閿佷笂閿佹椂闂存帴鍙�
* 鏍规嵁鍚堝悓鍙凤紝鏌ヨ鐢靛瓙閿佷笂閿佹儏鍐碉紱瀛樺湪鎵归噺鏌ヨ鐨勬儏鍐碉紱
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
@Override
public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param){
@@ -67,14 +69,14 @@
TmsBaseResponse<List<TmsLockStatusQueryResponse>> response = sendHttpRequest(url,"鐢靛瓙閿佷笂閿佹椂闂存帴鍙�",JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsLockStatusQueryResponse>>>(){});
- return new TmsBaseResponse<>();
+ return response;
}
/**
* 鍚堝悓鍒楄〃鎺ュ彛
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
@Override
public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
@@ -82,7 +84,20 @@
+systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_ORDER_LIST_URL).getCode();
TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"鍚堝悓鍒楄〃鎺ュ彛",JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
- return new TmsBaseResponse<>();
+ return response;
+ }
+ /**
+ * 鍚堝悓璇︽儏鎺ュ彛
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsBaseResponse<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,"鍚堝悓璇︽儏鎺ュ彛",JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
+ return response;
}
/**
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 a2d0154..804ae24 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,9 +1,11 @@
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.wms.model.request.WmsActionNoticeRequest;
import com.doumee.core.wms.model.request.WmsBaseRequest;
@@ -27,7 +29,7 @@
* 鐢靛瓙閿佷笂閿佹椂闂存帴鍙�
* 鏍规嵁鍚堝悓鍙凤紝鏌ヨ鐢靛瓙閿佷笂閿佹儏鍐碉紱瀛樺湪鎵归噺鏌ヨ鐨勬儏鍐碉紱
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(TmsLockStatusQueryRequest param);
@@ -35,9 +37,16 @@
* 鍚堝悓鍒楄〃鎺ュ彛
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
- * @return WmsBaseResponse
+ * @return TmsBaseResponse
*/
TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param);
+ /**
+ * 鍚堝悓璇︽儏鎺ュ彛
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param);
+
}
--
Gitblit v1.9.3