pipIrr-SV.git - Gitblit

			@@ -34,7 +34,7 @@
			@Slf4j
			@Tag(name = "远程命令", description = "清除故障")
			@RestController("mqttSd1FaultCtrl")
			@RequestMapping(path = "mqttSd1/faultCtrl")
			@RequestMapping(path = "mqttSd1/fault")
			@RequiredArgsConstructor
			@Scope("prototype") //因为有对象类属性，所以采用原型模式，每次请求新建一个实例对象
			public class CdCtrl extends Com4MqttCtrl {
			@@ -45,7 +45,6 @@
			private static final Short ProtocolVersion = ProtocolConstantSdV1.protocolVer ;
			private static final String ComCode = CodeSdV1.cd_Fault ;


			@Autowired
			private CdSv sv ;
			/**
			@@ -54,7 +53,7 @@
			* @param bindingResult 对dto验证的结果
			* @return 返回前端
			*/
			@PostMapping(path = "send", consumes = MediaType.APPLICATION_JSON_VALUE)
			@PostMapping(path = "clear", consumes = MediaType.APPLICATION_JSON_VALUE)
			@SsoAop()
			public BaseResponse<Object> send(@RequestBody @Valid CdDto dto, BindingResult bindingResult) {
			BaseResponse<Object> res ;
			@@ -65,14 +64,14 @@
			res = super.pre2(sv, Protocol, ProtocolVersion, ComCode, dto, bindingResult);
			if (res == null) {
			//发送命令前-3：保存命令日志
			CdParam comParam = CdParam.builder().commandCode(ComCode).build();
			CdParam comParam = CdParam.builder().no(ctrlPo.no).startTrueStopFalse(true).build();
			res = super.pre3(sv, dto.manureId, dto.getOperator(), Protocol, ProtocolVersion, ComCode, comParam);
			if (res == null) {
			//发送命令前-4：准备Feature
			super.pre4();
			try {
			//创建外部命令（发给控制器）
			Command com = sv.createOuterCommand(ctrlPo.fboxId, "" + comId, ComCode);
			//创建外部命令（发给MQTT->FBox）
			Command com = sv.createMQTTCommand(ctrlPo.fboxId, "" + comId, Protocol, ProtocolVersion, ComCode);
			com.rtuResultSendWebUrl = rtuResultSendWebUrl;
			com.param = comParam ;
			//发送命令