pipIrr-SV.git - Gitblit

			@@ -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);
			}
			}
			}
			@@ -231,6 +241,7 @@
			rtu.currentPackage = 0 ;
			rtu.currentRamAddr = 0x00 ;
			rtu.lastDownDt = "" ;
			rtu.lastDownDtAt = 0L ;
			rtu.reTryTimes = 0 ;
			rtu.isOver = false ;
			}else{
			@@ -238,6 +249,7 @@
			rtu.currentPackage = 1 ;
			rtu.currentRamAddr = 0x00 ;
			rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
			rtu.lastDownDtAt = System.currentTimeMillis() ;
			rtu.reTryTimes = 0 ;
			rtu.isOver = false ;
			}
			@@ -288,6 +300,7 @@
			rtu.currentPackage = 1 ;
			rtu.currentRamAddr = 0x00 ;
			rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
			rtu.lastDownDtAt = System.currentTimeMillis() ;
			rtu.reTryTimes++ ;
			rtu.isOver = false ;
			return ;
			@@ -300,6 +313,7 @@
			rtu.currentPackage += 1 ;
			rtu.currentRamAddr = 0x00 + UpgradeRtu.RAMADDRADD ;
			rtu.lastDownDt = DateTime.yyyy_MM_dd_HH_mm_ss() ;
			rtu.lastDownDtAt = System.currentTimeMillis() ;
			rtu.isOver = false ;
			}