From 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 六月 2025 11:47:09 +0800
Subject: [PATCH] 1、通信中间件重构MQTT相关下行命令的逻辑； 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类；
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/inject/CdCtrl.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/inject/CdCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/inject/CdCtrl.java
index 74ac28b..1843239 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/inject/CdCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/inject/CdCtrl.java
@@ -12,6 +12,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pipIrrRemote.common.dto.Dto4MqttBase;
import com.dy.pipIrrRemote.monitor.common.Com4MqttCtrl;
+import com.dy.pipIrrRemote.monitor.mqttSd1.stir.CdDto;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -32,9 +33,9 @@
*/
@Slf4j
-@Tag(name = "杩滅▼鍛戒护", description = "娓呴櫎鏁呴殰")
+@Tag(name = "杩滅▼鍛戒护", description = "娉ㄨ偉鍚仠")
@RestController("mqttSd1InjectCtrl")
-@RequestMapping(path = "mqttSd1/injectCtrl")
+@RequestMapping(path = "mqttSd1/inject")
@RequiredArgsConstructor
@Scope("prototype") //鍥犱负鏈夊璞＄被灞炴�э紝鎵�浠ラ噰鐢ㄥ師鍨嬫ā寮忥紝姣忔璇锋眰鏂板缓涓�涓疄渚嬪璞�
public class CdCtrl extends Com4MqttCtrl {
@@ -48,15 +49,38 @@
@Autowired
private CdSv sv ;
+
/**
* 鍚戣澶囷紙Mqtt涓棿浠�->FBox锛夊彂閫佸懡浠�
* @param dto 鍓嶇鍙戞潵鐨勫�煎璞�
* @param bindingResult 瀵筪to楠岃瘉鐨勭粨鏋�
* @return 杩斿洖鍓嶇
*/
- @PostMapping(path = "send", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "start", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Object> send(@RequestBody @Valid CdDto dto, BindingResult bindingResult) {
+ public BaseResponse<Object> start(@RequestBody @Valid com.dy.pipIrrRemote.monitor.mqttSd1.stir.CdDto dto, BindingResult bindingResult) {
+ return this.send(dto, bindingResult, true) ;
+ }
+
+ /**
+ * 鍚戣澶囷紙Mqtt涓棿浠�->FBox锛夊彂閫佸懡浠�
+ * @param dto 鍓嶇鍙戞潵鐨勫�煎璞�
+ * @param bindingResult 瀵筪to楠岃瘉鐨勭粨鏋�
+ * @return 杩斿洖鍓嶇
+ */
+ @PostMapping(path = "stop", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop()
+ public BaseResponse<Object> stop(@RequestBody @Valid com.dy.pipIrrRemote.monitor.mqttSd1.stir.CdDto dto, BindingResult bindingResult) {
+ return this.send(dto, bindingResult, false) ;
+ }
+
+ /**
+ * 鍚戣澶囷紙Mqtt涓棿浠�->FBox锛夊彂閫佸懡浠�
+ * @param dto 鍓嶇鍙戞潵鐨勫�煎璞�
+ * @param bindingResult 瀵筪to楠岃瘉鐨勭粨鏋�
+ * @return 杩斿洖鍓嶇
+ */
+ private BaseResponse<Object> send(CdDto dto, BindingResult bindingResult, boolean startTrueStopFalse) {
BaseResponse<Object> res ;
//鍙戦�佸懡浠ゅ墠-1锛氶獙璇�
res = super.pre1(sv, ComCode, dto, bindingResult);
@@ -65,14 +89,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锛氬噯澶嘑eature
super.pre4();
try {
- //鍒涘缓澶栭儴鍛戒护锛堝彂缁欐帶鍒跺櫒锛�
- Command com = sv.createOuterCommand(ctrlPo.fboxId, "" + comId, ComCode);
+ //鍒涘缓澶栭儴鍛戒护锛堝彂缁橫QTT->FBox锛�
+ Command com = sv.createMQTTCommand(ctrlPo.fboxId, "" + comId, Protocol, ProtocolVersion, ComCode);
com.rtuResultSendWebUrl = rtuResultSendWebUrl;
com.param = comParam ;
//鍙戦�佸懡浠�
--
Gitblit v1.8.0