From ba262a5e8ce59bcf661a40ce33bba60e4a0a2400 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期一, 20 五月 2024 11:12:38 +0800 Subject: [PATCH] 2024-05-20 朱宝民 远程模块测试 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java index 6612641..58807b9 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealWorkReport.java @@ -7,7 +7,6 @@ import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1; import com.dy.common.util.DateTime; import com.dy.pipIrrGlobal.pojoPr.PrController; -import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast; import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory; import com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast; import org.apache.logging.log4j.LogManager; @@ -17,7 +16,7 @@ * @Author liurunyu * @Date 2024/2/27 14:20 * @LastEditTime 2024/2/27 14:20 - * @Description 寮�闃�宸ヤ綔鎶� + * @Description 闃�寮�宸ヤ綔鎶� */ public class TkDealWorkReport extends TaskSurpport { @@ -36,20 +35,20 @@ Object subD = d.getSubData(); if (subD != null) { DataV1_0_1 dV1_0_1 = (DataV1_0_1) subD; - if (dV1_0_1 != null && dV1_0_1.dataCd84Vo != null) { - Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ; - DbSv sv = (DbSv)objs[0] ; - PrController controller = (PrController)objs[1] ; - try{ - this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd84Vo) ; - }catch (Exception e){ - log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e); - } - } +// if (dV1_0_1 != null && dV1_0_1.dataCd84Vo != null) { +// Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ; +// DbSv sv = (DbSv)objs[0] ; +// PrController controller = (PrController)objs[1] ; +// try{ +// this.doDeal(sv, controller, d.getRtuAddr(), dV1_0_1, dV1_0_1.dataCd84Vo) ; +// }catch (Exception e){ +// log.error("淇濆瓨鎺у埗鍣ㄩ榾寮�宸ヤ綔鎶ユ椂鍙戠敓寮傚父", e); +// } +// } } } /** - * 澶勭悊寮�闃�宸ヤ綔鎶ユ暟鎹� + * 澶勭悊闃�寮�宸ヤ綔鎶ユ暟鎹� * @param sv 鏈嶅姟 * @param controller 鎺у埗鍣ㄥ璞� * @param rtuAddr 鎺у埗鍣ㄥ湴鍧� @@ -61,7 +60,7 @@ } /** - * 淇濆瓨寮�闃�宸ヤ綔鎶ユ渶鏂版暟鎹� + * 淇濆瓨闃�寮�宸ヤ綔鎶ユ渶鏂版暟鎹� * @param sv * @param controller * @param rtuAddr @@ -94,7 +93,7 @@ } } /** - * 淇濆瓨寮�闃�宸ヤ綔鎶ュ巻鍙叉暟鎹� + * 淇濆瓨闃�寮�宸ヤ綔鎶ュ巻鍙叉暟鎹� * @param sv * @param controller * @param rtuAddr -- Gitblit v1.8.0