From dc0f12da8bef0a5b16a01655f4edff9ba9deb8b2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 23 十一月 2023 19:57:18 +0800 Subject: [PATCH] 行政区划值对象中的编号Schema修改及长度验证修改 --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java index c42e5d6..32dd927 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java @@ -2,9 +2,11 @@ import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper; import com.dy.pipIrrGlobal.pojoBa.BaDistrict; +import com.dy.pipIrrGlobal.util.DistrictLevel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -19,24 +21,60 @@ this.dao = dao; } - - public int save(BaDistrict po){ - return this.dao.insert(po) ; - } - /** * 浠庣涓�绾ц鏀垮尯鍒掑紑濮嬶紝寰楀埌鎵�鏈夎鏀垮尯鍒掍俊鎭� * @param firstLevel 绗竴绾ц涓嬪尯 level * @return 鎵�鏈夎鏀垮尯鍒掗泦鍚� */ - public List<BaDistrict> getAll(byte firstLevel){ + public List<BaDistrict> selectAllByLevel(byte firstLevel){ List<BaDistrict> list = this.dao.selectByLevel(firstLevel) ; if(list != null && list.size() > 0){ for(BaDistrict po : list){ + po.canDelete = false ; + po.canAdd = true ; getSubDistrict(po) ; } } return list ; + } + + /** + * 寰楀埌涓�涓鏀垮尯 + * @param id 琛屾斂鍖篒D + * @return 琛屾斂鍖哄疄浣� + */ + public BaDistrict selectById(Long id){ + return this.dao.selectByPrimaryKey(id) ; + } + + /** + * 淇濆瓨瀹炰綋 + * @param po 瀹炰綋 + * @return 鏁伴噺 + */ + @Transactional + public int save(BaDistrict po){ + return this.dao.insert(po) ; + } + + /** + * 淇濆瓨淇敼瀹炰綋 + * @param po 瀹炰綋 + * @return 鏁伴噺 + */ + @Transactional + public int update(BaDistrict po){ + return this.dao.updateByPrimaryKeySelective(po) ; + } + + /** + * 淇濆瓨淇敼瀹炰綋 + * @param id 瀹炰綋ID + * @return 鏁伴噺 + */ + @Transactional + public int delete(Long id){ + return this.dao.deleteLogicById(id) ; } /** @@ -50,6 +88,13 @@ for(BaDistrict subPo : po.subDistricts){ getSubDistrict(subPo) ; } + }else{ + //娌℃湁涓嬬骇浜嗭紝鍙互鍒犻櫎 + po.canDelete = false ; + if(po.level.code.byteValue() == DistrictLevel.Village.code.byteValue()){ + //鍒版潙绾т簡锛屼笉鍙互鍐嶆坊鍔犺鏀垮尯浜� + po.canAdd = false ; + } } } } -- Gitblit v1.8.0