From 23ac7615c09cd6a1f9e6e91875f0b8448a749191 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 11 十二月 2024 10:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 4 +
server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java | 32 ++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java | 1
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 65 +++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 12 +++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java | 11 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java | 35 +++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 5 +
11 files changed, 167 insertions(+), 5 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 1abf3d0..4f7ca02 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
@@ -1177,7 +1177,7 @@
;
// 鎴愬憳鍙橀噺
private int key;
- private int type;//鐢ㄦ埛绫诲瀷 0鍙告満 1璁垮 2鍛樺伐
+ private int type;//鐢ㄦ埛绫诲瀷 0鍛樺伐 1鍙告満
private String yw;//涓氬姟绫诲瀷
private String info;//璇存槑
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java b/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java
new file mode 100644
index 0000000..02fd369
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java
@@ -0,0 +1,32 @@
+package com.doumee.dao.business.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐭俊閭欢淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2024/01/16 10:03
+ */
+@Data
+@ApiModel("楠岃瘉鎵嬫満鍙峰拰楠岃瘉鐮佸叆鍙�")
+public class ValidPhoneCodeVO {
+
+
+ @ApiModelProperty(value = "楠岃瘉鐮�")
+ private String code;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
+ private String phone;
+
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
index 4ce8ec6..70857a2 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java
@@ -9,6 +9,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import io.swagger.annotations.Api;
@@ -46,6 +47,15 @@
return ApiResponse.success(smsEmailService.sendSms(smsEmail));
}
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("鏍规嵁鎵嬫満鍙峰拰楠岃瘉鐮佹牎楠�")
+ @PostMapping("/validPhoneCaptcha")
+ public ApiResponse validPhoneCaptcha(@RequestBody ValidPhoneCodeVO param) {
+ smsEmailService.validPhoneCaptcha(param);
+ return ApiResponse.success("璇锋眰鎴愬姛");
+ }
+
@LoginNoRequired
@PreventRepeat
@@ -55,6 +65,5 @@
emayService.sendSmsByHk(smsEmail.getPhone(),smsEmail.getContent());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
}
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
new file mode 100644
index 0000000..84e93b0
--- /dev/null
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -0,0 +1,65 @@
+package com.doumee.cloud.admin;
+
+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;
+import lombok.extern.slf4j.Slf4j;
+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 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "TMS骞冲彴鏁版嵁鎺ュ彛")
+@RestController
+@Slf4j
+@LoginNoRequired
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/tms")
+public class TmsCloudController extends BaseController {
+
+ @Autowired
+ private TmsService tmsService;
+ @ApiOperation("銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛")
+ @LoginNoRequired
+ @PostMapping("/lockStatusQuery")
+ public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) {
+ return tmsService.lockStatusQuery(request);
+ }
+ @ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
+ @LoginNoRequired
+ @PostMapping("/orderList")
+ public TmsBaseResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
+
+ return tmsService.orderList(request);
+ }
+ @ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
+ @LoginNoRequired
+ @PostMapping("/orderInfo")
+ public TmsBaseResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
+ return tmsService.orderInfo(request);
+ }
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index 9ef1434..d391173 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -11,7 +11,7 @@
*/
@Data
@ApiModel("tms鍚堝悓鍒楄〃璇锋眰鍙傛暟")
-public class TmsOrderListRequest {
+public class TmsOrderListRequest {
private List<String> permissionDomainIdList; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
@@ -20,4 +20,6 @@
private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
+ private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
new file mode 100644
index 0000000..e276007
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsContractListResponse.java
@@ -0,0 +1,35 @@
+package com.doumee.core.tms.model.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鏌ヨ鍚堝悓鍒楄〃璇锋眰杩斿洖鍙傛暟")
+public class TmsContractListResponse {
+ /**
+ {
+ "code": 0,
+ "data": [
+ {
+ "fromRepertoty": "鍚堣偉鎴愬搧搴�",
+ "ncCreateDate": "2023-12-04 10:36:15",
+ "toRepertoty": "澶╂触甯備腑蹇冧粨搴�",
+ "contractNumber": "112308335",
+ "orderStatus": "鍒拌揪鍗歌揣鍦�"
+ }
+ ],
+ "message": "鎿嶄綔鎴愬姛"
+ }
+ */
+ private String contractNumber ;//鍚堝悓鍙�
+ private String fromRepertoty ;//鍙戣揣鍦�
+ private String toRepertoty ;//鍒拌揣鍦�
+ private String plateNumber ;//杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ private String orderStatus ;//褰撳墠杩愯緭鍗曠姸鎬�
+ private String ncCreateDate;// 鍒跺崟鏃堕棿
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
index 855faba..417157d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -35,4 +35,5 @@
private String ncCreateDate; // 鍒跺崟鏃堕棿
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
index a7cc09d..6e42669 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java
@@ -3,6 +3,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import java.util.List;
@@ -98,4 +99,6 @@
long count(SmsEmail smsEmail);
void sendWaitingSmsNotice();
+
+ void validPhoneCaptcha(ValidPhoneCodeVO param);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index a35a1b2..be1458c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -15,6 +15,7 @@
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.vo.ValidPhoneCodeVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
@@ -76,6 +77,10 @@
@Override
+ public void validPhoneCaptcha(ValidPhoneCodeVO param){
+ isCaptcheValide(smsEmailMapper,param.getPhone(),param.getCode());
+ }
+ @Override
public Integer create(SmsEmail smsEmail) {
smsEmailMapper.insert(smsEmail);
return smsEmail.getId();
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 9a98862..eacc41a 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
@@ -19,13 +19,16 @@
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 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;
@@ -39,6 +42,9 @@
@Service
@Slf4j
public class TmsServiceImpl implements TmsService {
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
@@ -55,7 +61,8 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private WmsInterfaceLogMapper wmsInterfaceLogMapper;
-
+ @Value("${debug_model}")
+ private Boolean isDebug;
/**
* 鐢靛瓙閿佷笂閿佹椂闂存帴鍙�
* 鏍规嵁鍚堝悓鍙凤紝鏌ヨ鐢靛瓙閿佷笂閿佹儏鍐碉紱瀛樺湪鎵归噺鏌ヨ鐨勬儏鍐碉紱
@@ -80,6 +87,9 @@
*/
@Override
public TmsBaseResponse<List<TmsOrderListResponse>> orderList(TmsOrderListRequest param){
+ if(StringUtils.isBlank(param.getPhoneNumber())){
+ param.setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
+ }
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)
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 804ae24..f9f7949 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
@@ -35,7 +35,7 @@
/**
* 鍚堝悓鍒楄〃鎺ュ彛
- * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
+ * 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠姐�佹墜鏈哄彿锛岄潪闇�瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
--
Gitblit v1.9.3