From 24bbe7a75c85816524c097caacb141cc6846acb9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 十二月 2024 15:21:21 +0800
Subject: [PATCH] 增加删除取水口水量月统计年统计重复数据功能，增加删除农户用水量月统计年统计重复数据功能，
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 136 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 121 insertions(+), 15 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 1dce9cb..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
@@ -9,15 +9,16 @@
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
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;
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;
@@ -35,11 +36,19 @@
@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;
+ /**
+ * 鑾峰彇鍐滄埛鍒楄〃
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛啘鎴�", description = "杩斿洖涓�椤靛啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -61,6 +70,11 @@
}
}
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇涓�涓啘鎴峰璞�
+ * @param id
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�涓啘鎴�", description = "杩斿洖涓�涓啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -83,6 +97,12 @@
}
+ /**
+ * 娣诲姞涓�涓啘鎴峰璞�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "娣诲姞鍐滄埛璁板綍", description = "娣诲姞鍐滄埛璁板綍")
@ApiResponses(value = {
@ApiResponse(
@@ -95,13 +115,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绾ц鏀垮尯鍒掍俊鎭�
@@ -123,16 +143,31 @@
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) {
+ virtualId = 1000000000L;
+ }else {
+ virtualId = virtualId + 1;
+ if(virtualId > 10000000000L) {
+ return BaseResponseUtils.buildFail("铏氭嫙鍗″彿瓒呴檺");
+ }
+ }
+
SeClient seClient = DtoClientToSeClient.INSTANCT.po2vo(po);
seClient.setCountyid(countryId);
seClient.setTownid(townId);
+ seClient.setVirtualid(virtualId);
seClient.setClientnum(clientNum);
seClient.setDistrictnum(districtNum);
seClient.setDistricttitle(districtTitle);
@@ -149,7 +184,7 @@
}
/**
- * 鐢熸垚10涓哄啘鎴风紪鍙�
+ * 鐢熸垚10浣嶅啘鎴风紪鍙�
* 1. 鍒板啘鎴疯〃涓煡璇�6浣嶅尯鍒掍覆寮�澶寸殑鏈�澶х殑鍐滄埛缂栧彿
* 2. 鏄惁鍙栧埌璁板綍
* 2.1 鍙栧埌
@@ -166,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 {
@@ -176,7 +211,7 @@
}
/**
- * 淇敼鍐滄埛瀵硅薄
+ * 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
* @param po 鍐滄埛瀵硅薄
* @param bindingResult
* @return
@@ -193,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绾ц鏀垮尯鍒掍俊鎭�
@@ -221,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绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
@@ -236,13 +272,10 @@
seClient.setDistricttitle(districtTitle);
Date operateTime = new Date();
seClient.setOperatedt(operateTime);
- //
- //seClient.setDisabled((byte)0);
- //seClient.setDeleted((byte)0);
Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
if(rec == 0) {
- return BaseResponseUtils.buildFail("娣诲姞鍐滄埛澶辫触");
+ return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
}
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -276,4 +309,77 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
+
+ /**
+ * 鑾峰彇鐢ㄦ按鏂瑰紡鍒楄〃
+ * @param
+ * @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 = "/watertypes")
+ @SsoAop()
+ 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("娌℃湁鐢ㄦ按鏂瑰紡") ;
+ }
+ 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