pipIrr-SV.git - Gitblit

			@@ -106,7 +106,7 @@
			vo.callbackWebUrl = ugCallbackUrl_rm ;

			String rqUrl = this.get2MwRequestUrl(this.env, ContextUgTaskSend) ;
			BaseResponse res = sendRequest2Mw(restTemplate, rqUrl, vo) ;
			BaseResponse res = sendPostRequest2Mw(restTemplate, rqUrl, vo) ;
			if(res != null){
			if(res.isSuccess()){
			this.sv.setUpgradeTaskExecuted(id);
			@@ -116,8 +116,8 @@
			if(msg == null){
			msg = res.getMsg() ;
			}
			log.error("通信中间件执行下发升级任务失败" + msg) ;
			return BaseResponseUtils.buildErrorMsg("通信中间件执行失败" + msg) ;
			log.error("通信中间件执行下发升级任务失败，" + msg) ;
			return BaseResponseUtils.buildErrorMsg("通信中间件执行失败，" + msg) ;
			}
			}else{
			log.error("通信中间件返回结果为null") ;
			@@ -125,10 +125,10 @@
			}
			}
			/**
			* 下发强制停止当前rtu远程升级任务
			* 下发强制结束当前rtu远程升级任务
			* @return 操作结果
			*/
			@Operation(summary = "下发强制停止当前rtu远程升级任务", description = "下发强制停止当前rtu远程升级任务")
			@Operation(summary = "下发强制结束当前rtu远程升级任务", description = "下发强制结束当前rtu远程升级任务")
			@ApiResponses(value = {
			@ApiResponse(
			responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
			@@ -137,21 +137,26 @@
			schema = @Schema(implementation = String.class))}
			)
			})
			@GetMapping(path = "/forceStop")
			@GetMapping(path = "/forceOver")
			@SsoAop()
			public BaseResponse<String> forceStop() {
			String rqUrl = this.get2MwRequestUrl(this.env, ContextUgForceStop) ;
			BaseResponse res = sendRequest2Mw(restTemplate, rqUrl, null) ;
			public BaseResponse<String> forceOver() {
			String rqUrl = this.get2MwRequestUrl(this.env, ContextUgForceOver) ;
			BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ;
			if(res != null){
			if(res.isSuccess()){
			return BaseResponseUtils.buildSuccess(true) ;
			RtuUpgradeStateReceiverCtrl.afterMwForceOverCurUgTask();
			String msg = res.getContent()==null?null:(String)res.getContent() ;
			if(msg == null){
			msg = res.getMsg() ;
			}
			return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.SUCCESS_CODE, msg, msg) ;
			}else{
			String msg = res.getContent()==null?null:(String)res.getContent() ;
			if(msg == null){
			msg = res.getMsg() ;
			}
			log.error("通信中间件执行下发强制停止当前rtu远程升级任务失败：" + msg) ;
			return BaseResponseUtils.buildErrorMsg("通信中间件执行强制停止当前rtu远程升级任务失败：" + msg) ;
			log.error("通信中间件执行下发强制结束当前rtu远程升级任务失败：" + msg) ;
			return BaseResponseUtils.buildErrorMsg("通信中间件执行强制结束当前rtu远程升级任务失败：" + msg) ;
			}
			}else{
			log.error("通信中间件返回结果为null") ;
			@@ -159,6 +164,7 @@
			}
			}


			private void valueFromPo(UpgradeTaskVo vo, UgRtuTask tpo, UgRtuProgram ppo){
			vo.id = "" + tpo.id ;
			vo.softFileName = ppo.hexFileName ;