From 5e2faddb34e79918b73dc75aca8f63048dd4526d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:53:33 +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 | 161 ++---------------------------------------------------
1 files changed, 7 insertions(+), 154 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 d93184e..48d718c 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,8 +1,5 @@
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;
@@ -10,15 +7,7 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
-import com.dy.pipIrrGlobal.pojoSe.SeCodeVerify;
-import com.dy.pipIrrGlobal.pojoSe.SeOpenId;
import com.dy.pipIrrGlobal.voSe.VoClient;
-import com.dy.pipIrrSell.client.dto.CodeVerifyDTO;
-import com.dy.pipIrrSell.result.SellResultCode;
-import com.dy.pipIrrSell.sms.AliyunSmsSv;
-import com.dy.pipIrrSell.sms.RandomCode;
-import com.dy.pipIrrSell.util.RestTemplateUtil;
-import com.dy.pipIrrSell.wechatpay.PayInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -34,7 +23,6 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.*;
/**
@@ -51,20 +39,7 @@
@RequiredArgsConstructor
public class ClientCtrl {
private final ClientSv clientSv;
- private final AliyunSmsSv aliyunSmsSv;
//private final RedisUtils redisUtils;
- private final RestTemplateUtil restTemplateUtil;
-
- private final String privateCertFileName = PayInfo.privateCertFileName;
- private final String appid = PayInfo.appid;
- private final String secret = PayInfo.secret;
- private final String mchid = PayInfo.mchid;
- private final String schema = PayInfo.schema;
- private final String signType = PayInfo.signType;
- private final String description = PayInfo.description;
- private final String loginUrl = PayInfo.loginUrl;
- private final String notifyUrl = PayInfo.notifyUrl;
- private final String grantType = PayInfo.grantType;
/**
* 鑾峰彇鍐滄埛鍒楄〃
@@ -165,9 +140,12 @@
String villageName = map_districts.get("villageName").toString();
// 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
- String district8 = countyNum + townNum + villageNum;
+ String district8 = String.format("%02d", Integer.parseInt(countyNum)) + String.format("%03d", Integer.parseInt(townNum)) + String.format("%03d", Integer.parseInt(villageNum));
// 鐢熸垚鍐滄埛缂栧彿
String clientNum = generateClientNum(district8);
+ if(clientNum == null) {
+ return BaseResponseUtils.buildErrorMsg("鍐滄埛缂栧彿瓒呴檺");
+ }
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
Long districtNum = Long.parseLong(provinceNum + cityNum + district8);
String districtTitle = countryName + townName + villageName;
@@ -220,7 +198,7 @@
Integer number = Integer.parseInt(clientNum.substring(8));
number = number + 1;
if(number > 9999) {
- return "鍐滄埛缂栧彿瓒呴檺";
+ return null;
}
clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
} else {
@@ -275,7 +253,8 @@
String villageName = map_districts.get("villageName").toString();
// 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
- String district8 = countyNum + townNum + villageNum;
+ //String district8 = countyNum + townNum + villageNum;
+ String district8 = String.format("%02d", Integer.parseInt(countyNum)) + String.format("%03d", Integer.parseInt(townNum)) + String.format("%03d", Integer.parseInt(villageNum));
// 鐢熸垚鍐滄埛缂栧彿
String clientNum = generateClientNum(district8);
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
@@ -350,132 +329,6 @@
return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡") ;
}
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);
-
- // 鑾峰彇褰撳墠鏃堕棿鎴冲苟寤跺悗3鍒嗛挓
- Long timestamp = System.currentTimeMillis();
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(timestamp);
- calendar.add(Calendar.SECOND, 180);
- Long expires = calendar.getTimeInMillis();
-
- SeCodeVerify codeVerify = new SeCodeVerify();
- codeVerify.setPhoneNumber(phoneNumber);
- codeVerify.setSecurityCode(securityCode);
- codeVerify.setExpires(expires);
- clientSv.addCodeVerify(codeVerify);
-
- 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", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
- @SsoAop()
- public BaseResponse<Boolean> verify(@RequestBody @Valid CodeVerifyDTO po, BindingResult bindingResult) throws IOException {
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
-
- String phoneNumber = po.getPhoneNumber();
- String securityCode = po.getSecurityCode();
- String code = po.getCode();
-
- // 杩涜鎵嬫満鍙枫�侀獙璇佺爜銆佽繃鏈熸椂闂存牎楠�
- SeCodeVerify codeVerify = clientSv.getCodeVerify(phoneNumber);
- if(codeVerify == null) {
- return BaseResponseUtils.buildFail(SellResultCode.NO_SECURITY_CODE_FOR_PHONE.getMessage());
- }
-
- if(!codeVerify.getSecurityCode().equals(securityCode)) {
- return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_ERROR.getMessage());
- }
-
- Long currentTimestamp = System.currentTimeMillis();
- if(currentTimestamp > codeVerify.getExpires() ) {
- return BaseResponseUtils.buildFail(SellResultCode.VALIDATION_TIMEOUT.getMessage());
- }
-
- // 鏍￠獙閫氳繃锛岃繘琛岀櫥褰曞嚟璇佹牎楠�
- Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
- queryParams.put("js_code", code);
- queryParams.put("grant_type", grantType);
- Map<String, String> headerParams = new HashMap<>();
- JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
-
- if(job.getLong("errcode") != null && job.getLong("errcode") >= -1) {
- return BaseResponseUtils.buildFail("鐧诲綍鍑瘉鏍￠獙澶辫触");
- }
- String openid = job.getString("openid");
- String sessionKey = job.getString("session_key");
-
- Long clientId = clientSv.getClientIdByPhone(phoneNumber);
- if(clientId != null) {
- // 娣诲姞寰俊鐢ㄦ埛璐︽埛璁板綍
- SeOpenId seOpenId = new SeOpenId();
- seOpenId.setClientId(clientId);
- seOpenId.setOpenId(openid);
- seOpenId.setSessionKey(sessionKey);
- seOpenId.setCreateTime(new Date());
- Long SessionId = clientSv.addOpenId(seOpenId);
- return BaseResponseUtils.buildSuccess(SessionId);
-
- } else {
- return BaseResponseUtils.buildError(SellResultCode.PHONE_NUMBER_IS_ERROR.getMessage());
- }
}
/**
--
Gitblit v1.8.0