From 44a78bc47ab66d6492bc0579f58f24dc1921b5d5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 03 四月 2025 15:44:30 +0800
Subject: [PATCH] 1、webSocket相关代码进行了注解优化； 2、通信中间件把阀控器上报的阀门状态进行消息推送，前端、小程序可能用到（webSocket推送）。
---
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderCtrl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 a7ae909..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
@@ -170,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());
@@ -237,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);
--
Gitblit v1.8.0