From 53234d6959c5fdeb4dec544ad32158b65a6d685e Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 27 五月 2024 14:45:28 +0800
Subject: [PATCH] 机台监控界面效率能消耗对比的标准值，取近十次平均
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 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 aa8d0f9..fa4ac48 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
@@ -57,8 +57,6 @@
@Autowired
private IDryProdRecordService prodRecordService;
- @Autowired
- private CommonAPI commonAPI;
private String token;
@@ -100,6 +98,7 @@
// 2 鏇存柊宸ュ崟瀹炴椂鏁版嵁
// 2.1 灏嗗伐鍗曚腑鐨勬暟鎹浛鎹负鏈�鏂版暟鎹�
realTimeDataVo.setOrderId(orderVo.getId());
+
orderVo.setInitial(realTimeDataVo.getMoisture1());
orderVo.setDryTime(realTimeDataVo.getTime3());
orderVo.setDelay(realTimeDataVo.getDelay());
@@ -186,7 +185,7 @@
orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());
// 2.3 鏇存柊鍒皉edis缂撳瓨
redisUtil.hset(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(),
- realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 600000);
+ realTimeDataVo.getTenantid()+"_"+realTimeDataVo.getMachineid(),orderVo, 60*60);
return Result.ok();
}
@@ -219,6 +218,7 @@
}
// 3 鏁版嵁搴撴病鏈夊垯鏂板涓�鏉℃暟鎹�
} else {
+
orderVo = saveNewOrder(realTimeDataVo);
}
return orderVo;
@@ -288,7 +288,7 @@
*/
private void saveOrderTrendVo(DryOrderTrendVo trendVo, DryOrderVo orderVo) {
//鍒ゆ柇 瀹炴椂鍚按鐜� 鎴� 瀹炴椂閲嶉噺鏈夋病鏈夊彉鍖栵紝鏈夊彉鍖栧垯鏇存柊
- if(orderVo.getTrendVo() == null
+ if(orderVo.getTrendVo() == null && trendVo != null && trendVo.getWeight() > 0
|| trendVo.getWeight() < orderVo.getTrendVo().getWeight()
) {
DryOrder byId = dryOrderService.getById(orderVo.getId());
@@ -315,43 +315,55 @@
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");
-
+ queryWrapper.orderByAsc(DryEquipment::getCode);
+ // 鏌ヨ鎵�鏈夋満鍙�
List<DryEquipment> dryEquipments = equipmentService.list(queryWrapper);
+ // 鏈哄彴鍒楄〃锛岀敤浜庢晥鐜囧姣�
List<String> list = new ArrayList<>();
-
+ // 鏁堢巼鍒楄〃锛岀敤浜庢晥鐜囧姣�
List<Double> dList = new ArrayList<>();
+ // 鏌ヨ褰撳墠鏈哄彴宸ュ崟
DryOrderVo orderVo = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + realTimeDataVo.getMachineid());
- try {
+ try {
+ // 濡傛灉鏈夊彲鐢ㄦ満鍙�
+ if (dryEquipments != null && dryEquipments.size() > 0) {
+ // 鏌ヨ鍏跺畠鏈哄彴宸ュ崟
+ dryEquipments.stream().forEach(item -> {
+ // 鑾峰彇宸ュ崟
+ 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) {
+ // 璁＄畻骞茬嚗鏁堢巼锛岀敤浜庡姣�
+ DryOrderTrendVo dryOrderTrendVo = order.getDetailList().get(order.getDetailList().size() - 1);
+ double v = order.getOriginWeight() - dryOrderTrendVo.getWeight();
-
- if (dryEquipments != null && dryEquipments.size() > 0) {
- dryEquipments.stream().forEach(item -> {
- DryOrderVo order = (DryOrderVo) redisUtil.hget(CacheConstants.RedisKeyEnum.WORK_ORDER.getCode(), realTimeDataVo.getTenantid() + "_" + item.getCode());
- if (order != null) {
- double v = order.getOriginWeight() - order.getYield();
- list.add(item.getName().substring(0, item.getName().indexOf('#')+1));
- if (v > 0 && order.getDryTime()>0) {
- DecimalFormat df = new DecimalFormat("#.00");
- dList.add(Double.valueOf(df.format(v / order.getDryTime() * 60)));
- } else {
- dList.add(50d);
- }
-
+ if (v > 0 && dryOrderTrendVo.getTotalTime()>0) {
+ DecimalFormat df = new DecimalFormat("#.00");
+ dList.add(Double.valueOf(df.format(v / dryOrderTrendVo.getTotalTime() * 60)));
+ } else {
+ dList.add(50d);
}
- });
- }
- if (orderVo != null) {
- orderVo.setCompEqpNum(list);
- orderVo.setCompEqpEffic(dList);
- }
- }catch (Exception e) {
- e.printStackTrace();
+
+ }
+ // 濡傛灉娌℃湁鐢熶骇锛屾晥鐜囩疆0
+ dList.add(0d);
+ });
}
+
+ if (orderVo != null) {
+ // 灏嗘晥鐜囧姣旀暟鎹斁鍏ュ綋鍓嶆満鍙板疄鏃舵暟鎹腑杩斿洖
+ orderVo.setCompEqpNum(list);
+ orderVo.setCompEqpEffic(dList);
+ // 鏌ヨ杩戝崄娆℃晥鐜囧拰鑳借兘鑰楀钩鍧�
+ dryOrderService.queryRecentOrderAvg(orderVo);
+ }
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
return Result.ok(orderVo);
}
--
Gitblit v1.9.3