From 2a9830a14c30bbddc9d8de727b8c0b31b760ebc4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 十二月 2023 11:36:41 +0800
Subject: [PATCH] 2023-12-27 朱宝民 项目编号记录在配置文件中，开卡成功一并返回
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 198 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 198 insertions(+), 0 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 bcccdf0..f115542 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
@@ -40,6 +40,11 @@
public class ClientCtrl {
private final ClientSv clientSv;
+ /**
+ * 鑾峰彇鍐滄埛鍒楄〃
+ * @param vo
+ * @return
+ */
@Operation(summary = "鑾峰緱涓�椤靛啘鎴�", description = "杩斿洖涓�椤靛啘鎴锋暟鎹�")
@ApiResponses(value = {
@ApiResponse(
@@ -61,6 +66,65 @@
}
}
+ /**
+ * 鑾峰彇浜ゆ槗璁板綍
+ * @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 id
+ * @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 = "/getone/{id}")
+ @SsoAop()
+ 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()) ;
+ }
+ }
+
+
+ /**
+ * 娣诲姞涓�涓啘鎴峰璞�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
@Operation(summary = "娣诲姞鍐滄埛璁板綍", description = "娣诲姞鍐滄埛璁板綍")
@ApiResponses(value = {
@ApiResponse(
@@ -108,9 +172,21 @@
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);
@@ -153,4 +229,126 @@
return clientNum;
}
+ /**
+ * 淇敼鍐滄埛瀵硅薄锛堣櫄鎷熷崱鍙枫�佺姝㈡爣蹇椼�侀�昏緫鍒犻櫎鏍囪瘑涓嶅弬涓庝慨鏀癸級
+ * @param po 鍐滄埛瀵硅薄
+ * @param bindingResult
+ * @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 = "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){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ // 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
+ Long villageId = po.getVillageid();
+
+ /**
+ * 鑾峰彇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();
+ Long countryId = Long.parseLong(map_districts.get("countryId").toString());
+ String countyNum = map_districts.get("countyNum").toString();
+ String countryName = map_districts.get("countryName").toString();
+ Long townId = Long.parseLong(map_districts.get("townId").toString());
+ String townNum = map_districts.get("townNum").toString();
+ String townName = map_districts.get("townName").toString();
+ String villageNum = map_districts.get("villageNum").toString();
+ String villageName = map_districts.get("villageName").toString();
+
+ // 鐢熸垚8浣嶈鏀垮尯鍒掔紪鐮侊紝鐢熸垚鍐滄埛缂栧彿鐢�
+ String district8 = countyNum + townNum + villageNum;
+ // 鐢熸垚鍐滄埛缂栧彿
+ String clientNum = generateClientNum(district8);
+ // 鐢熸垚12浣�5绾ц鏀垮尯鍒掔紪鐮佷覆鍙婂悕绉颁覆
+ Long districtNum = Long.parseLong(provinceNum + cityNum + district8);
+ String districtTitle = countryName + townName + villageName;
+
+ SeClient seClient = DtoClientToSeClient.INSTANCT.po2vo(po);
+ seClient.setCountyid(countryId);
+ seClient.setTownid(townId);
+ seClient.setClientnum(clientNum);
+ seClient.setDistrictnum(districtNum);
+ seClient.setDistricttitle(districtTitle);
+ Date operateTime = new Date();
+ seClient.setOperatedt(operateTime);
+
+ Integer rec = Optional.ofNullable(clientSv.updateByPrimaryKey(seClient)).orElse(0);
+ if(rec == 0) {
+ return BaseResponseUtils.buildFail("鍐滄埛淇敼澶辫触");
+ }
+ return BaseResponseUtils.buildSuccess(true) ;
+ }
+
+ /**
+ * 鏍规嵁鍐滄埛ID閫昏緫鍒犻櫎鍐滄埛
+ * @param id
+ * @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 = "/delone/{id}")
+ @SsoAop()
+ public BaseResponse<Boolean> deleteClientById(@PathVariable("id") Long id){
+ try {
+ Integer res = Optional.ofNullable(clientSv.deleteClientById(id)).orElse(0);
+ if(res == 0) {
+ return BaseResponseUtils.buildFail("鍐滄埛鍒犻櫎澶辫触");
+ }
+ return BaseResponseUtils.buildSuccess(true);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍐滄埛寮傚父", e);
+ 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);
+ }
}
--
Gitblit v1.8.0