From 0da2c08f679cb546fab3a0a7c3d6ff472bb87a8c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 21:24:41 +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 | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 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 0aed5d4..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
@@ -15,8 +15,10 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
+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;
@@ -34,10 +36,13 @@
@Slf4j
@Tag(name = "鍐滄埛绠＄悊", description = "鍐滄埛鎿嶄綔")
@RestController
-@RequestMapping(path="client")
+@RequestMapping(path = "client")
@RequiredArgsConstructor
public class ClientCtrl {
private final ClientSv clientSv;
+ //private final RedisUtils redisUtils;
+ @Value("${project.projectNo}")
+ private Integer projectNo;
/**
* 鑾峰彇鍐滄埛鍒楄〃
@@ -138,9 +143,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;
@@ -193,7 +201,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 {
@@ -248,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绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
@@ -324,4 +333,53 @@
}
return BaseResponseUtils.buildSuccess(map_WaterTypes);
}
+
+ /**
+ * 鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�
+ * @param villageId
+ * @return
+ */
+ @Operation(summary = "鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�", description = "鏍规嵁鏉慖D鑾峰彇12浣嶈鏀垮尯鍒�")
+ @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))}
+ )
+ })
+ @GetMapping(path = "district")
+ @SsoAop()
+ 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) {
+ return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ }
+
+ String provinceNum = map_districts.get("provinceNum").toString();
+ String cityNum = map_districts.get("cityNum").toString();
+ String countyNum = map_districts.get("countyNum").toString();
+ String townNum = map_districts.get("townNum").toString();
+ String villageNum = map_districts.get("villageNum").toString();
+
+ // 鐢熸垚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", projectNo);
+ log.info(projectNo3);
+
+ Map map = new HashMap();
+ map.put("districtNum", districtNum);
+ map.put("projectNo",projectNo3);
+ return BaseResponseUtils.buildSuccess(map);
+ }
}
--
Gitblit v1.8.0