From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/SmsEmailColudController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
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..724a7b8 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
@@ -2,25 +2,20 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.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.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.third.EmayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author 姹熻箘韫�
@@ -46,7 +41,27 @@
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
+ @ApiOperation("鏍规嵁鎵嬫満鍙峰拰楠岃瘉鐮佹牎楠岋紝骞跺畬鎴愬徃鏈烘敞鍐屽拰杩斿洖鍙告満淇℃伅")
+ @PostMapping("/validDriverPhone")
+ public ApiResponse<SystemUser> validDriverPhone(@RequestBody ValidPhoneCodeVO param) {
+ return ApiResponse.success(smsEmailService.validDriverPhone(param));
+ }
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ public ApiResponse<PageData<SmsEmail>> findPage (@RequestBody PageWrap<SmsEmail> pageWrap) {
+ return ApiResponse.success(smsEmailService.findPage(pageWrap));
+ }
@LoginNoRequired
@PreventRepeat
@ApiOperation("鑷畾涔夌煭淇″唴瀹�")
@@ -55,6 +70,5 @@
emayService.sendSmsByHk(smsEmail.getPhone(),smsEmail.getContent());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
}
--
Gitblit v1.9.3