From a48e7b67abb5bac5c02e28a59821c2360aa2b324 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 10:42:25 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/SmsEmailService.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 3 +
server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java | 32 ++++++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 65 ++++++++++++++++++++++++++++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java | 11 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 5 ++
6 files changed, 117 insertions(+), 2 deletions(-)
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 b2da314..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闆嗗悎
@@ -19,6 +19,7 @@
private String fromRepertoty ;//鍚� 瀛楃涓� 鍙戣揣鍦�
private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
+
private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
}
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();
--
Gitblit v1.9.3