From 57a26dab8612f2da5a1b073d6276dc3bb58d43d3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 23 十月 2024 10:30:59 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java | 77 +++++++++-----------------------------
1 files changed, 18 insertions(+), 59 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 0c0db5f..4a22e04 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,5 +1,6 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
+import com.dy.common.mw.protocol.UpComResVo;
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.*;
@@ -53,74 +54,32 @@
}
public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV1_0_1 dV1_0_1, Object obj) throws Exception{
- po.setResult((byte)1);
po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1_0_1.dt)) ;
if(obj instanceof DataCd97Vo){
DataCd97Vo vo = (DataCd97Vo)obj ;
- po.setResultText(vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd98Vo){
DataCd98Vo vo = (DataCd98Vo)obj ;
- po.setResultText(vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd92Vo){
DataCd92Vo vo = (DataCd92Vo)obj ;
- po.setResultText(vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}else if(obj instanceof DataCd93Vo){
DataCd93Vo vo = (DataCd93Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd3AAnd6AVo){
- DataCd3AAnd6AVo vo = (DataCd3AAnd6AVo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd3BAnd6BVo){
- DataCd3BAnd6BVo vo = (DataCd3BAnd6BVo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd3BAnd6BVo){
- DataCd3CAnd65Vo vo = (DataCd3CAnd65Vo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd3DVo){
- DataCd3DVo vo = (DataCd3DVo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd3EVo){
- DataCd3EVo vo = (DataCd3EVo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd5EVo){
- DataCd5EVo vo = (DataCd5EVo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd6CVo){
- DataCd6CVo vo = (DataCd6CVo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd10Vo){
- DataCd10Vo vo = (DataCd10Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd21Vo){
- DataCd21Vo vo = (DataCd21Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd36Vo){
- DataCd36Vo vo = (DataCd36Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd37And67Vo){
- DataCd37And67Vo vo = (DataCd37And67Vo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd38And68Vo){
- DataCd38And68Vo vo = (DataCd38And68Vo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd39And69Vo){
- DataCd39And69Vo vo = (DataCd39And69Vo)obj ;
- po.setResultText(vo.comLog(code));
- }else if(obj instanceof DataCd51Vo){
- DataCd51Vo vo = (DataCd51Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd66Vo){
- DataCd66Vo vo = (DataCd66Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd71Vo){
- DataCd71Vo vo = (DataCd71Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCd99Vo){
- DataCd99Vo vo = (DataCd99Vo)obj ;
- po.setResultText(vo.comLog());
- }else if(obj instanceof DataCdA0Vo){
- DataCdA0Vo vo = (DataCdA0Vo)obj ;
- po.setResultText(vo.comLog());
+ po.setResult(vo.success?(byte)1:(byte)0);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
+ }else if(obj instanceof UpComResVo){
+ UpComResVo vo = (UpComResVo)obj ;
+ po.setResult((byte)1);
+ po.setResultText(vo.comLog()!=null?vo.comLog():vo.comLog(code));
+ log.info("----------------------------------\n" + (vo.comLog()!=null?vo.comLog():vo.comLog(code)));
}
return po ;
}
--
Gitblit v1.8.0