From 451abd5bc732aed5854b62e30bc2fb7cff3e1922 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 30 五月 2024 10:08:49 +0800
Subject: [PATCH] 2024-05-30 朱宝民 修改获取未关阀记录接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index cf75af5..c640895 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -9,6 +9,7 @@
 import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
 import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
 import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
 import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
 import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
 import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
@@ -40,12 +41,21 @@
     private final PrIntakeMapper prIntakeMapper;
 
     /**
-     * 鏍规嵁鍙栨按鍙D鑾峰彇闃�鎺у櫒鍦板潃
-     * @param intakeId 鍙栨按鍙D
-     * @return 闃�鎺у櫒鍦板潃
+     * 鏍规嵁鍙栨按鍙D鑾峰彇闃�鎺у櫒瀵硅薄
+     * @param intakeId
+     * @return
      */
-    public String getRtuAddrByIntakeId(Long intakeId) {
-        return prControllerMapper.getRtuAddrByIntakeId(intakeId);
+    public PrController getControllerByIntakeId(Long intakeId) {
+        return prControllerMapper.getControllerByIntakeId(intakeId);
+    }
+
+    /**
+     * 鏍规嵁RTU鍦板潃鑾峰彇闃�鎺у櫒瀵硅薄
+     * @param rtuAddr
+     * @return
+     */
+    public PrController getControllerByRtuAddr(String rtuAddr) {
+        return prControllerMapper.getControllerByRtuAddr(rtuAddr);
     }
 
     /**
@@ -53,9 +63,9 @@
      * @param po 鍛戒护鏃ュ織瀵硅薄
      * @return 瀛楃涓茬被鍨嬬殑涓婚敭
      */
-    public String insert(RmCommandHistory po) {
+    public Long insert(RmCommandHistory po) {
         rmCommandHistoryMapper.insert(po);
-        return (po.getId()).toString();
+        return po.getId();
     }
 
     /**

--
Gitblit v1.8.0