From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 99 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 89 insertions(+), 10 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 6541c45..3f7888a 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,24 +1,28 @@
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;
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
+import com.dy.pipIrrGlobal.voBa.VoRoleSimple;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
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.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;
@@ -41,6 +45,21 @@
public class WorkOrderCtrl {
private final WorkOrderSv workOrderSv;
+ @Value("${mqtt.broker}")
+ private String broker;
+
+ @Value("${mqtt.username}")
+ private String username;
+
+ @Value("${mqtt.password}")
+ private String password;
+
+ @Value("${mqtt.topic}")
+ private String topic;
+
+ @Value("${mqtt.qos}")
+ private Integer qos;
+
/**
* 鍒涘缓宸ュ崟
* @param po
@@ -50,7 +69,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());
}
@@ -69,11 +88,36 @@
return BaseResponseUtils.buildErrorMsg("鑾峰彇宸ュ崟澶辫触");
}
- //if(!sendWorkOrder(voWorkOrder, workOrderId)) {
- // return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
- //}
+ if(!sendWorkOrder(voWorkOrder, workOrderId)) {
+ return BaseResponseUtils.buildErrorMsg("宸ュ崟鎺ㄩ�佸け璐�");
+ }
return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 閫氳繃mosquitto鍙戦�佸贰妫�鍛業D鍙婂伐鍗旾D
+ * @param voWorkOrder 宸ュ崟瀵硅薄
+ * @param workOrderId 宸ュ崟ID
+ * @return
+ */
+ public Boolean sendWorkOrder(VoWorkOrder voWorkOrder, Long workOrderId) {
+ //String message = JSON.toJSONString(voWorkOrder);
+
+ 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;
}
/**
@@ -126,7 +170,11 @@
@SsoAop()
public BaseResponse<VoWorkOrder> getOneWorkOrder(@RequestParam("workOrderId") Long workOrderId) {
try {
- return BaseResponseUtils.buildSuccess(workOrderSv.getWorkOrderById(workOrderId));
+ VoWorkOrder workOrder = workOrderSv.getWorkOrderById(workOrderId);
+ if(workOrder == null) {
+ return BaseResponseUtils.buildNonExist();
+ }
+ return BaseResponseUtils.buildSuccess(workOrder);
} catch (Exception e) {
log.error("鑾峰彇宸ュ崟璇︽儏寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
@@ -193,8 +241,8 @@
@SsoAop()
public BaseResponse<VoProcessingResult> getProResult(@RequestParam("proResultId") Long proResultId) {
try {
- String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
- System.out.println(aa);
+ //String aa = JSON.toJSONString(workOrderSv.getProResultById(proResultId));
+ //System.out.println(aa);
return BaseResponseUtils.buildSuccess(workOrderSv.getProResultById(proResultId));
} catch (Exception e) {
log.error("鑾峰彇澶勭悊缁撴灉璇︽儏寮傚父", e);
@@ -223,4 +271,35 @@
return BaseResponseUtils.buildSuccess(true) ;
}
+
+ /**
+ * 鑾峰彇浠诲姟绫诲瀷鍒楄〃
+ * @return
+ */
+ @GetMapping(path = "/getTaskTypes")
+ @SsoAop()
+ public BaseResponse<List<VoTaskType>> getTaskTypes() {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getTaskTypes());
+ } catch (Exception e) {
+ log.error("鑾峰彇浠诲姟绫诲瀷寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇宸℃鍛樺垪琛�
+ * @param inspector
+ * @return
+ */
+ @GetMapping(path = "/getInspectors")
+ @SsoAop()
+ public BaseResponse<List<VoRoleSimple>> getInspectors(@RequestParam("inspector") String inspector) {
+ try {
+ return BaseResponseUtils.buildSuccess(workOrderSv.getInspectors(inspector));
+ } catch (Exception e) {
+ log.error("鑾峰彇浠诲姟绫诲瀷寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0