From 9610012b92a61893587439591a8577215f4c2cbd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 14 六月 2024 14:53:49 +0800
Subject: [PATCH] 2024-06-14 朱宝民 定时报
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java | 69 +++++++++++++---------------------
1 files changed, 26 insertions(+), 43 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 362c70a..adf2d6c 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,10 @@
private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
@Autowired
private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
+ @Autowired
+ private RmCommandHistoryMapper rmCommandHistoryDao ;//杩滅▼鍛戒护鏃ュ織鐩稿叧
+ @Autowired
+ private SeVirtualCardMapper seVirtualCardDao ;//铏氭嫙鍗＄浉鍏�
//@Autowired
//@Lazy
@@ -139,51 +140,21 @@
this.rmAlarmStateHistoryMapperDao.insert(po) ;
}
+ /**
+ * 鍙樻洿铏氭嫙鍗″崰鐢ㄧ姸鎬�
+ * @param intakeId
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updateVirCardNoUseState(Long intakeId){
+ this.seVirtualCardDao.updateVcCardNoUseStateByIntakeId(intakeId); ;
+ }
/////////////////////////////////////////////////
//
- // 涓诲姩涓婃姤鏁版嵁鍔熻兘
+ // 瀹氱偣鎶ユ暟鎹姛鑳�
//
////////////////////////////////////////////////
- /**
- * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param rtuAddr
- * @return
- */
- public RmAutoReportLast getRmAutoReportLast(String rtuAddr){
- List<RmAutoReportLast> list = rmAutoReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
- 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) ;
- }
- /**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void updateRmAutoReportLast(RmAutoReportLast po){
- this.rmAutoReportLastMapperDao.updateByPrimaryKeySelective(po) ;
- }
- /**
- * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
- * @param po
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveRmAutoReportHistory(RmAutoReportHistory po){
- this.rmAutoReportHistoryMapperDao.insert(po) ;
- }
-
-
/////////////////////////////////////////////////
@@ -377,5 +348,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