From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码; 2、删除global模块中一些无用的备份; 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false),防止编译时警告

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkRtuDealCommandResponse.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 0cc4cc6..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.*;
@@ -74,8 +75,8 @@
             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 ComResVo){
-            ComResVo vo = (ComResVo)obj ;
+        }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)));

--
Gitblit v1.8.0