From daad26e9ea4296f8ae6df07b458e30aad5586847 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 16 一月 2024 15:17:34 +0800 Subject: [PATCH] 1、通信中间件实现控制器报警与状态处理逻辑,及实现数据库映射Mapper; 2、通信中间件实现控制器自报数据处理逻辑,及实现数据库映射Mapper。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java index ea3fefd..8d2ac78 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DriverV1_0_1.java @@ -115,8 +115,12 @@ */ @Override public MidResult[] createCommand(Boolean isLowPower, Command command, Object... params) { + String RtuResultSendWebUrl = command.getRtuResultSendWebUrl() ; + if(RtuResultSendWebUrl == null || RtuResultSendWebUrl.trim().equals("")){ + return new MidResult[]{(new MidResultError(ProtocolConstantV206V1_0_0.protocolName, null, "涓ラ噸閿欒锛屽懡浠や腑rtu杩斿洖鍛戒护缁撴灉鍙戝悜鐩殑鍦皐eb URL涓虹┖锛屼笉鑳芥瀯寤轰换浣曞懡浠わ紒", null))} ; + } String rtuAddr = command.getRtuAddr() ; - if(rtuAddr == null){ + if(rtuAddr == null || rtuAddr.trim().equals("")){ return new MidResult[]{(new MidResultError(ProtocolConstantV206V1_0_0.protocolName, null, "涓ラ噸閿欒锛屽懡浠や腑Rtu鍦板潃涓虹┖锛屼笉鑳芥瀯寤轰换浣曞懡浠わ紒", null))} ; } try { @@ -124,6 +128,7 @@ this.downCpParams.clear(); this.downCpParams.setValue( + RtuResultSendWebUrl, ProtocolConstantV206V1_0_0.protocolName, rtuAddr, command.getId(), -- Gitblit v1.8.0