From 25fd361007a843306bb4a1f4a5204ef9243fb974 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 19:18:53 +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 |  149 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 149 insertions(+), 0 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 dcffd54..07ec929 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
@@ -13,6 +13,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,6 +40,14 @@
     private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板紑鍏抽榾涓婃姤鏁版嵁DAO
     @Autowired
     private RmOpenCloseValveHistoryMapper rmOpenCloseValveHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插紑鍏抽榾涓婃姤鏁版嵁DAO
+    @Autowired
+    private RmWorkReportLastMapper rmWorkReportLastMapperDao ;//鎺у埗鍣ㄦ渶鏂板伐浣滄姤鏁版嵁DAO
+    @Autowired
+    private RmWorkReportHistoryMapper rmWorkReportHistoryMapperDao ;//鎺у埗鍣ㄥ巻鍙插伐浣滄姤鏁版嵁DAO
+    @Autowired
+    private RmLossLastMapper rmLossLastMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂版暟鎹瓺AO
+    @Autowired
+    private RmLossHistoryMapper rmLossHistoryMapperDao ;//鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙叉暟鎹瓺AO
 
     //@Autowired
     //@Lazy
@@ -107,6 +116,14 @@
     @Transactional(rollbackFor = Exception.class)
     public void saveRmAlarmStateLast(RmAlarmStateLast po){
         this.rmAlarmStateLastMapperDao.insert(po) ;
+    }
+   /**
+     * 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佹渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRmAlarmStateLast(RmAlarmStateLast po){
+        this.rmAlarmStateLastMapperDao.updateByPrimaryKeySelective(po) ;
     }
     /**
      * 淇濆瓨鎺у埗鍣ㄦ姤璀︿笌鐘舵�佸巻鍙茶褰�
@@ -224,4 +241,136 @@
         this.rmOpenCloseValveHistoryMapperDao.updateByPrimaryKeySelective(po) ;
     }
 
+
+
+    /////////////////////////////////////////////////
+    //
+    // 宸ヤ綔鎶ユ暟鎹姛鑳�
+    //
+    ////////////////////////////////////////////////
+    /**
+     * 寰楀埌鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+     * @param rtuAddr
+     * @return
+     */
+    public RmWorkReportLast getRmWorkReportLast(String rtuAddr){
+        List<RmWorkReportLast> list = rmWorkReportLastMapperDao.selectByRtuAddr(rtuAddr) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmWorkReportLast(RmWorkReportLast po){
+        this.rmWorkReportLastMapperDao.insert(po) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRmWorkReportLast(RmWorkReportLast po){
+        this.rmWorkReportLastMapperDao.updateByPrimaryKeySelective(po) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄤ笂鎶ユ暟鎹巻鍙茶褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmWorkReportHistory(RmWorkReportHistory po){
+        this.rmWorkReportHistoryMapperDao.insert(po) ;
+    }
+
+
+    /////////////////////////////////////////////////
+    //
+    // 婕忔崯姘撮噺缁熻鍔熻兘
+    //
+    ////////////////////////////////////////////////
+    /**
+     * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param rtuAddr
+     * @return
+     */
+    public RmLossLast getRmLossLast(String rtuAddr){
+        List<RmLossLast> list = rmLossLastMapperDao.selectByRtuAddr(rtuAddr) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmLossLast(RmLossLast po){
+        this.rmLossLastMapperDao.insert(po) ;
+    }
+  /**
+     * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRmLossHistory(RmLossHistory po){
+        this.rmLossHistoryMapperDao.insert(po) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRmLossLast(RmLossLast po){
+        this.rmLossLastMapperDao.updateByPrimaryKeySelective(po) ;
+    }
+    /**
+     * 淇濆瓨鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param po
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateRmLossHistory(RmLossHistory po){
+        this.rmLossHistoryMapperDao.updateByPrimaryKeySelective(po) ;
+    }
+
+    /**
+     * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬渶鏂拌褰�
+     * @param id
+     * @return
+     */
+    public RmLossHistory getRmLossHistory(Long id){
+        return rmLossHistoryMapperDao.selectByPrimaryKey(id) ;
+    }
+
+
+    /**
+     * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁℃渶鏂拌褰�
+     * @param dt
+     * @return
+     */
+    public RmLossLast getRmLossLastByDate(Date dt){
+        List<RmLossLast> list = rmLossLastMapperDao.selectByDate(dt) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+
+    /**
+     * 寰楀埌鎺у埗鍣ㄦ紡鎹熸按閲忕粺璁″巻鍙茶褰曚腑鐨勬煇鏃ヨ褰�
+     * @param dt
+     * @return
+     */
+    public RmLossHistory getRmLossHistoryByDate(Date dt){
+        List<RmLossHistory> list = rmLossHistoryMapperDao.selectByDate(dt) ;
+        if(list != null && list.size() > 0){
+            return list.get(0) ;
+        }
+        return null ;
+    }
+
+
 }

--
Gitblit v1.8.0