pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkFindComResponse.java
@@ -26,7 +26,7 @@ public void execute(Object data) { Data d = (Data)data ; if(d.getCommandId() != null && !d.getCommandId().trim().equals("")){ //无命令ID //有命令ID this.toNextTasks(data); } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
@@ -47,7 +47,7 @@ log.error("未得到命令日志（" + d.getCommandId() + ")"); } }catch (Exception e){ log.error("保存控制器自报数据时发生异常", e); log.error("保存控制器命令结果时发生异常", e); } } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkRtuDealCommandResponseV2.java
@@ -50,7 +50,7 @@ log.error("未得到命令日志（" + d.getCommandId() + ")"); } }catch (Exception e){ log.error("保存控制器自报数据时发生异常", e); log.error("保存控制器命令结果时发生异常", e); } } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkRtuDealCommandResponseV202404.java
@@ -45,7 +45,7 @@ log.error("未得到命令日志（" + d.getCommandId() + ")"); } }catch (Exception e){ log.error("保存控制器自报数据时发生异常", e); log.error("保存控制器命令结果时发生异常", e); } } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealCommandResponseSdV1.java
New file @@ -0,0 +1,58 @@ package com.dy.rtuMw.server.rtuData.pSdV1; import com.dy.common.mw.protocol4Mqtt.MqttSubMsg; import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.ManureVo; import com.dy.pipIrrGlobal.pojoPr.PrStManure; import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory; import com.dy.rtuMw.server.rtuData.TaskSurpport; import com.dy.rtuMw.server.rtuData.dbSv.DbSv; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Date; /** * @Author: liurunyu * @Date: 2025/6/25 15:52 * @Description */ public class TkDealCommandResponseSdV1 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkDealCommandResponseSdV1.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkDealCommandResponseSdV1" ; /** * 执行节点任务：处理命令响应上报 * @param data 需要处理的数据 */ @Override public void execute(Object data) { //前面的任务已经判断了data不为空且为水肥数据 MqttSubMsg msg = (MqttSubMsg) data; ManureVo stVo = (ManureVo) msg.vo4Up; Object[] objs = this.getTaskResults(TkPreGenObjs4ManureSdV1.taskId); DbSv sv = (DbSv) objs[0]; PrStManure stPo = (PrStManure) objs[1]; try{ RmCommandHistory po = sv.getCommandLog(msg.commandId) ; if(po != null){ po = this.updateCommandLogPo(po, msg) ; sv.updateCommandLog(po); }else{ log.error("未得到MQTT命令日志（" + msg.getCommandId() + ")"); } }catch (Exception e){ log.error("保存MQTT命令结果发生异常", e); } } public RmCommandHistory updateCommandLogPo(RmCommandHistory po, MqttSubMsg msg) throws Exception{ po.setResultTime(new Date()); po.setResult((byte)1); po.setResultText(msg.metaData); return po ; } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealWeatherSdV1.java
@@ -29,7 +29,7 @@ */ @Override public void execute(Object data) { //前面的任务已经判断了data不为空且为墒情数据 //前面的任务已经判断了data不为空且为气象数据 MqttSubMsg msg = (MqttSubMsg) data; WeatherVo stVo = (WeatherVo) msg.vo4Up; Object[] objs = this.getTaskResults(TkPreGenObjs4WeatherSdV1.taskId); pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkFindComResponseSdV1.java
New file @@ -0,0 +1,37 @@ package com.dy.rtuMw.server.rtuData.pSdV1; import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol4Mqtt.MqttSubMsg; import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.ManureVo; import com.dy.pipIrrGlobal.pojoPr.PrStManure; import com.dy.rtuMw.server.rtuData.TaskSurpport; import com.dy.rtuMw.server.rtuData.dbSv.DbSv; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; /** * @Author: liurunyu * @Date: 2025/6/25 15:52 * @Description */ public class TkFindComResponseSdV1 extends TaskSurpport { private static final Logger log = LogManager.getLogger(TkFindComResponseSdV1.class.getName()) ; //类ID，一定与Tree.xml配置文件中配置一致 public static final String taskId = "TkFindComResponseSdV1" ; /** * 执行节点任务 * @param data 需要处理的数据 */ @Override public void execute(Object data) { //前面的任务已经判断了data不为空且为水肥数据 MqttSubMsg msg = (MqttSubMsg) data; if(msg.getCommandId() != null && !msg.getCommandId().trim().equals("")){ //有命令ID this.toNextTasks(data); } } } pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/RtuDataDealTree.xml
@@ -98,6 +98,11 @@ <task id="TkPreGenObjs4ManureSdV1" name="为处理水肥机数据预先准备各对象" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkPreGenObjs4ManureSdV1"> <task id="TkDealManureSdV1" name="处理水肥数据" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkDealManureSdV1"> </task> <!-- 只有水肥机有远程命令 --> <task id="TkFindComResponseSdV1" name="识别响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkFindComResponseSdV1"> <task id="TkDealCommandResponseSdV1" name="水肥机响应命令数据" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkDealCommandResponseSdV1" > </task> </task> </task> <task id="TkPreGenObjs4WeatherSdV1" name="为处理气象数据预先准备各对象" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkPreGenObjs4WeatherSdV1"> <task id="TkDealWeatherSdV1" name="处理气象数据" enable="true" class="com.dy.rtuMw.server.rtuData.pSdV1.TkDealWeatherSdV1">
