修改升级协议中的bug，程序存储内存在址增量由0x20改为0x200

liurunyu

2024-12-02 847c9a21a5056884a77443c9d5f1f08919db0a79

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeStateReceiverCtrl.java

@@ -42,6 +42,13 @@
    private RtuUpgradeSv sv ;

    /**
     * 强制结束升级任务通信中间件成功执行后
     */
    public static void afterMwForceOverCurUgTask(){
        cache = null ;
    }

    /**
     * rtu远程升级任务通信中间件执行情况统计回收
     * @param info 数据
     * @return 操作结果
@@ -112,12 +119,15 @@
    private void save2Db(String taskId, List<UpgradeRtu> newList, List<UpgradeRtu> oldList){
        List<UpgradeRtu> newOverList = newList.stream().filter(vo -> vo.isOver).collect(Collectors.toList()) ;
        List<UpgradeRtu> oldNoOverList = newList.stream().filter(vo -> !vo.isOver).collect(Collectors.toList()) ;
        boolean oldExist = false ;
        for(UpgradeRtu nvo : newOverList){
            if(nvo != null) {
                if(oldNoOverList.stream().anyMatch(vo -> vo.rtuAddr.equals(nvo.rtuAddr))){
                    //上次没有升级结束，而当前升级结束了
                    this.sv.saveRtuUpgradeState(Long.parseLong(taskId), nvo);
                }
            oldExist = false ;
            if(oldNoOverList.stream().anyMatch(vo -> vo.rtuAddr.equals(nvo.rtuAddr))){
                oldExist = true ;
            }
            if(!oldExist){
                //上次没有升级结束，而当前升级结束了
                this.sv.saveRtuUpgradeState(Long.parseLong(taskId), nvo);
            }
        }
    }