From 854e951894deaa54b26590f8575474ed7a5f5b88 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 10:32:30 +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 |   92 ++++++++++++++++++++++++---------------------
 1 files changed, 49 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 7492484..7241234 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
@@ -53,9 +53,9 @@
     private RmTimingReportLastMapper rmTimingReportLastDao; // 瀹氱偣涓婃姤鏈�鏂版暟鎹瓺AO
 
     @Autowired
-    private RmOpenCloseHistoryMapper rmOpenCloseHistoryDao;
+    private RmOnHourReportHistoryMapper rmOnHourReportHistoryDao; // 鏁寸偣涓婃姤鍘嗗彶鏁版嵁DAO
     @Autowired
-    private RmOpenCloseLastMapper rmOpenCloseLastDao;
+    private RmOnHourReportLastMapper rmOnHourReportLastDao; // 鏁寸偣涓婃姤鏈�鏂版暟鎹瓺AO
 
     //@Autowired
     //@Lazy
@@ -162,7 +162,7 @@
 
     /////////////////////////////////////////////////
     //
-    // 瀹氱偣鎶ユ暟鎹姛鑳�
+    // 瀹氱偣鎶ユ暟鎹姛鑳�(鍙湪鐜嬫睙娴风殑鍗忚鏈夋鏁版嵁)
     //
     ////////////////////////////////////////////////
 
@@ -207,6 +207,52 @@
         this.rmTimingReportLastDao.updateByPrimaryKeySelective(po);
     }
 
+    /////////////////////////////////////////////////
+    //
+    // 鏁寸偣涓婃姤瀹炴椂鏁版嵁鍔熻兘(鍙湪闈虫�荤殑鍗忚鏈夋鏁版嵁)
+    //
+    ////////////////////////////////////////////////
+
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ暣鐐逛笂鎶ュ巻鍙叉暟鎹�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmOnHourReportHistory(RmOnHourReportHistory po){
+        this.rmOnHourReportHistoryDao.insert(po);
+    }
+
+    /**
+     * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
+     * @param rtuAddr
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public RmOnHourReportLast getRmOnHourReportLast(String rtuAddr) {
+        List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(rtuAddr) ;
+        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);
+    }
 
     /////////////////////////////////////////////////
     //
@@ -266,46 +312,6 @@
     @Transactional(rollbackFor = Exception.class)
     public void updateRmOpenCloseValveHistory(RmOpenCloseValveHistory po){
         this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
-    }
-
-    /**
-     * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
-     * @param po
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void saveRmOpenCloseLast(RmOpenCloseLast po){
-        this.rmOpenCloseLastDao.insert(po) ;
-    }
-
-    /**
-     * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鍘嗗彶璁板綍(202404)
-     * @param po
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void saveRmOpenCloseHistory(RmOpenCloseHistory po){
-        this.rmOpenCloseHistoryDao.insert(po) ;
-    }
-
-    /**
-     * 寰楀埌鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
-     * @param rtuAddr
-     * @return
-     */
-    public RmOpenCloseLast getRmOpenCloseLast(String rtuAddr){
-        List<RmOpenCloseLast> list = rmOpenCloseLastDao.getRmOpenCloseReportLast(rtuAddr);
-        if(list != null && list.size() > 0){
-            return list.get(0) ;
-        }
-        return null ;
-    }
-
-    /**
-     * 淇濆瓨鎺у埗鍣ㄥ紑鍏抽榾涓婃姤鏁版嵁鏈�鏂拌褰�(202404)
-     * @param po
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void updateRmOpenCloseLast(RmOpenCloseLast po){
-        this.rmOpenCloseLastDao.updateByPrimaryKeySelective(po);
     }
 
     /////////////////////////////////////////////////

--
Gitblit v1.8.0