改一下

liurunyu

2024-11-23 7c94f000ca94776eb62e8296bf4f42473085f242

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/tasks/RtuUpTask.java

@@ -2,6 +2,11 @@

import java.net.InetSocketAddress;

import com.dy.common.mw.protocol.*;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.Callback;
import com.dy.rtuMw.server.upgrade.UpgradeUnit;
import com.dy.rtuMw.web.com.CommandCtrl;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.mina.core.session.IoSession;
@@ -9,12 +14,6 @@
import com.dy.common.mw.channel.tcp.TcpIoSessionAttrIdIsRtuAddr;
import com.dy.common.mw.channel.tcp.TcpUnit;
import com.dy.common.mw.core.CoreTask;
import com.dy.common.mw.protocol.DriverParserDataCallback;
import com.dy.common.mw.protocol.MidResult;
import com.dy.common.mw.protocol.Driver;
import com.dy.common.mw.protocol.OnLine;
import com.dy.common.mw.protocol.OnLineHandle;
import com.dy.common.mw.protocol.ProtocolCache;
import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.forTcp.RtuLogDealer;
import com.dy.rtuMw.server.forTcp.RtuStatusDealer;
@@ -64,7 +63,7 @@
         //说明刚建立网络连接，此数据应该是上线数据
         isOnLine = true ;
         Object[] rtuAddrProtocolNameVersion = this.parseOnLine(session, upBuf) ;
         if(rtuAddrProtocolNameVersion.length == 2){
         if(rtuAddrProtocolNameVersion.length == 3){
            //解析上线数据成功，并解析出RTU地址及通信协议名称
            rtuAddr = (String)rtuAddrProtocolNameVersion[0] ;
            protocolName = (String)rtuAddrProtocolNameVersion[1] ;
@@ -210,6 +209,26 @@
               }else{
                  RtuLogDealer.log(rtuAddr, (isOnLine?"上线数据 ":"上行数据 ") +  code + ("（" + codeName + "）") + "：" + upHex);
               }

               //触发远程RTU软件升级
               UpgradeUnit.getInstance().trigger(rtuAddr, code, protocolName, protocolVersion, new Callback() {
                  @Override
                  public void call(Object obj) {
                     if(obj != null){
                        Command com = (Command)obj ;
                        CommandCtrl comCtrl = SpringContextUtil.getBean(CommandCtrl.class) ;
                        if(comCtrl != null){
                           comCtrl.sendOutComFromLocal(com) ;
                        }
                     }
                  }
                  @Override
                  public void call(Object... objs) {
                  }
                  @Override
                  public void exception(Exception e) {
                  }
               });
            }
         }) ;
         if(midRs != null){