From d8489770304385821159bbd5b62b6f2a9e4c8ba1 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 06 十一月 2025 13:37:33 +0800
Subject: [PATCH] feat(dry): 添加设备启用状态及配方查询优化- 启用设备默认设置为 "Y" - 配方实体增加启用状态字段并支持 Excel 导出 - 查询配方时过滤启用状态为 "true" 的记录 - 优化功率和蒸汽计算逻辑，防止空指针异常 - 新增设备保存后清理 Redis 缓存 - 注释掉未使用的配方自动创建逻辑- 调整配方实体部分字段的 Excel 注解显示名称 -修复 IpUtils 工具类中代理 IP 获取逻辑的注释问题
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 d5eeea1..648ddcc 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
@@ -407,6 +407,8 @@
log.error("鏂板璁惧澶辫触锛氭暟鎹簱淇濆瓨寮傚父锛乪quipment={}", addEqu);
return null;
}
+ redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS_LIST);
+ redisUtil.del(CommonCacheConstant.DRY_CACHE_TENANT_EQUS);
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -520,15 +522,15 @@
queryWrapper.last("LIMIT 1");
DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
- if (one == null) {
- one = new DryHerbFormula(realTimeDataVo);
- DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
- if (dryEquipment != null && dryEquipment.getType() != null) {
- one.setEqpType(dryEquipment.getType());
- }
-
- dryHerbFormulaService.save(one);
- }
+// if (one == null) {
+// one = new DryHerbFormula(realTimeDataVo);
+// DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
+// if (dryEquipment != null && dryEquipment.getType() != null) {
+// one.setEqpType(dryEquipment.getType());
+// }
+//
+// dryHerbFormulaService.save(one);
+// }
return one;
}
@@ -668,9 +670,9 @@
if (order != null) {
orderVo.setEnvHum(order.getEnvHum());
orderVo.setEnvTemp(order.getEnvTemp());
- double watt = order.getWatt() - order.getDetailList().get(0).getWatt();
+ double watt = order.getWatt() - (order.getDetailList().size() > 0 ?order.getDetailList().get(0).getWatt():0);
orderVo.setWatt(orderVo.getWatt() == null ? watt : orderVo.getWatt() + watt);
- double steam = order.getSteam() - order.getDetailList().get(0).getSteam();
+ double steam = order.getSteam() - ( order.getDetailList().size() > 0 ?order.getDetailList().get(0).getSteam():0);
orderVo.setSteam(orderVo.getSteam() == null ? steam : orderVo.getSteam() + steam);
orderVo.setOriginWeight(orderVo.getOriginWeight() == null ? order.getOriginWeight() : orderVo.getOriginWeight() + order.getOriginWeight());
--
Gitblit v1.9.3