From 8fa3135b2765893e56dd8f913e27d47e6f63d429 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 05 七月 2024 13:59:10 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 150 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 32 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
index 1d9c5d8..b3dc1df 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java
@@ -3,6 +3,7 @@
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoRm.*;
+import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoRm.*;
@@ -30,10 +31,6 @@
@Autowired
private RmAlarmStateHistoryMapper rmAlarmStateHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙叉姤璀﹀拰鐘舵�丏AO
@Autowired
- private RmAutoReportLastMapper rmAutoReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂颁笂鎶ユ暟鎹瓺AO
- @Autowired
- private RmAutoReportHistoryMapper rmAutoReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙蹭笂鎶ユ暟鎹瓺AO
- @Autowired
private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板紑鍏抽榾涓婃姤鏁版嵁DAO
@Autowired
private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插紑鍏抽榾涓婃姤鏁版嵁DAO
@@ -45,6 +42,20 @@
private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
+ @Autowired
+ private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
+
+ @Autowired
+ private RmTimingReportHistoryMapper rmTimingReportHistoryDao; // 瀹氱偣涓婃姤鍘嗗彶鏁版嵁DAO
+ @Autowired
+ private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
+
+ @Autowired
+ private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
+ @Autowired
+ private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
//@Autowired
//@Lazy
@@ -87,6 +98,14 @@
public void savePrConctrollerTramp(PrControllerTramp po){
this.prControllerTrampMapperDao.insert(po) ;
}
+ /**
+ * 淇濆瓨娴佹氮鎺у埗鍣�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePrConctrollerTramp(PrControllerTramp po){
+ this.prControllerTrampMapperDao.updateByPrimaryKeySelective(po) ;
+ }
/////////////////////////////////////////////////
@@ -96,11 +115,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmAlarmStateLast getRmAlarmStateLast(String rtuAddr){
- List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmAlarmStateLast getRmAlarmStateLast(Long intakeId){
+ List<RmAlarmStateLast> list = rmAlarmStateLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -131,52 +150,109 @@
this.rmAlarmStateHistoryMapperDao.insert(po) ;
}
+ /**
+ * 鍙樻洿铏氭嫙鍗″崰鐢ㄧ姸鎬�
+ * @param intakeId
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateVirCardNoUseState(Long intakeId){
+ this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+ }
/////////////////////////////////////////////////
//
- // 涓诲姩涓婃姤鏁版嵁鍔熻兘
+ // 瀹氱偣鎶ユ暟鎹姛鑳�(鍙湪鐜嬫睙娴风殑鍗忚鏈夋鏁版嵁)
//
////////////////////////////////////////////////
+
/**
- * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ュ巻鍙叉暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmTimingReportHistory(RmTimingReportHistory po){
+ this.rmTimingReportHistoryDao.insert(po);
+ }
+
+ /**
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
+ * @param intakeId
* @return
*/
- public RmAutoReportLast getRmAutoReportLast(String rtuAddr){
- List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ @Transactional(rollbackFor = Exception.class)
+ public RmTimingReportLast getRmTimingReportLast(Long intakeId) {
+ List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
return null ;
}
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ユ渶鏂版暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.insert(po) ;
+ public void saveRmTimingReportLast(RmTimingReportLast po) {
+ this.rmTimingReportLastDao.insert(po);
}
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+ * 淇濆瓨鎺у埗鍣ㄥ畾鐐逛笂鎶ョ姜琛屾暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void updateRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+ public void updateRmTimingReportLast(RmTimingReportLast po) {
+ this.rmTimingReportLastDao.updateByPrimaryKeySelective(po);
}
+
+ /////////////////////////////////////////////////
+ //
+ // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+ //
+ ////////////////////////////////////////////////
+
/**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
* @param po
*/
@Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportHistory(RmAutoReportHistory po){
- this.rmAutoReportHistoryMapperDao.insert(po) ;
+ public void saveRmOnHourReportHistory(RmOnHourReportHistory po){
+ this.rmOnHourReportHistoryDao.insert(po);
}
+ /**
+ * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+ * @param intakeId
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public RmOnHourReportLast getRmOnHourReportLast(Long intakeId) {
+ List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(intakeId) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ユ渶鏂版暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void saveRmOnHourReportLast(RmOnHourReportLast po) {
+ this.rmOnHourReportLastDao.insert(po);
+ }
+ /**
+ * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ョ姜琛屾暟鎹�
+ * @param po
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateRmOnHourReportLast(RmOnHourReportLast po) {
+ this.rmOnHourReportLastDao.updateByPrimaryKeySelective(po);
+ }
/////////////////////////////////////////////////
//
@@ -185,11 +261,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmOpenCloseValveLast getRmOpenCloseValveLast(String rtuAddr){
- List<RmOpenCloseValveLast> list = rmOpenCloseValveLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmOpenCloseValveLast getRmOpenCloseValveLast(Long intakeId){
+ List<RmOpenCloseValveLast> list = rmOpenCloseValveLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -238,8 +314,6 @@
this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
}
-
-
/////////////////////////////////////////////////
//
// 宸ヤ綔鎶ユ暟鎹姛鑳�
@@ -247,11 +321,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmWorkReportLast getRmWorkReportLast(String rtuAddr){
- List<RmWorkReportLast> list = rmWorkReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmWorkReportLast getRmWorkReportLast(Long intakeId){
+ List<RmWorkReportLast> list = rmWorkReportLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -290,11 +364,11 @@
////////////////////////////////////////////////
/**
* 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
- * @param rtuAddr
+ * @param intakeId
* @return
*/
- public RmLossLast getRmLossLast(String rtuAddr){
- List<RmLossLast> list = rmLossLastMapperDao.selectByRtuAddr(rtuAddr) ;
+ public RmLossLast getRmLossLast(Long intakeId){
+ List<RmLossLast> list = rmLossLastMapperDao.selectByIntakeId(intakeId) ;
if(list != null && list.size() > 0){
return list.get(0) ;
}
@@ -369,5 +443,17 @@
return null ;
}
+ //////////////////////////////////////////////////////
+ //
+ // 鍛戒护鏃ュ織鐩稿叧
+ //
+ //////////////////////////////////////////////////////
+ public RmCommandHistory getCommandLog(String commandId){
+ return rmCommandHistoryDao.selectByPrimaryKey(Long.parseLong(commandId)) ;
+ }
+ public void updateCommandLog(RmCommandHistory po){
+ rmCommandHistoryDao.updateByPrimaryKeySelective(po) ;
+ }
+
}
--
Gitblit v1.8.0