pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voUg/VoWatch.java
@@ -29,8 +29,8 @@ public Integer rate ; //进度 public String state; //升级状态 public Integer reTryTimes ; //重试次数 public boolean over ; //是否结束（true：是，false：否） public boolean success ; //是否成功（true：是，false：否） public Boolean over ; //是否结束（true：是，false：否） public Boolean success ; //是否成功（true：是，false：否） public void fromCache(UpgradeRtu ugRtu){ this.rtuAddr = ugRtu.rtuAddr ; @@ -38,7 +38,11 @@ this.state = UpgradeRtu.getStateName(ugRtu.state) ; this.reTryTimes = ugRtu.reTryTimes ; this.over = ugRtu.isOver ; this.success = ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false ; if(ugRtu.isOver){ this.success = (ugRtu.state == UpgradeRtu.STATE_SUCCESS ? true : false) ; }else{ this.success = null ; } } } } pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -77,7 +77,7 @@ pipIrr: global: dev: false #是否开发阶段，true或false dev: true #是否开发阶段，true或false dsName: ym #开发阶段，设置临时的数据库名称 nginx: webPort: 54321 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
@@ -169,10 +169,11 @@ QueryResultVo<VoWatch> rsVo = new QueryResultVo(); VoWatch vo = new VoWatch() ; List<UpgradeRtu> listFiltered = null ; if(RtuUpgradeStateReceiverCtrl.cache != null && RtuUpgradeStateReceiverCtrl.cache.ugTaskId != null){ vo.upgrade = this.sv.selectTaskDetail(RtuUpgradeStateReceiverCtrl.cache.ugTaskId); vo.overall = RtuUpgradeStateReceiverCtrl.cache.ugOverallState ; vo.rtus = new ArrayList<>() ; List<UpgradeRtu> listFiltered = null ; if(RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList != null && RtuUpgradeStateReceiverCtrl.cache.ugRtuStateList.size() > 0) { listFiltered = filterByQuery(qvo) ; if (listFiltered.size() > 0) { @@ -195,6 +196,8 @@ } } } } rsVo.obj = vo ; rsVo.pageSize = qvo.pageSize ; rsVo.pageCurr = qvo.pageCurr ;
