From 6531c14f567ef4f85967029986bd352550cc198b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 11:01:19 +0800
Subject: [PATCH] 1、行政区保存功能,级别改为非必填项,也不验证

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 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..f28ab04 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,6 +1,7 @@
 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.ResultCodeMsg;
@@ -18,10 +19,7 @@
 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;
@@ -56,7 +54,7 @@
     })
     @GetMapping(path = "allLevel")
     public BaseResponse<List<DistrictLevel>> allDistrictLevels(){
-        List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village, DistrictLevel.Group) ;
+        List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
         return BaseResponseUtils.buildSuccess(list);
     }
 
@@ -74,6 +72,7 @@
             )
     })
     @GetMapping(path = "all")
+    @SsoAop("-1")
     public BaseResponse<List<BaDistrict>> all(){
         List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code) ;
         return BaseResponseUtils.buildSuccess(list);
@@ -93,6 +92,7 @@
             )
     })
     @GetMapping(path = "one")
+    @SsoAop("-1")
     public BaseResponse<BaDistrict> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
         return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
     }
@@ -120,6 +120,13 @@
         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);

--
Gitblit v1.8.0