From 6efa476dad8e425ff71c37cd57437c99928cd405 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 八月 2025 17:42:22 +0800
Subject: [PATCH] 中间件,对于水肥机数据,每条上报数据都进行最新上报数据处理,以备前端界面及时显示水肥机状态。

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

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
index c9fc53e..27131f2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/common/ComSv.java
@@ -62,6 +62,7 @@
      * @param intakeId
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public PrCommonIntakes addOrUpdateOftenUseIntake(Long operatorId, Long intakeId) {
         PrCommonIntakes po = prCommonIntakesDao.selectByOperatorAndIntake(operatorId, intakeId);
         if(po == null) {
@@ -93,4 +94,20 @@
         jsonArr.add(jsonObj);
         return rmCommandHistoryDao.getUncloseParam(jsonArr.toJSONString(), intakeId);
     }
+
+    /**
+     * 鏍规嵁鍙栨按鍙D鑾峰彇璇ュ彇姘村彛鏈叧闃�鍙傛暟锛屽钩鍙伴�夋嫨鍙栨按鍙e叧闃�浣跨敤
+     * @param intakeId
+     * @param rtuAddr
+     * @param code
+     * @return
+     */
+    public VoUnclosedParam selectUncloseParamByCd(Long intakeId, String rtuAddr, String code) {
+        JSONArray jsonArr = new JSONArray();
+        JSONObject jsonObj = new JSONObject();
+        jsonObj.put("rtuAddr", rtuAddr);
+        jsonObj.put("isOnLine", true);
+        jsonArr.add(jsonObj);
+        return rmCommandHistoryDao.getUncloseParamByCd(jsonArr.toJSONString(), intakeId, code);
+    }
 }

--
Gitblit v1.8.0