From 3e82bb3f97e95c90099070787da4455e64b95b3f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 28 十一月 2024 14:39:19 +0800
Subject: [PATCH] 1、监视升级过程RTU集合以地址排序； 2、实现升级结果查询与导出。
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 deletions(-)
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 38b9743..a746c19 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
@@ -1,12 +1,15 @@
package com.dy.pipIrrApp.workOrder;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteProResult;
import com.dy.pipIrrApp.workOrder.dto.DtoDeleteWorkOrder;
+import com.dy.pipIrrApp.workOrder.mqtt.MqttClientConnectorPool;
+import com.dy.pipIrrApp.workOrder.mqtt.MqttMsgSender;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.pojoOp.OpeApproveResult;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
@@ -16,21 +19,13 @@
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.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.client.producer.SendResult;
-import org.apache.rocketmq.common.message.Message;
-import org.apache.rocketmq.remoting.exception.RemotingException;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.eclipse.paho.client.mqttv3.MqttClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
@@ -48,17 +43,20 @@
public class WorkOrderCtrl {
private final WorkOrderSv workOrderSv;
- @Autowired
- private RocketMQTemplate rocketMQTemplate;
+ @Value("${mqtt.broker}")
+ private String broker;
- @Value("${rocketmq.name-server}")
- protected String nameServer;
+ @Value("${mqtt.username}")
+ private String username;
- @Value("${rocketmq.producer.group}")
- protected String producerGroup;
+ @Value("${mqtt.password}")
+ private String password;
- @Value("${rocketmq.topic}")
- protected String topic;
+ @Value("${mqtt.topic}")
+ private String topic;
+
+ @Value("${mqtt.qos}")
+ private Integer qos;
/**
* 鍒涘缓宸ュ崟
@@ -69,7 +67,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());
}
@@ -96,30 +94,27 @@
}
/**
- * 閫氳繃RocketMQ鎺ㄩ�佸伐鍗曚富閿�
- * @param voWorkOrder 宸ュ崟瑙嗗浘瀵硅薄
+ * 閫氳繃mosquitto鍙戦�佸贰妫�鍛業D鍙婂伐鍗旾D
+ * @param voWorkOrder 宸ュ崟瀵硅薄
* @param workOrderId 宸ュ崟ID
* @return
- * @throws MQClientException
- * @throws MQBrokerException
- * @throws RemotingException
- * @throws InterruptedException
*/
- private Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) throws MQClientException, MQBrokerException, RemotingException, InterruptedException {
- String tag = voWorkOrder.getInspector();
- String key = voWorkOrder.getInspectorId().toString();
+ public Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) {
//String message = JSON.toJSONString(voWorkOrder);
- String message = workOrderId.toString();
- DefaultMQProducer producer = new DefaultMQProducer(producerGroup);
- producer.setNamesrvAddr(nameServer);
- producer.start();
- Message msg = new Message(topic, tag, key, message.getBytes(StandardCharsets.UTF_8));
- SendResult approveSendResult = producer.send(msg);
- if(!approveSendResult.getSendStatus().toString().equals("SEND_OK")) {
+ JSONObject message_job = new JSONObject();
+ message_job.put("inspectorId", voWorkOrder.getInspectorId().toString());
+ message_job.put("workOrderId", workOrderId.toString());
+ String message = JSON.toJSONString(message_job);
+
+ MqttClient mqttClient = MqttClientConnectorPool.connectMQTT(broker, username, password);
+ MqttMsgSender sender = new MqttMsgSender();
+ if (null != mqttClient){
+ sender.sendMessage(mqttClient, topic, message, qos);
+ } else {
+ log.info("MqttClient涓虹┖锛屾棤娉曞彂閫侊紒");
return false;
}
-
return true;
}
--
Gitblit v1.8.0