Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-11-19 478e0a193282daa67bdd70a5e3ed23576eb23cec

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java

@@ -53,13 +53,26 @@
        if(this.task != null && !this.task.taskIsOver){
            throw new Exception("当前存在升级任务，请等待当前任务执行完或强制结束当前任务");
        }else {
            Exception ex = null ;
            try{
                if(this.task != null){
            this.task.forceOver();
                }
            this.task = new UpgradeTask();
            this.task.initOption(this.failTryTimes, this.ugMaxRtuSameTime);
            this.task.setTask(vo);
            }catch (Exception e){
                ex = e ;
            }finally {
                if(ex != null){
                    this.task = null ;
                    throw ex ;
                }else{
            this.start(this);
        }
    }
        }
    }

    /**
     * 结束当前升级任务