From 487bed3eba27a1f6621c43b7fab5c82468fa2bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:26:44 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/resources/application.yml | 2
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java | 12 +++++-
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttClientConnectorPool.java | 6 --
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java | 4 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml | 16 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 51 ++++++++++++++++++++++++-
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/TestController.java | 22 +++++++++--
8 files changed, 99 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
index 7b1620e..cb8fc4d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoInspect.java
@@ -3,6 +3,8 @@
import com.dy.common.po.BaseEntity;
import com.dy.pipIrrGlobal.pojoOp.OpeTrack;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
@@ -21,6 +23,7 @@
/**
* 宸℃鍛業D
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long inspectorId;
/**
@@ -31,6 +34,7 @@
/**
* 宸℃ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long inspectId;
/**
* 寮�濮嬪贰妫�鏃堕棿
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
index 2cdd204..bb25f7a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -269,6 +269,14 @@
<where>
AND ord.deleted = 0
+ <if test = "dispatcherId != null">
+ AND ord.dispatcher_id = #{dispatcherId}
+ </if>
+
+ <if test = "inspectorId != null">
+ AND ord.inspector_id = #{inspectorId}
+ </if>
+
<if test = "dispatcher != null and dispatcher !=''">
AND us1.name like CONCAT('%',#{dispatcher},'%')
</if>
@@ -317,6 +325,14 @@
<where>
AND ord.deleted = 0
+ <if test = "dispatcherId != null">
+ AND ord.dispatcher_id = #{dispatcherId}
+ </if>
+
+ <if test = "inspectorId != null">
+ AND ord.inspector_id = #{inspectorId}
+ </if>
+
<if test = "dispatcher != null and dispatcher !=''">
AND us1.name like CONCAT('%',#{dispatcher},'%')
</if>
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index d42ffae..e3d5365 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -157,7 +157,7 @@
1 AS auditStatus
FROM se_card_operate ope
INNER JOIN ba_user us ON ope.operator = us.id
- WHERE Date(ope.operate_dt) = #{operateDate}
+ WHERE Date(ope.operate_dt) = #{operateDate} AND ope.operate_valid = 2
GROUP BY ope.operator, Date(ope.operate_dt)
UNION ALL
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 1711a73..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,6 +19,8 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+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;
@@ -37,6 +42,21 @@
@RequiredArgsConstructor
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;
/**
* 鍒涘缓宸ュ崟
@@ -66,14 +86,39 @@
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;
+ }
+
+ /**
* 閫昏緫鍒犻櫎鎸囧畾娲惧崟浜虹殑鎸囧畾鏈垹闄ゅ伐鍗�
* 鍏堝垽鏂寚瀹氭淳鍗曚汉銆佹湭鍒犻櫎鐨勬寚瀹氬伐鍗曟槸鍚﹀瓨鍦�
* @param deleteWorkOrder 鍒犻櫎宸ュ崟浼犺緭绫�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttClientConnectorPool.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttClientConnectorPool.java
index 56545be..91a47e2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttClientConnectorPool.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/mqtt/MqttClientConnectorPool.java
@@ -21,17 +21,13 @@
* 杩炴帴MQTT瀹㈡埛绔�
* @return 鑾峰彇MQTT杩為槦瀵硅薄
*/
- public static MqttClient connectMQTT() {
+ public static MqttClient connectMQTT(String broker, String username, String password) {
if (mqttClient != null){
log.info("宸插瓨鍦紒");
return mqttClient;
}
try {
- // broker鍙婅繛鎺ヤ俊鎭�
- String broker = "tcp://127.0.0.1:1883";
- String username = "mqtt_u";
- String password = "yjy";
String clientId = System.currentTimeMillis() + "";
//鍒涘缓MQTT瀹㈡埛绔紙鎸囧畾broker銆佸鎴风id銆佹秷鎭寔涔呯瓥鐣ワ級
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 0fb914a..0a6a028 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
@@ -2,6 +2,7 @@
import lombok.extern.slf4j.Slf4j;
import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,17 +19,30 @@
@RestController
@RequestMapping(path = "mqtt")
public class TestController {
+
+ @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;
+
@GetMapping("/mqtt/{msg}")
public String testSendMqttMsg(@PathVariable("msg") String msg){
log.info("娑堟伅鍐呭锛歿}.", msg);
- MqttClient mqttClient = MqttClientConnectorPool.connectMQTT();
+ MqttClient mqttClient = MqttClientConnectorPool.connectMQTT(broker, username, password);
MqttMsgSender sender = new MqttMsgSender();
String content = "{" + " \"message\": \"" + msg + "\"," + " \"val\": 100.00" + "}";
-
- String topic = "workOrder";
- int qos = 1;
if (null != mqttClient){
sender.sendMessage(mqttClient, topic, content, qos);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
index 984fa56..138e9f5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
@@ -3,8 +3,6 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.mapstruct.Mapper;
-import org.mapstruct.ReportingPolicy;
/**
* @author ZhuBaoMin
@@ -22,11 +20,21 @@
private String dispatcher;
/**
+ * 娲惧崟浜篒D
+ */
+ private Long dispatcherId;
+
+ /**
* 宸℃鍛樺鍚�
*/
private String inspector;
/**
+ * 宸℃鍛業D
+ */
+ private Long inspectorId;
+
+ /**
* 鏌ヨ寮�濮嬫椂闂�
*/
private String timeStart;
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 806e330..de2c315 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
@@ -17,7 +17,7 @@
#MQTT
mqtt:
broker: tcp://127.0.0.1:1883
- username: mqtt_u
+ username: mqtt_yjy
password: yjy
topic: workOrder
qos: 2
--
Gitblit v1.8.0