pipIrr-SV.git - Gitblit

			@@ -1,16 +1,20 @@
			package com.dy.rtuMw.web.com;

			import com.dy.common.softUpgrade.state.UpgradeTaskVo;
			import com.dy.common.webUtil.ResultCodeMsg;
			import com.dy.rtuMw.resource.ResourceUnit;
			import com.dy.rtuMw.server.ServerProperties;
			import com.dy.rtuMw.server.forTcp.TcpSessionCache;
			import com.dy.rtuMw.server.local.CommandInnerDeaLer;
			import com.dy.rtuMw.server.local.ReturnCommand;
			import com.dy.rtuMw.server.tasks.RtuDownTask;
			import com.dy.rtuMw.server.msCenter.MsCenterUnit;
			import com.dy.rtuMw.server.tasks.WebDownComTask;
			import com.dy.common.mw.core.CoreUnit;
			import com.dy.common.mw.protocol.Command;
			import com.dy.common.mw.protocol.CommandType;
			import com.dy.common.webUtil.BaseResponse;
			import com.dy.common.webUtil.BaseResponseUtils;
			import com.dy.rtuMw.server.upgrade.UpgradeUnit;
			import jakarta.servlet.ServletOutputStream;
			import jakarta.servlet.http.HttpServletRequest;
			import jakarta.servlet.http.HttpServletResponse;
			@@ -141,6 +145,62 @@
			return BaseResponseUtils.buildSuccess(list);
			}
			}


			/**
			* 注册消息接收者
			* @param msReceiverWebUrl 消息接收者web http post url
			* @return
			*/
			@GetMapping("/registerMsReceiverWebUrl")
			public BaseResponse<List<String>> registerMsReceiverWebUrl(String msReceiverWebUrl){
			try{
			MsCenterUnit.getInstance().registerMsReceiver(msReceiverWebUrl);
			}catch (Exception e){
			log.error("注册消息接收者时发生异常", e);
			return BaseResponseUtils.buildError("注册消息接收者时发生异常" + (e.getMessage() == null?"":("：" + e.getMessage())));
			}
			return BaseResponseUtils.buildSuccess(true);
			}

			/**
			* 接收web系统发来升级任务
			* @param vo
			* @return
			*/
			@PostMapping(path = "upgradeRtu", consumes = MediaType.APPLICATION_JSON_VALUE)
			public BaseResponse<Boolean> upgradeRtu(@RequestBody UpgradeTaskVo vo) {
			log.info("收到RTU升级任务：\n" + vo.toString()) ;
			try{
			UpgradeUnit.getInstance().setUpgradeTask(vo);
			}catch (Exception e){
			log.error("设置RTU升级任务时发生异常", e);
			return BaseResponseUtils.buildError("设置RTU升级任务时发生异常" + (e.getMessage() == null?"":("：" + e.getMessage())));
			}
			return BaseResponseUtils.buildSuccess(true);
			}

			/**
			* 接收web系统发来强制结束升级任务
			* @return
			*/
			@GetMapping(path = "ugForceOver")
			public BaseResponse<String> ugForceOver() {
			log.info("收到停止RTU升级任务命令") ;
			try{
			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);
			}
			}catch (Exception e){
			log.error("停止RTU升级任务时发生异常", e);
			return BaseResponseUtils.buildError("停止RTU升级任务时发生异常" + (e.getMessage() == null?"":("：" + e.getMessage())));
			}
			}

			/**
			* 接收web系统发来的命令
			* @param com
			@@ -168,24 +228,10 @@
			//通信中间件内部命令，例如查询监控中间件时钟，查询RTU在线情况等
			try{
			Command reCom = new CommandInnerDeaLer().deal(com) ;
			/*
			boolean error = false ;
			if(reCom.param != null && reCom.param != null){
			CommandBackParam cbp = (CommandBackParam)reCom.param ;
			if(cbp.getSuccess() != null && !cbp.getSuccess().booleanValue()){
			error = true ;
			return BaseResponseUtils.buildError(ReturnCommand.errored(cbp.getMessage(), com.getId(), null));
			}
			}
			if(!error){
			return BaseResponseUtils.buildError(ReturnCommand.errored(cbp.getMessage(), com.getId(), null));
			}
			*/
			return BaseResponseUtils.buildSuccess(reCom);
			}catch(Exception e){
			return BaseResponseUtils.buildError(ReturnCommand.errored("处理内部命令出错" + (e.getMessage() == null?"":("，" + e.getMessage())), com.getId(), com.getCode()) );
			}

			}else if(commandType.equals(CommandType.outerCommand)){
			//发向RTU的外部命令，异步处理，web端jroups成员同步得到命令处理结果，但构造命令及下发命令和命令结果接收要异步得到
			try{
			@@ -234,7 +280,7 @@
			}

			//生成异步任务
			RtuDownTask task = new RtuDownTask() ;
			WebDownComTask task = new WebDownComTask() ;
			task.data = command ;
			try{
			log.info("构造下发远程命令" + command.getCode() + "的核心任务，并放入任务队列中");