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/block/BlockSv.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 581eb20..7dbd4c4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -3,10 +3,13 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaBlockMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
+import com.dy.pipIrrGlobal.pojoBa.BaClientType;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import java.util.Map;
import java.util.List;
@@ -30,6 +33,16 @@
return this.dao.selectByPrimaryKey(id) ;
}
+
+ /**
+ * 寰楀埌鎵�鏈夌墖鍖�
+ * @return 鎵�鏈夌墖鍖洪泦鍚�
+ */
+ public QueryResultVo<List<BaBlock>> selectAll(){
+ QueryResultVo<List<BaBlock>> rsVo = new QueryResultVo<>() ;
+ rsVo.obj = this.dao.selectAll() ;
+ return rsVo ;
+ }
/**
* 寰楀埌涓�涓墖鍖�
* @param vo 鏌ヨ鏉′欢鍊煎璞�
@@ -54,8 +67,9 @@
* @param po 瀹炰綋
* @return 鏁伴噺
*/
+ @Transactional
public int save(BaBlock po){
- return this.dao.insert(po) ;
+ return this.dao.putin(po) ;
}
/**
@@ -63,6 +77,7 @@
* @param po 瀹炰綋
* @return 鏁伴噺
*/
+ @Transactional
public int update(BaBlock po){
return this.dao.updateByPrimaryKeySelective(po) ;
}
@@ -72,6 +87,7 @@
* @param id 瀹炰綋ID
* @return 鏁伴噺
*/
+ @Transactional
public int delete(Long id){
return this.dao.deleteLogicById(id) ;
}
--
Gitblit v1.8.0