From f027c87f28485988b3d25f41b0cdf6e5bd42cd42 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 30 七月 2025 16:50:37 +0800
Subject: [PATCH] redis工单保存故障数据
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index abf5f3d..7812901 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -216,8 +216,12 @@
orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
orderVo.setEqp_status(realTimeDataVo.getEqp_status());
// orderVo.setEqp_state(realTimeDataVo.getEqp_state());
- orderVo.setWarning(realTimeDataVo.getEqp_warning());
- orderVo.setFault(realTimeDataVo.getEqp_fault());
+ if(realTimeDataParentVo.getFault()!=null && StringUtils.isNotEmpty(realTimeDataParentVo.getFault().getWarning())){
+ orderVo.setWarning(realTimeDataParentVo.getFault().getWarning());
+ }
+ if(realTimeDataParentVo.getFault()!=null && StringUtils.isNotEmpty(realTimeDataParentVo.getFault().getError())){
+ orderVo.setFault(realTimeDataParentVo.getFault().getError());
+ }
orderVo.setLevel(realTimeDataVo.getLevel());
DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
// 2.2 淇濆瓨宸ュ崟鍚按鐜囧彉鍖� 鎴� 閲嶉噺鍙樺寲
@@ -548,7 +552,7 @@
// 鑾峰彇宸ュ崟
DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
list.add(item.getName().substring(0, item.getName().indexOf('#') + 1));
- if (order != null) {
+ if (order != null && order.getDetailList()!=null && !order.getDetailList().isEmpty()) {
// 璁＄畻骞茬嚗鏁堢巼锛岀敤浜庡姣�
DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1);
double v = order.getOriginWeight() - dryOrderTrendVo.getWeight();
--
Gitblit v1.9.3