From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
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..73c23fc 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.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.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