From e2a02c09b9d087a49ae5dd9f70856967390237de Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 01 十一月 2024 16:54:23 +0800
Subject: [PATCH] 兼容机台自建配方，实时数据通过mqtt转发
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 c2c7ff0..5c6d723 100644
--- 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
@@ -97,6 +97,10 @@
// 鏍规嵁绉熸埛id鍜屽伐鍗曞彿鏌ヨ鏁版嵁搴撴槸鍚︽湁璁板綍锛屾湁鍒欒繑鍥烇紝娌℃湁鍒欐柊澧炰竴鏉″啀杩斿洖
orderVo = getOrSaveDryOrderVoDB(realTimeDataVo);
}
+ if (orderVo == null) {
+ log.error("宸ュ崟涓嶅瓨鍦紝宸ュ崟鍙凤細"+realTimeDataVo.getWorkorder()+",璁惧锛�" + realTimeDataVo.getMachineid() +",鑽潗锛�" + realTimeDataVo.getName());
+ return Result.error("宸ュ崟涓嶅瓨鍦�");
+ }
// 2 鏇存柊宸ュ崟瀹炴椂鏁版嵁
// 2.1 灏嗗伐鍗曚腑鐨勬暟鎹浛鎹负鏈�鏂版暟鎹�
@@ -126,7 +130,7 @@
orderVo.setState_valve(realTimeDataVo.getState_valve());
orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
orderVo.setEqp_status(realTimeDataVo.getEqp_status());
- orderVo.setEqp_state(realTimeDataVo.getEqp_state());
+// orderVo.setEqp_state(realTimeDataVo.getEqp_state());
orderVo.setWarning(realTimeDataVo.getEqp_warning());
orderVo.setFault(realTimeDataVo.getEqp_fault());
orderVo.setLevel(realTimeDataVo.getLevel());
@@ -232,7 +236,6 @@
* @param realTimeDataVo
* @return
*/
- @NotNull
private DryOrderVo saveNewOrder(RealTimeDataVo realTimeDataVo) {
DryOrderVo orderVo;
// 鏌ヨ鑽潗
@@ -242,6 +245,10 @@
// 鍒涘缓鏂板伐鍗�
orderVo = new DryOrderVo(realTimeDataVo);
+ if (herbFormula == null) {
+ log.error("鏈壘鍒拌嵂鏉愶細"+realTimeDataVo.getIndex() +","+realTimeDataVo.getName() +",鏈哄彴锛�" + realTimeDataVo.getMachineid());
+ return null;
+ }
orderVo.setHerbId(herbFormula.getId());
orderVo.setEquId(equ.getId());
DryOrder dryOrder = BeanUtil.toBean(orderVo, DryOrder.class);
@@ -275,12 +282,14 @@
private DryHerbFormula queryHerbByIndexTenant(RealTimeDataVo realTimeDataVo) {
LambdaQueryWrapper<DryHerbFormula> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DryHerbFormula::getTenantId, realTimeDataVo.getTenantid());
- queryWrapper.eq(DryHerbFormula::getCode, realTimeDataVo.getIndex());
+ queryWrapper.eq(DryHerbFormula::getName, realTimeDataVo.getName());
DryHerbFormula one = dryHerbFormulaService.getOne(queryWrapper);
-// if (one == null) {
-// one = new DryHerb(realTimeDataVo);
-// herbService.save(one);
-// }
+ if (one == null) {
+ one = new DryHerbFormula(realTimeDataVo);
+ DryEquipment dryEquipment = equipmentService.selectByTenantIdEquipmentId(realTimeDataVo.getTenantid() + "", realTimeDataVo.getMachineid());
+ one.setEqpType(dryEquipment.getType());
+ dryHerbFormulaService.save(one);
+ }
return one;
}
@@ -318,7 +327,7 @@
public Result<?> queryMachineRealTImeData(RealTimeDataVo realTimeDataVo) {
TenantContext.setTenant(realTimeDataVo.getTenantid()+"");
- // 鏌ヨ鎵�鏈夋満鍙版煡璇㈢粍瑁�
+ // 鏌ヨ鎵�鏈夋満鍙�,鏌ヨ璇彞缁勮
LambdaQueryWrapper<DryEquipment> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DryEquipment::getTenantId, realTimeDataVo.getTenantid());
queryWrapper.eq(DryEquipment::getEnable, "Y");
@@ -351,9 +360,11 @@
dList.add(50d);
}
+ } else {
+ // 濡傛灉娌℃湁鐢熶骇锛屾晥鐜囩疆0
+ dList.add(0d);
}
- // 濡傛灉娌℃湁鐢熶骇锛屾晥鐜囩疆0
- dList.add(0d);
+
});
}
--
Gitblit v1.9.3