From 9e095f66c1547e4af8a0b21e2276187cd5d4b2a0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 29 十二月 2023 14:07:53 +0800
Subject: [PATCH] 2023-12-29 朱宝民 去除三个子模块的Swagger参数注解
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 102 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index deaf5a7..dbec7d5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -1,13 +1,15 @@
package com.dy.pipIrrBase.district;
import com.dy.common.aop.SsoAop;
+import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
import com.dy.pipIrrGlobal.util.DistrictLevel;
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;
@@ -18,14 +20,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
@Slf4j
@Tag(name = "琛屾斂鍖哄垝绠＄悊", description = "琛屾斂鍖哄垝澧炲垹鏀规煡绛夋搷浣�")
@@ -56,8 +53,8 @@
})
@GetMapping(path = "allLevel")
public BaseResponse<List<DistrictLevel>> allDistrictLevels(){
- List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village, DistrictLevel.Group) ;
- return BaseResponseUtils.buildSuccess(list);
+ //List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
+ return BaseResponseUtils.buildSuccess(DistrictLevel.LevelList);
}
/**
@@ -74,6 +71,7 @@
)
})
@GetMapping(path = "all")
+ @SsoAop()
public BaseResponse<List<BaDistrict>> all(){
List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code) ;
return BaseResponseUtils.buildSuccess(list);
@@ -92,8 +90,9 @@
schema = @Schema(implementation = BaDistrict.class))}
)
})
- @GetMapping(path = "one")
- public BaseResponse<BaDistrict> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
+ @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @SsoAop()
+ public BaseResponse<BaDistrict> one(Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -111,15 +110,22 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "save", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> save(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid DistrictVo vo, @Parameter(hidden = true) BindingResult bindingResult){
+ @PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop()
+ public BaseResponse<Boolean> save(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
BaDistrict po = DistrictVoMapper.INSTANCT.convert(vo);
int count;
try {
+ BaDistrict supperPo = this.sv.selectById(po.supperId) ;
+ if(supperPo == null){
+ return BaseResponseUtils.buildFail("鍑洪敊锛屾湭寰楀埌涓婄骇琛屾斂鍖�") ;
+ }else{
+ po.level = DistrictLevel.get((byte)(supperPo.level.code + 1)) ;
+ }
+ po.deleted = Deleted.NO ;
count = this.sv.save(po);
} catch (Exception e) {
log.error("淇濆瓨琛屾斂鍖哄紓甯�", e);
@@ -146,9 +152,9 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @PostMapping(path = "update", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> update(@Parameter(description = "form琛ㄥ崟鏁版嵁", required = true) @Valid DistrictVo vo, @Parameter(hidden = true) BindingResult bindingResult){
+ @PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop()
+ public BaseResponse<Boolean> update(@RequestBody @Valid DistrictVo vo, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
@@ -183,8 +189,8 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
- public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
+ @SsoAop()
+ public BaseResponse<Boolean> delete(Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
}
@@ -201,4 +207,60 @@
return BaseResponseUtils.buildSuccess(true) ;
}
}
+
+ /**
+ * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @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 = "/level/{id}")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictgsByLevel(@PathVariable("id") Integer id){
+ if(id == null || id <= 0){
+ return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ }
+
+ List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictgsByLevel(id)).orElse(new ArrayList<>());
+ if(map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑灞傜骇鏈夎") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_Districts);
+ }
+
+ /**
+ * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param supperId
+ * @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 = "/supperid/{supperId}")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<Map<String, Object>>>> getDistrictsBySupperId(@PathVariable("supperId") Long supperId){
+ if(supperId == null || supperId <= 0){
+ return BaseResponseUtils.buildFail("鐖禝D涓嶈兘涓虹┖") ;
+ }
+
+ List<Map<String, Object>> map_Districts = Optional.ofNullable(sv.getDistrictsBySupperId(supperId)).orElse(new ArrayList<>());
+ if(map_Districts == null || map_Districts.size() == 0) {
+ return BaseResponseUtils.buildFail("鎮ㄨ緭鍏ョ殑鐖剁骇ID鏈夎") ;
+ }
+ return BaseResponseUtils.buildSuccess(map_Districts);
+ }
}
--
Gitblit v1.8.0