From cef843b8175ab3775036f705f7cf69e4bd32c4f3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 16 一月 2024 16:53:07 +0800
Subject: [PATCH] 1、修改获得绑定控制器的方法； 2、添加文档“取水口控制哭喊及测控数据关系”
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java | 2 +-
pipIrr-platform/文档/取水口控制器及测控数据关系.vsd | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 11 +++++++----
pipIrr-platform/文档/取水口控制器及测控数据关系.docx | 0
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java | 5 ++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml | 13 +++++++++++++
6 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
index 2be6b7c..da7893b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -56,7 +56,7 @@
* @param rtuAddr
* @return
*/
- //List<PrController> getControllersByRtuAddr(@Param("rtuAddr") String rtuAddr);
+ List<PrController> getControllersByRtuAddrAndIntakeNotNull(@Param("rtuAddr") String rtuAddr);
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
index 69ea5d9..fa8b81d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerMapper.xml
@@ -14,6 +14,11 @@
<result column="operateDt" jdbcType="TIMESTAMP" property="operateDt" />
<result column="deleted" jdbcType="TINYINT" property="deleted" />
</resultMap>
+ <resultMap id="PartResultMap" type="com.dy.pipIrrGlobal.pojoPr.PrController">
+ <id column="id" jdbcType="BIGINT" property="id" />
+ <result column="intakeId" jdbcType="BIGINT" property="intakeId" />
+ <result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
+ </resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, intakeId, rtuAddr, protocol, findDt, addWays, `operator`, operateDt, deleted
@@ -214,6 +219,14 @@
SELECT id, rtuAddr FROM pr_controller WHERE deleted = 0 AND rtuAddr LIKE CONCAT('%',#{rtuAddr},'%')
</select>
+ <!--鏍规嵁鎺у埗鍣ㄥ湴鍧�鑾峰彇鎺у埗鍣ㄥ垪琛�-->
+ <select id="getControllersByRtuAddrAndIntakeNotNull" parameterType="java.lang.String" resultMap="PartResultMap">
+ SELECT
+ <include refid="Part_Column_List">
+ </include>
+ FROM pr_controller WHERE deleted = 0 AND intakeId is not null AND rtuAddr=#{rtuAddr,jdbcType=VARCHAR}
+ </select>
+
<!--鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗-->
<update id="deleteControllerById">
UPDATE pr_controller SET deleted = 1 WHERE id = ${controllerId}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
index 05435e4..45d1fa8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
@@ -2,12 +2,14 @@
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
+import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoRm.RmAlarmStateHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmAlarmStateLastMapper;
import com.dy.pipIrrGlobal.daoRm.RmAutoReportHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmAutoReportLastMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
+import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
@@ -44,13 +46,14 @@
@Lazy
private DbSv sv ;
+
/**
* 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 鎺у埗鍣�
*/
public PrController getPrControllerByRtuAddr(String rtuAddr){
- List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddr(rtuAddr) ;
+ List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index defaeea..a5c0619 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -70,14 +70,14 @@
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
RmAlarmStateLast po = sv.getRmLastAlarmState(rtuAddr) ;
if(po == null){
- po = new RmAlarmStateLast(null, controller.getId(), controller.getId(),
+ po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), controller.getId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
stateVo==null?null:stateVo.icCard, stateVo==null?null:stateVo.working, stateVo==null?null:stateVo.valve) ;
sv.saveRmAlarmStateLast(po) ;
}else{
- po = this.update(po, alarmVo, stateVo) ;
+ po = this.update(controller, po, alarmVo, stateVo) ;
sv.saveRmAlarmStateLast(po);
}
}
@@ -91,7 +91,7 @@
* @param stateVo 鐘舵�佸璞�
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataAlarmVo alarmVo, DataStateVo stateVo){
- RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller.getId(), controller.getId(),
+ RmAlarmStateHistory po = new RmAlarmStateHistory(null, controller==null?null:controller.getId(), controller.getId(),
rtuAddr,
new Date(),
alarmVo==null?null:alarmVo.batteryVolt, alarmVo==null?null:alarmVo.loss, alarmVo==null?null:alarmVo.meter, alarmVo==null?null:alarmVo.valve,
@@ -100,7 +100,10 @@
}
- private RmAlarmStateLast update(RmAlarmStateLast po, DataAlarmVo alarmVo, DataStateVo stateVo){
+ private RmAlarmStateLast update(PrController controller, RmAlarmStateLast po, DataAlarmVo alarmVo, DataStateVo stateVo){
+ if(controller != null){
+ po.controllerid = controller.getId() ;
+ }
po.dt = new Date() ;
if(alarmVo != null){
po.bateryvolt = alarmVo.batteryVolt ;
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.docx" "b/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.docx"
new file mode 100644
index 0000000..d3aaad6
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.docx"
Binary files differ
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.vsd" "b/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.vsd"
new file mode 100644
index 0000000..2cf4474
--- /dev/null
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\217\226\346\260\264\345\217\243\346\216\247\345\210\266\345\231\250\345\217\212\346\265\213\346\216\247\346\225\260\346\215\256\345\205\263\347\263\273.vsd"
Binary files differ
--
Gitblit v1.8.0