From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/ComTransSv.java | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/ComTransSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/ComTransSv.java
index 50898f8..88846a0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/ComTransSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/ComTransSv.java
@@ -1,14 +1,8 @@
package com.dy.pipIrrRemote.monitor;
-import com.dy.pipIrrGlobal.command.CommandSv;
-import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
-import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
-import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.pipIrrRemote.monitor.common.ComSv;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
/**
* @Author: liurunyu
@@ -17,36 +11,5 @@
*/
@Slf4j
@Service
-public class ComTransSv extends CommandSv {
-
- @Autowired
- private PrControllerMapper prControllerDao ;
- @Autowired
- private RmCommandHistoryMapper rmCommandHistoryDao ;
-
- public PrController getRtu(Long intakeId){
- return this.getRtu(prControllerDao, intakeId);
- }
- /**
- * 鍒涘缓鍛戒护鏃ュ織瀵硅薄
- *
- * @param comId 涓婚敭
- * @param commandCode 鍔熻兘鐮�
- * @param rtuAddr 闃�鎺у櫒鍦板潃
- * @param protocol 閫氳鍗忚鍚嶇О
- * @param param 鍙傛暟鏁版嵁
- * @param operator 鎿嶄綔鍛�
- * @return
- */
- @Transactional(rollbackFor = Exception.class)
- public RmCommandHistory saveComHistoryPo(Long comId,
- String protocol,
- String commandCode,
- String commandName,
- Long intakeId,
- String rtuAddr,
- Object param,
- Long operator) {
- return this.saveComHistoryPo(rmCommandHistoryDao, comId, protocol, commandCode, commandName, intakeId, rtuAddr, param, operator) ;
- }
+public class ComTransSv extends ComSv {
}
--
Gitblit v1.8.0