Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
| | |
| | | String mes = UpgradeUnit.getInstance().forceOverUpgradeTask(); |
| | | if(mes == null){ |
| | | mes = "停止升级任务成功" ; |
| | | return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.SUCCESS_CODE, mes, mes); |
| | | }else{ |
| | | return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.FAIL_CODE, mes, mes); |
| | | } |
| | | return BaseResponseUtils.buildResult(ResultCodeMsg.RsCode.SUCCESS_CODE, mes, mes); |
| | | }catch (Exception e){ |
| | | log.error("停止RTU升级任务时发生异常", e); |
| | | return BaseResponseUtils.buildError("停止RTU升级任务时发生异常" + (e.getMessage() == null?"":(":" + e.getMessage()))); |
| | |
| | | BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ; |
| | | if(res != null){ |
| | | if(res.isSuccess()){ |
| | | RtuUpgradeStateReceiverCtrl.afterMwForceOverCurUgTask(); |
| | | String msg = res.getContent()==null?null:(String)res.getContent() ; |
| | | if(msg == null){ |
| | | msg = res.getMsg() ; |
| | |
| | | private RtuUpgradeSv sv ; |
| | | |
| | | /** |
| | | * 强制结束升级任务通信中间件成功执行后 |
| | | */ |
| | | public static void afterMwForceOverCurUgTask(){ |
| | | cache = null ; |
| | | } |
| | | |
| | | /** |
| | | * rtu远程升级任务通信中间件执行情况统计回收 |
| | | * @param info 数据 |
| | | * @return 操作结果 |