1、完善代码； 2、修改上行命令结果匹配命令的bug;

liurunyu

2024-07-16 d19833d058eb3995e35cb9d45fb831169053eee4

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/forTcp/MidResultActionFromRtu.java

@@ -30,10 +30,11 @@
            MidResultToRtu resToRtu = TcpDownCommandCache.matchFromHead(resFromRtu) ;
            if(resToRtu != null){
               //匹配到下发的命令
               resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.param, resToRtu.rtuResultSendWebUrl) ;
               resFromRtu.matchedCommand(resToRtu.commandId, resToRtu.rtuResultSendWebUrl) ;
               this.nextDealRtuData(false, resFromRtu);
               this.nextDealRtuComResult(resFromRtu);
            }else{
               log.error("匹配命令失败，功能码是：" + ((MidResultFromRtu) result).upCode );
               this.nextDealRtuData(false, resFromRtu);
               //未匹配到下发的命令，命令在缓存因超时被清除了
               RtuStatusDealer.commandFail2Success(resFromRtu.rtuAddr) ;
@@ -64,7 +65,9 @@
    */
   private void nextDealRtuComResult(MidResultFromRtu resFromRtu){
      try{
         log.info("开始把命令结果放入缓中");
         RtuComResultCache.cacheRtuComResult(new RtuComResultNode(resFromRtu.data));
         log.info("结束把命令结果放入缓中");
      }catch(Exception e){
         log.error(e.getMessage(), e);
      }