From a7b3fa7977cf0c149f4a4a98425572db4257c909 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 22 十一月 2024 11:34:22 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 13 +++++++------
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java | 25 +++++++------------------
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 5 +----
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 1 -
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java | 9 ++++++++-
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 060f8de..3445b17 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -375,7 +375,6 @@
secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
at-all: true
mobile: 18602657034
-
#闃�鎺у櫒鍙傛暟
rtu:
batteryVolt: 17
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
index 6541c45..1711a73 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java
@@ -16,9 +16,6 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.client.exception.MQBrokerException;
-import org.apache.rocketmq.client.exception.MQClientException;
-import org.apache.rocketmq.remoting.exception.RemotingException;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -50,7 +47,7 @@
@PostMapping(path = "addWorkOrder", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) throws MQBrokerException, RemotingException, InterruptedException, MQClientException {
+ public BaseResponse<Boolean> addWorkOrder(@RequestBody @Valid OpeWorkOrder po, BindingResult bindingResult) {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
index 0c7c5c6..3c43616 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttMsgSubscriber.java
@@ -3,7 +3,6 @@
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.springframework.beans.factory.annotation.Value;
/**
* @author ZhuBaoMin
@@ -15,25 +14,15 @@
@Slf4j
public class MqttMsgSubscriber {
- @Value("${spring.mqtt.broker}")
- private String broker;
-
- @Value("${spring.mqtt.username}")
- private String username;
-
- @Value("${spring.mqtt.password}")
- private String password;
-
- @Value("${spring.mqtt.topic}")
- private String topic;
-
- @Value("${spring.mqtt.qos}")
- private Integer qos;
-
- private String clientId = System.currentTimeMillis() + "";
-
public void readSubscribeTopicMessage(){
try {
+ String broker = "tcp://127.0.0.1:1883";
+ String username = "mqtt_u";
+ String password = "yjy";
+ String topic = "workOrder";
+ Integer qos = 2;
+ String clientId = System.currentTimeMillis() + "";
+
MqttClient client = new MqttClient(broker, clientId, new MemoryPersistence());
// 杩炴帴鍙傛暟
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
index b2f3c37..0fb914a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java
@@ -25,7 +25,7 @@
MqttClient mqttClient = MqttClientConnectorPool.connectMQTT();
MqttMsgSender sender = new MqttMsgSender();
- String content = "{" + " \"deviceNo\": \"" + msg + "\"," + " \"val\": 232.5" + "}";
+ String content = "{" + " \"message\": \"" + msg + "\"," + " \"val\": 100.00" + "}";
String topic = "workOrder";
int qos = 1;
@@ -38,4 +38,11 @@
}
return "鎴愬姛锛�";
}
+
+ @GetMapping("/receive")
+ public String receiveMsg() {
+ MqttMsgSubscriber subscriber = new MqttMsgSubscriber();
+ subscriber.readSubscribeTopicMessage();
+ return "success";
+ }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
index 9041c44..806e330 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml
@@ -1,12 +1,6 @@
spring:
profiles:
include: global, database, database-ym, database-sp, database-test
- mqtt:
- broker: tcp://127.0.0.1:1883
- username: mqtt_u
- password: yjy
- topic: workOrder
- qos: 2
#actutor鐨剋eb绔彛
management:
@@ -20,6 +14,13 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.app.idSuffix}
+#MQTT
+mqtt:
+ broker: tcp://127.0.0.1:1883
+ username: mqtt_u
+ password: yjy
+ topic: workOrder
+ qos: 2
logging:
level:
--
Gitblit v1.8.0