From 62afcbeaa5cc328bff01ae1facb18a6b8c03c5bc Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 24 六月 2025 16:57:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/fault/CdCtrl.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/fault/CdCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/fault/CdCtrl.java
index 1e252ec..8d673ee 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/fault/CdCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/mqttSd1/fault/CdCtrl.java
@@ -1,9 +1,9 @@
package com.dy.pipIrrRemote.monitor.mqttSd1.fault;
import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol4Mqtt.MqttSubMsg;
import com.dy.common.mw.protocol4Mqtt.pSdV1.CodeSdV1;
import com.dy.common.mw.protocol4Mqtt.pSdV1.ProtocolConstantSdV1;
import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.ManureVo;
@@ -25,6 +25,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+
/**
* @Author: liurunyu
* @Date: 2025/6/16 17:35
@@ -34,7 +37,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 +48,6 @@
private static final Short ProtocolVersion = ProtocolConstantSdV1.protocolVer ;
private static final String ComCode = CodeSdV1.cd_Fault ;
-
@Autowired
private CdSv sv ;
/**
@@ -54,7 +56,7 @@
* @param bindingResult 瀵筪to楠岃瘉鐨勭粨鏋�
* @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,15 +67,15 @@
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);
- com.rtuResultSendWebUrl = rtuResultSendWebUrl;
+ //鍒涘缓澶栭儴鍛戒护锛堝彂缁橫QTT->FBox锛�
+ Command com = sv.createMQTTCommand(ctrlPo.fboxId, "" + comId, Protocol, ProtocolVersion, ComCode);
+ com.rtuResultSendWebUrl = mqttResultSendWebUrl;
com.param = comParam ;
//鍙戦�佸懡浠�
res = super.doSend(sv, com);
@@ -99,24 +101,21 @@
}
@Override
- protected String dealComResult(String code, JSONObject resultData, Callback callback){
+ protected String dealComResult(String code, MqttSubMsg subMsg, Callback callback){
String msg;
- if(resultData != null){
- log.info(resultData.toString());
- JSONObject codeData = resultData.getJSONObject("data") ;
- if(codeData == null){
+ if(subMsg != null){
+ if(subMsg.vo4Up != null && Proxy.isProxyClass(subMsg.vo4Up.getClass())){
+ // 鑾峰彇浠ｇ悊鐨� InvocationHandler
+ InvocationHandler handler = Proxy.getInvocationHandler(subMsg.vo4Up);
+ String json = JSON.toJSONString(handler) ;
+ ManureVo vo = JSON.parseObject(json, ManureVo.class);
+ msg = vo.toString() ;
+ }else{
msg = RtuSuccessMsg ;
- }else {
- String json = codeData.toJSONString();
- ManureVo cvo = JSON.parseObject(json, ManureVo.class) ;
- if(cvo != null){
- msg = cvo.toString() ;
- }else{
- msg = RtuSuccessMsg ;
- }
}
}else{
msg = RtuSuccessMsg ;
}
return msg;
- }}
+ }
+}
--
Gitblit v1.8.0