From e021502051079ac2b2c2adcea60b9ec01556b7fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 11:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictSv.java | 101 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 25 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 a8f4ae3..e3fdb4f 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
@@ -1,49 +1,34 @@
package com.dy.pipIrrBase.district;
+import com.dy.pipIrrBase.district.qo.DistrictQO;
+import com.dy.pipIrrGlobal.daoBa.AreaCode2023Mapper;
import com.dy.pipIrrGlobal.daoBa.BaDistrictMapper;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
+import com.dy.pipIrrGlobal.util.DistrictLevel;
+import com.dy.pipIrrGlobal.voBa.VoDistrict;
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;
+import java.util.Map;
@Slf4j
@Service
public class DistrictSv {
private BaDistrictMapper dao;
+ private AreaCode2023Mapper areaCode2023Dao;
@Autowired
private void setDao(BaDistrictMapper dao){
this.dao = dao;
}
- /**
- * 淇濆瓨瀹炰綋
- * @param po 瀹炰綋
- * @return 鏁伴噺
- */
- public int save(BaDistrict po){
- return this.dao.insert(po) ;
- }
-
- /**
- * 淇濆瓨淇敼瀹炰綋
- * @param po 瀹炰綋
- * @return 鏁伴噺
- */
- public int update(BaDistrict po){
- return this.dao.updateByPrimaryKeySelective(po) ;
- }
-
- /**
- * 淇濆瓨淇敼瀹炰綋
- * @param id 瀹炰綋ID
- * @return 鏁伴噺
- */
- public int delete(Long id){
- return this.dao.deleteLogicById(id) ;
+ @Autowired
+ private void setDao(AreaCode2023Mapper areaCode2023Dao){
+ this.areaCode2023Dao = areaCode2023Dao;
}
/**
@@ -55,6 +40,8 @@
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) ;
}
}
@@ -71,6 +58,36 @@
}
/**
+ * 淇濆瓨瀹炰綋
+ * @param po 瀹炰綋
+ * @return 鏁伴噺
+ */
+ @Transactional
+ public int save(BaDistrict po){
+ return this.dao.putin(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.deleteByPrimaryKey(id) ;
+ }
+
+ /**
* 寰楀埌涓嬬骇琛屾斂鍖哄垝
* @param po 涓婄骇琛屾斂鍖哄垝
*/
@@ -81,7 +98,41 @@
for(BaDistrict subPo : po.subDistricts){
getSubDistrict(subPo) ;
}
+ }else{
+ //娌℃湁涓嬬骇浜嗭紝鍙互鍒犻櫎
+ po.canDelete = false ;
+ if(po.level.code.byteValue() == DistrictLevel.Village.code.byteValue()){
+ //鍒版潙绾т簡锛屼笉鍙互鍐嶆坊鍔犺鏀垮尯浜�
+ po.canAdd = false ;
+ }
}
}
}
+
+ /**
+ * 鏍规嵁绾у埆鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param level
+ * @return
+ */
+ public List<Map<String, Object>> getDistrictgsByLevel(Integer level) {
+ return dao.getDistrictgsByLevel(level);
+ }
+
+ /**
+ * 鏍规嵁鐖禝D鑾峰彇琛屾斂鍖哄垝鍒楄〃
+ * @param supperId
+ * @return
+ */
+ public List<Map<String, Object>> getDistrictsBySupperId(Long supperId) {
+ return dao.getDistrictsBySupperId(supperId);
+ }
+
+ /**
+ * 鏍规嵁鍖哄垝浠ｇ爜鏌ヨ鎸囧畾绾у埆琛屾斂鍖哄垝
+ * @param qo
+ * @return
+ */
+ public List<VoDistrict> getDistrictS(DistrictQO qo) {
+ return areaCode2023Dao.getDistrictS(qo.getAredCode(), qo.getLevel());
+ }
}
--
Gitblit v1.8.0