From 8d2b573ced32e6ca6fab7c1dc45e1fa108030ba1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 28 八月 2024 17:21:23 +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 | 191 +++++++++++++----------------------------------
1 files changed, 52 insertions(+), 139 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 bc45365..5e5e66c 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;
@@ -11,9 +8,6 @@
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.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,6 +18,7 @@
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -45,12 +40,12 @@
@RequiredArgsConstructor
public class ClientCtrl {
private final ClientSv clientSv;
- private final AliyunSmsSv aliyunSmsSv;
//private final RedisUtils redisUtils;
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 鑾峰彇鍐滄埛鍒楄〃
- *
* @param vo
* @return
*/
@@ -65,19 +60,18 @@
})
@GetMapping(path = "get")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoClient>>> get(QueryVo vo){
try {
QueryResultVo<List<VoClient>> res = clientSv.getClients(vo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
- *
* @param id
* @return
*/
@@ -92,20 +86,19 @@
})
@GetMapping(path = "/getone/{id}")
@SsoAop()
- public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id) {
+ public BaseResponse<VoClient> getOneClient(@PathVariable("id") Long id){
try {
VoClient res = clientSv.getOneClient(id);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 娣诲姞涓�涓啘鎴峰璞�
- *
* @param po
* @param bindingResult
* @return
@@ -123,7 +116,7 @@
@Transactional(rollbackFor = Exception.class)
@SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
+ if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -134,7 +127,7 @@
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
@@ -150,20 +143,23 @@
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;
// 鐢熸垚铏氭嫙鍗″彿
Long virtualId = Optional.ofNullable(clientSv.getMa1xVirtualId()).orElse(0L);
- if (virtualId == 0) {
+ if(virtualId == 0) {
virtualId = 1000000000L;
- } else {
+ }else {
virtualId = virtualId + 1;
- if (virtualId > 10000000000L) {
+ if(virtualId > 10000000000L) {
return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
}
}
@@ -178,34 +174,34 @@
Date operateTime = new Date();
seClient.setOperatedt(operateTime);
- seClient.setDisabled((byte) 0);
- seClient.setDeleted((byte) 0);
+ seClient.setDisabled((byte)0);
+ seClient.setDeleted((byte)0);
Integer rec = Optional.ofNullable(clientSv.addClient(seClient)).orElse(0);
- if (rec == 0) {
+ if(rec == 0) {
return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
}
- return BaseResponseUtils.buildSuccess(true);
+ return BaseResponseUtils.buildSuccess(true) ;
}
/**
* 鐢熸垚10浣嶅啘鎴风紪鍙�
* 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
* 2. 鏄惁鍙栧埌璁板綍
- * 2.1 鍙栧埌
- * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
- * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
- * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
- * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
- * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
+ * 2.1 鍙栧埌
+ * 2.1.1 鍙栧嚭鍚�4浣嶉『搴忓彿骞惰浆鎴愭暣褰�
+ * 2.1.2. 鏁村舰鏍煎紡鐨勯『搴忓彿鍔�1骞跺垽鏂槸鍚﹀ぇ浜�9999
+ * 2.1.2.1 濡傛灉澶т簬鍒欐彁绀虹敤鎴风紪鍙峰凡婊�
+ * 2.1.2.2 濡傛灉涓嶅ぇ 6浣嶅尯鍒掑姞涓婃牸寮忓寲鍚庣殑椤哄簭鍙�
+ * 2.2 鏈彇鍒� 6浣嶅尯鍒掑姞涓�0001
* 3. 杩斿洖鍐滄埛缂栧彿
*/
private String generateClientNum(String district8) {
String clientNum = Optional.ofNullable(clientSv.getClientNumOfMax(district8)).orElse("");
- if (clientNum != null && clientNum.trim().length() > 0) {
+ if(clientNum != null && clientNum.trim().length() > 0) {
Integer number = Integer.parseInt(clientNum.substring(8));
number = number + 1;
- if (number > 9999) {
- return "鍐滄埛缂栧彿瓒呴檺";
+ if(number > 9999) {
+ return null;
}
clientNum = clientNum.substring(0, 8) + String.format("%04d", number);
} else {
@@ -216,8 +212,7 @@
/**
* 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
- *
- * @param po 鍐滄埛瀵硅薄
+ * @param po 鍐滄埛瀵硅薄
* @param bindingResult
* @return
*/
@@ -233,8 +228,8 @@
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
+ public BaseResponse<Boolean> update(@RequestBody @Valid DtoClient po, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -245,7 +240,7 @@
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
@@ -261,7 +256,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绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
@@ -278,15 +274,14 @@
seClient.setOperatedt(operateTime);
Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
- if (rec == 0) {
+ if(rec == 0) {
return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
}
- return BaseResponseUtils.buildSuccess(true);
+ return BaseResponseUtils.buildSuccess(true) ;
}
/**
* 鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛
- *
* @param id
* @return
*/
@@ -302,22 +297,21 @@
@GetMapping(path = "/delone/{id}")
@SsoAop()
- public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id) {
+ public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id){
try {
Integer res = Optional.ofNullable(clientSv.deleteClientById(id)).orElse(0);
- if (res == 0) {
+ if(res == 0) {
return BaseResponseUtils.buildFail("鍐滄埛鍒犻櫎澶辫触");
}
return BaseResponseUtils.buildSuccess(true);
} catch (Exception e) {
log.error("鏌ヨ鍐滄埛寮傚父", e);
- return BaseResponseUtils.buildException(e.getMessage());
+ return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
* 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
- *
* @param
* @return
*/
@@ -332,97 +326,16 @@
})
@GetMapping(path = "/watertypes")
@SsoAop()
- public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes() {
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getWaterTypes(){
List<Map<String, Object>> map_WaterTypes = Optional.ofNullable(clientSv.getWaterTypes()).orElse(new ArrayList<>());
- if (map_WaterTypes == null || map_WaterTypes.size() == 0) {
- return BaseResponseUtils.buildFail("娌℃湁鐢ㄦ按鏂瑰紡");
+ if(map_WaterTypes == null || map_WaterTypes.size() == 0) {
+ 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);
-
- 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);
- }
-
- /**
* 鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�
- *
* @param villageId
* @return
*/
@@ -437,12 +350,12 @@
})
@GetMapping(path = "district")
@SsoAop()
- public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId) {
+ public BaseResponse<Boolean> getDistrictNum(@RequestParam("villageId") @NotNull(message = "鏉戠紪鍙蜂笉鑳戒负绌�") Long villageId){
/**
* 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
*/
Map map_districts = Optional.ofNullable(clientSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if (map_districts.size() <= 0) {
+ if(map_districts.size() <= 0) {
return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
}
@@ -455,13 +368,13 @@
// 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
Long districtNum = Long.parseLong(provinceNum + cityNum + countyNum + townNum + villageNum);
//鑾峰彇椤圭洰缂栫爜
- String projectNo = clientSv.getItemValue("projectNo");
- //杞负int
- Integer projectNo1 = Integer.valueOf(projectNo);
- //杞负16杩涘埗
-// String projectNo2 = Integer.toHexString(projectNo1);
-// log.info(projectNo2);
- String projectNo3 = String.format("%02x", projectNo1);
+// String projectNo = clientSv.getItemValue("projectNo");
+// //杞负int
+// Integer projectNo1 = Integer.valueOf(projectNo);
+// //杞负16杩涘埗
+//// String projectNo2 = Integer.toHexString(projectNo1);
+//// log.info(projectNo2);
+ String projectNo3 = String.format("%02x", projectNo);
log.info(projectNo3);
Map map = new HashMap();
--
Gitblit v1.8.0