From b83f639362ae959de55900d14d132585cd72a90d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:39:41 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/dbSv/DbSv.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 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 7241234..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
@@ -115,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) ;
         }
@@ -177,12 +177,12 @@
 
     /**
      * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇瀹氱偣涓婃姤鏈�鏂版暟鎹�
-     * @param rtuAddr
+     * @param intakeId
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public RmTimingReportLast getRmTimingReportLast(String rtuAddr) {
-        List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(rtuAddr) ;
+    public RmTimingReportLast getRmTimingReportLast(Long intakeId) {
+        List<RmTimingReportLast> list = this.rmTimingReportLastDao.getRmTimingReportLast(intakeId) ;
         if(list != null && list.size() > 0){
             return list.get(0) ;
         }
@@ -224,12 +224,12 @@
 
     /**
      * 鏍规嵁闃�鎺у櫒鍦板潃鑾峰彇鏁寸偣涓婃姤鏈�鏂版暟鎹�
-     * @param rtuAddr
+     * @param intakeId
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public RmOnHourReportLast getRmOnHourReportLast(String rtuAddr) {
-        List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(rtuAddr) ;
+    public RmOnHourReportLast getRmOnHourReportLast(Long intakeId) {
+        List<RmOnHourReportLast> list = this.rmOnHourReportLastDao.getRmOnHourReportLast(intakeId) ;
         if(list != null && list.size() > 0){
             return list.get(0) ;
         }
@@ -261,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) ;
         }
@@ -321,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) ;
         }
@@ -364,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) ;
         }

--
Gitblit v1.8.0