From 0eaef592517ced667ed16413f9d22ab677915101 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 02 四月 2024 11:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 149 ++++++++++++++++++++++++++++++-------------------
1 files changed, 91 insertions(+), 58 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
index 46cae34..ddd66a5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java
@@ -1,5 +1,8 @@
package com.dy.pipIrrSell.client;
+import com.alibaba.fastjson2.JSONObject;
+import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
+import com.aliyuncs.exceptions.ClientException;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -8,8 +11,10 @@
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrSell.result.SellResultCode;
+import com.dy.pipIrrSell.sms.AliyunSmsSv;
+import com.dy.pipIrrSell.sms.RandomCode;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -39,6 +44,8 @@
@RequiredArgsConstructor
public class ClientCtrl {
private final ClientSv clientSv;
+ private final AliyunSmsSv aliyunSmsSv;
+ //private final RedisUtils redisUtils;
/**
* 鑾峰彇鍐滄埛鍒楄〃
@@ -62,58 +69,6 @@
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
- /**
- * 鑾峰彇浜ゆ槗璁板綍
- * @param vo
- * @return
- */
- @Operation(summary = "鑾峰緱涓�椤典氦鏄撹褰�", description = "杩斿洖涓�椤典氦鏄撹褰�")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = BaClient.class))}
- )
- })
- @GetMapping(path = "getOperates")
- @SsoAop()
- public BaseResponse<Map> getOperates(QueryOperate vo){
- try {
- Map res = clientSv.getOperates(vo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ浜ゆ槗璁板綍寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- }
-
- /**
- * 鑾峰彇浜ゆ槗姹囨�昏褰�
- * @param vo
- * @return
- */
- @Operation(summary = "鑾峰緱涓�椤典氦鏄撴眹鎬昏褰�", description = "杩斿洖涓�椤典氦鏄撴眹鎬昏褰�")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖涓�椤靛啘鎴锋暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = BaClient.class))}
- )
- })
- @GetMapping(path = "getStatistics")
- @SsoAop()
- public BaseResponse<Map> getStatistics(QueryStatistic vo){
- try {
- Map res = clientSv.getStatistics(vo);
- return BaseResponseUtils.buildSuccess(res);
- } catch (Exception e) {
- log.error("鏌ヨ浜ゆ槗姹囨�昏褰曞紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
@@ -163,13 +118,13 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoClient po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
- Long villageId = po.getVillageid();
+ Long villageId = po.getVillageId();
/**
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
@@ -229,7 +184,7 @@
}
/**
- * 鐢熸垚10涓哄啘鎴风紪鍙�
+ * 鐢熸垚10浣嶅啘鎴风紪鍙�
* 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
* 2. 鏄惁鍙栧埌璁板綍
* 2.1 鍙栧埌
@@ -273,13 +228,13 @@
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoClient po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
- Long villageId = po.getVillageid();
+ Long villageId = po.getVillageId();
/**
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
@@ -377,4 +332,82 @@
}
return BaseResponseUtils.buildSuccess(map_WaterTypes);
}
+
+ /**
+ * 鍙戦�侀獙璇佺爜
+ * @param phoneNumber
+ * @return
+ */
+ @Operation(summary = "鍙戦�侀獙璇佺爜", description = "鍙戦�侀獙璇佺爜")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "send_sms")
+ @SsoAop()
+ public BaseResponse<Boolean> sendSms(@RequestParam(name = "phoneNumber", required = true) String phoneNumber) throws ClientException {
+ if(phoneNumber == null || phoneNumber.length() <= 0) {
+ return BaseResponseUtils.buildFail(SellResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
+ }
+
+ // 鐢熸垚6浣嶉獙璇佺爜骞惰浆涓篔son鏍煎紡
+ String securityCode = String.valueOf(RandomCode.genCode());
+ JSONObject param = new JSONObject();
+ param.put("code", securityCode);
+ String templateParam = param.toJSONString();
+
+ //redisUtils.set(phoneNumber, securityCode, 60);
+
+ SendSmsResponse response = aliyunSmsSv.sendSms(phoneNumber, templateParam);
+ if (response.getCode().equals("OK")) {
+ // 鍙戦�佹垚鍔熷鐞嗛�昏緫
+ return BaseResponseUtils.buildSuccess(true) ;
+ } else {
+ // 鍙戦�佸け璐ュ鐞嗛�昏緫
+ return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage()) ;
+ }
+ }
+
+ /**
+ * 鏍￠獙楠岃瘉鐮�
+ * @param phoneNumber
+ * @param code
+ * @return
+ * @throws ClientException
+ */
+ @Operation(summary = "鏍￠獙楠岃瘉鐮�", description = "鏍￠獙楠岃瘉鐮�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = Boolean.class))}
+ )
+ })
+ @PostMapping(path = "verify")
+ @SsoAop()
+ public BaseResponse<Boolean> verify(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) throws ClientException {
+ if(phoneNumber == null || phoneNumber.length() <= 0 || code == null || code.length() <=0) {
+ return BaseResponseUtils.buildFail(SellResultCode.VERIFY_PARAMS_INCOMPLETE.getMessage());
+ }
+
+ // redis涓敭涓嶅瓨鍦ㄦ垨閿�间笉瀛樺湪鍒欐彁绀烘牎楠屽け璐�
+ //if(!redisUtils.hasKey(phoneNumber) || redisUtils.get(phoneNumber) == null)
+ // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage());
+ //
+ //String code_redis = redisUtils.get(phoneNumber).toString();
+ //System.out.println("--------------------: " + code_redis);
+ //
+ //if(code_redis != null && code_redis.equals(code)) {
+ // return BaseResponseUtils.buildSuccess(true) ;
+ //}else {
+ // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage());
+ //}
+
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
}
--
Gitblit v1.8.0