From 76d5cfc674f9b1033baafbe3ac71f06ed001f289 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 07 三月 2024 10:49:27 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 14 deletions(-)
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 45d1fa8..dcffd54 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
@@ -3,17 +3,11 @@
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.daoRm.*;
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;
-import com.dy.pipIrrGlobal.pojoRm.RmAutoReportLast;
+import com.dy.pipIrrGlobal.pojoRm.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -41,18 +35,26 @@
private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂颁笂鎶ユ暟鎹瓺AO
@Autowired
private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
-
@Autowired
- @Lazy
- private DbSv sv ;
+ private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板紑鍏抽榾涓婃姤鏁版嵁DAO
+ @Autowired
+ private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插紑鍏抽榾涓婃姤鏁版嵁DAO
+ //@Autowired
+ //@Lazy
+ //private DbSv sv ;
+ /////////////////////////////////////////////////
+ //
+ // 鍩虹鍔熻兘
+ //
+ ////////////////////////////////////////////////
/**
* 閫氳繃鎺у埗鍣ㄥ湴鍧�浠庢暟鎹簱琛ㄤ腑鏌ヨ鎺у埗鍣�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 鎺у埗鍣�
*/
- public PrController getPrControllerByRtuAddr(String rtuAddr){
+ public PrController getControllersByRtuAddrAndIntakeNotNull(String rtuAddr){
List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
if(list != null && list.size() > 0){
return list.get(0) ;
@@ -79,12 +81,19 @@
public void savePrConctrollerTramp(PrControllerTramp po){
this.prControllerTrampMapperDao.insert(po) ;
}
+
+
+ /////////////////////////////////////////////////
+ //
+ // 鎶ヨ鍙婄姸鎬佸姛鑳�
+ //
+ ////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
* @param rtuAddr
* @return
*/
- public RmAlarmStateLast getRmLastAlarmState(String rtuAddr){
+ public RmAlarmStateLast getRmAlarmStateLast(String rtuAddr){
List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByRtuAddr(rtuAddr) ;
if(list != null && list.size() > 0){
return list.get(0) ;
@@ -107,12 +116,20 @@
public void saveRmAlarmStateHistory(RmAlarmStateHistory po){
this.rmAlarmStateHistoryMapperDao.insert(po) ;
}
+
+
+
+ /////////////////////////////////////////////////
+ //
+ // 涓诲姩涓婃姤鏁版嵁鍔熻兘
+ //
+ ////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
* @param rtuAddr
* @return
*/
- public RmAutoReportLast getRmLastAutoReport(String rtuAddr){
+ public RmAutoReportLast getRmAutoReportLast(String rtuAddr){
List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
if(list != null && list.size() > 0){
return list.get(0) ;
@@ -128,6 +145,14 @@
this.rmAutoReportLastMapperDao.insert(po) ;
}
/**
+ * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmAutoReportLast(RmAutoReportLast po){
+ this.rmAutoReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+ }
+ /**
* 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
* @param po
*/
@@ -136,4 +161,67 @@
this.rmAutoReportHistoryMapperDao.insert(po) ;
}
+
+
+
+ /////////////////////////////////////////////////
+ //
+ // 寮�鍏抽榾涓婃姤鏁版嵁鍔熻兘
+ //
+ ////////////////////////////////////////////////
+ /**
+ * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�
+ * @param rtuAddr
+ * @return
+ */
+ public RmOpenCloseValveLast getRmOpenCloseValveLast(String rtuAddr){
+ List<RmOpenCloseValveLast> list = rmOpenCloseValveLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmOpenCloseValveLast(RmOpenCloseValveLast po){
+ this.rmOpenCloseValveLastMapperDao.insert(po) ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmOpenCloseValveLast(RmOpenCloseValveLast po){
+ this.rmOpenCloseValveLastMapperDao.updateByPrimaryKeySelective(po) ;
+ }
+ /**
+ * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶鏁版嵁涓殑鏈�鏂拌褰�
+ * @param id
+ * @return
+ */
+ public RmOpenCloseValveHistory getRmOpenCloseValveHistory(Long id){
+ return rmOpenCloseValveHistoryMapperDao.selectByPrimaryKey(id) ;
+ }
+
+ /**
+ * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
+ this.rmOpenCloseValveHistoryMapperDao.insert(po) ;
+ }
+
+ /**
+ * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶璁板綍
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
+ this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+ }
+
}
--
Gitblit v1.8.0