From 8ed17ae9bfe70c1c94ffd44148e32b914c8bec8d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 15:40:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 4 +-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 10 +++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 47 +++++++++++++++++++----
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudTestController.java | 15 -------
7 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 099da4a..8ecd0a5 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 84e93b0..42d942c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
@@ -50,15 +51,16 @@
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
@LoginNoRequired
@PostMapping("/orderList")
- public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
+ public ApiResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
- return tmsService.orderList(request);
+ return ApiResponse.success(tmsService.orderList(request));
}
@ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
@LoginNoRequired
@PostMapping("/orderInfo")
- public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
- return tmsService.orderInfo(request);
+ public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
+
+ return ApiResponse.success(tmsService.orderInfo(request));
}
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 54c03c4..17efe43 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,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
@@ -86,20 +87,6 @@
@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) {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
index 108bc92..29dc9f3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WmsInterfaceLog.java
@@ -75,7 +75,7 @@
@ExcelColumn(name="璋冪敤缁撴灉 0鎴愬姛 1澶辫触")
private Integer success;
- @ApiModelProperty(value = "骞冲彴 0娴峰悍瀹夐槻骞冲彴 1ERP绯荤粺", example = "1")
+ @ApiModelProperty(value = "骞冲彴 0WMS 1TMS", example = "1")
@ExcelColumn(name="骞冲彴 0娴峰悍瀹夐槻骞冲彴 1ERP绯荤粺")
private Integer plat;
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 eacc41a..9d3a9a1 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
@@ -86,15 +86,22 @@
* @return TmsBaseResponse
*/
@Override
- public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
+ public List<TmsOrderListResponse> orderList(TmsOrderListRequest param){
if(StringUtils.isBlank(param.getPhoneNumber())){
param.setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
}
+ if(param.getContractNumbers()==null || param.getContractNumbers().size()==0){
+ 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,"鍚堝悓鍒楄〃鎺ュ彛",JSONObject.toJSONString(param)
+ TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,"銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�",JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
- return response;
+ if(response ==null){
+ return new ArrayList<>();
+ }else{
+ return response.getData()==null?new ArrayList<>():response.getData();
+ }
}
/**
* 鍚堝悓璇︽儏鎺ュ彛
@@ -102,12 +109,16 @@
* @return TmsBaseResponse
*/
@Override
- public TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param){
+ 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,"鍚堝悓璇︽儏鎺ュ彛",JSONObject.toJSONString(param)
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,"銆怲MS銆戝悎鍚岃鎯呮帴鍙�",JSONObject.toJSONString(param)
,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
- return response;
+ if(response ==null){
+ return new TmsOrderInfoResponse();
+ }else{
+ return response.getData()==null?new TmsOrderInfoResponse():response.getData();
+ }
}
/**
@@ -139,15 +150,35 @@
success = 1;
log.error("銆�"+name+"銆�================澶辫触===="+ JSONObject.toJSONString(param));
}finally {
+ saveInterfaceLog(url,name,param,success,res,Constants.ZERO);
}
}
return null;
}
+ @Override
+ public void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type){
+ if(wmsInterfaceLogMapper ==null){
+ return;
+ }
+ WmsInterfaceLog log = new WmsInterfaceLog();
+ log.setCreateDate(new Date());
+ log.setUrl(url);
+ log.setEditDate(log.getCreateDate());
+ log.setPlat(Constants.ONE);
+ log.setName(name);
+ log.setIsdeleted(Constants.ZERO);
+ log.setRequest(param);
+ log.setType(type);
+ log.setSuccess(success);
+ log.setRepose(respone);
+ wmsInterfaceLogMapper.insert(log);
+ }
+
private static void logResult(TmsBaseResponse res,String name) {
if(StringUtils.equals(res.getCode(), TmsBaseResponse.CODE_SUCCESS)){
- log.info("銆怲MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+res);
+ log.info("銆怲MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+ JSONObject.toJSONString(res));
}else{
- log.error("銆怲MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ res);
+ log.error("銆怲MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ JSONObject.toJSONString(res));
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index cc451b8..cd880f9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -219,9 +219,9 @@
}
private static void logResult(WmsBaseResponse<WmsBaseDataResponse> res,String name) {
if(StringUtils.equals(res.getData().get(0).getSuccess(), WmsBaseResponse.CODE_SUCCESS)){
- log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+res);
+ log.info("銆怶MS鎺ュ彛锛�"+name+"銆�================鎴愬姛====\n"+ JSONObject.toJSONString(res));
}else{
- log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ res);
+ log.error("銆怶MS鎺ュ彛锛�"+name+"銆�================澶辫触====锛歕n"+ JSONObject.toJSONString(res));
}
}
/**
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 f9f7949..0b8a34f 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
@@ -39,14 +39,14 @@
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
- TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param);
+ List<TmsOrderListResponse> orderList(TmsOrderListRequest param);
/**
* 鍚堝悓璇︽儏鎺ュ彛
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
- TmsBaseResponse<TmsOrderInfoResponse> orderInfo(TmsOrderInfoRequest param);
-
+ TmsOrderInfoResponse orderInfo(TmsOrderInfoRequest param);
+ void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type);
}
--
Gitblit v1.9.3