SSO登录逻辑再修改

liurunyu

4 天以前 f44135f835bf62319f9bb8a32e4592a707e5e8c1

 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeInfo.java

@@ -3,6 +3,7 @@
import lombok.Data;

import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

/**
 * @Author: liurunyu
@@ -17,4 +18,29 @@
    public UpgradeState ugOverallState;
    //升级任务RTU状态列表
    public List<UpgradeRtu> ugRtuStateList;
    public String toString(){
        return this.toString(null) ;
    }

    public String toString(String logRtuAddr){
        StringBuilder sb = new StringBuilder() ;
        sb.append("RTU远程升级状态：") ;
        sb.append("  \n任务id：" + ugTaskId) ;
        sb.append("  \n" + ugOverallState.toString()) ;
        if(ugRtuStateList != null && ugRtuStateList.size() > 0){
            sb.append("  \n升级的控制器总数：" + ugRtuStateList.size()) ;
            sb.append("  \n其中一个控制器升级情况：") ;
            AtomicBoolean exist = new AtomicBoolean(false);
            if(logRtuAddr != null){
                ugRtuStateList.stream().filter(ur -> ur.getRtuAddr().equals(logRtuAddr)).forEach(ur -> {
                    sb.append("  \n" + ur.toString()) ;
                    exist.set(true);
                }) ;
            }
            if(!exist.get()){
                sb.append("  \n" + ugRtuStateList.get(0).toString()) ;
            }
        }
        return sb.toString() ;
    }
}