pipIrr-SV.git - Gitblit

			@@ -29,6 +29,7 @@
			import org.springframework.web.client.RestTemplate;

			import java.util.ArrayList;
			import java.util.Base64;
			import java.util.List;

			/**
			@@ -104,8 +105,12 @@
			this.sv.setUpgradeTaskExecuted(id);
			return BaseResponseUtils.buildSuccess(true) ;
			}else{
			log.error("通信中间件执行下发升级任务失败" + (res.getMsg() == null? "" : ("，" + res.getMsg()))) ;
			return BaseResponseUtils.buildFail("通信中间件执行失败" + (res.getMsg() == null? "" : ("，" + res.getMsg()))) ;
			String msg = res.getContent()==null?null:(String)res.getContent() ;
			if(msg == null){
			msg = res.getMsg() ;
			}
			log.error("通信中间件执行下发升级任务失败" + msg) ;
			return BaseResponseUtils.buildFail("通信中间件执行失败" + msg) ;
			}
			}else{
			log.error("通信中间件返回结果为null") ;
			@@ -118,7 +123,8 @@
			vo.softFileName = ppo.hexFileName ;
			vo.softStoreAddr = ppo.storeRamAddr ;
			vo.softStartAddr = ppo.startRamAddr ;
			vo.softFileData = ppo.programBytes ;
			vo.softFileData64 = Base64.getEncoder().encodeToString(ppo.programBytes) ;
			//vo.softFileData = ppo.programBytes ;
			vo.softBytesCalculate = ppo.programCalculateBytes ;
			vo.softByteSrc16 = ppo.programCrc16 ;
			}