From 23244726687acf8f5da68ea1db551567efaba374 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 17 七月 2024 17:02:02 +0800
Subject: [PATCH] RTU对命令的应答处理完善
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
index 9d055f9..9e80709 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java
@@ -1,17 +1,14 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.dy.common.mw.protocol.p206V1_0_0.*;
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd92Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd93Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd98Vo;
import com.dy.common.util.DateTime;
-import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
-import com.dy.common.mw.protocol.Data;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -42,12 +39,14 @@
if (dV1_0_1 != null && dV1_0_1.subData != null) {
Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
DbSv sv = (DbSv)objs[0] ;
- PrController controller = (PrController)objs[1] ;
+ //PrController controller = (PrController)objs[1] ;
try{
RmCommandHistory po = sv.getCommandLog(d.commandId) ;
if(po != null){
po = this.updateCommandLogPo(po, dV1_0_1, dV1_0_1.subData) ;
sv.updateCommandLog(po);
+ }else{
+ log.error("鏈緱鍒板懡浠ゆ棩蹇楋紙" + d.getCommandId() + ")");
}
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄨ嚜鎶ユ暟鎹椂鍙戠敓寮傚父", e);
@@ -59,20 +58,24 @@
public RmCommandHistory updateCommandLogPo(RmCommandHistory po, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
if(obj instanceof DataCd97Vo){
DataCd97Vo vo = (DataCd97Vo)obj ;
+ po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- po.setResultText((JSONObject) JSON.toJSON(vo));
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd98Vo){
DataCd98Vo vo = (DataCd98Vo)obj ;
+ po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt));
- po.setResultText((JSONObject) JSON.toJSON(vo));
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd92Vo){
DataCd92Vo vo = (DataCd92Vo)obj ;
+ po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- po.setResultText((JSONObject) JSON.toJSON(vo));
+ po.setResultText(vo.comLog());
}else if(obj instanceof DataCd93Vo){
DataCd93Vo vo = (DataCd93Vo)obj ;
+ po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
- po.setResultText((JSONObject) JSON.toJSON(vo));
+ po.setResultText(vo.comLog());
}
return po ;
}
--
Gitblit v1.8.0