From 7c0f82055e064831c9971aad068106241705030e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 三月 2025 11:20:07 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
index 89c26e7..175df00 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -4,13 +4,11 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
+import org.jeecg.modules.mdc.service.IEquipmentAlarmService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
import org.jeecg.modules.mdc.util.DateUtils;
-import org.jeecg.modules.screen.dto.EquipmentStatusOverview;
-import org.jeecg.modules.screen.dto.UtilizationDayDto;
-import org.jeecg.modules.screen.dto.UtilizationRate;
-import org.jeecg.modules.screen.dto.UtilizationRateDto;
+import org.jeecg.modules.screen.dto.*;
import org.jeecg.modules.screen.service.MdcLargeScreenService;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -42,6 +40,9 @@
@Resource
private IMdcEquipmentStatisticalInfoService mdcEquipmentStatisticalInfoService;
+
+ @Resource
+ private IEquipmentAlarmService equipmentAlarmService;
/**
* 璁惧鐘舵�佹儏鍐�
@@ -165,7 +166,7 @@
return utilizationMonth;
})
.collect(Collectors.toList());
- utilizationRateDto.setUtilizationMonthList(utilizationRates);
+ utilizationRateDto.setUtilizationRateList(utilizationRates);
utilizationMonthDtoList.add(utilizationRateDto);
}
//璁＄畻鎬诲巶鐨勫埄鐢ㄧ巼
@@ -180,7 +181,7 @@
return utilizationMonth;
})
.collect(Collectors.toList());
- utilizationRateDto.setUtilizationMonthList(utilizationRates);
+ utilizationRateDto.setUtilizationRateList(utilizationRates);
utilizationMonthDtoList.add(utilizationRateDto);
result.put("dataList", utilizationMonthDtoList);
return result;
@@ -220,6 +221,17 @@
}
/**
+ * 璁惧鎶ヨ淇℃伅
+ *
+ * @param productionId
+ * @return
+ */
+ @Override
+ public List<AlarmInfoDto> getAlarmInfo(String productionId) {
+ return equipmentAlarmService.getAlarmInfo(productionId);
+ }
+
+ /**
* 鍒涘缓瀛愮敓浜х殑鏈堝害鍒╃敤鐜� DTO
*/
private UtilizationRateDto createUtilizationMonthDto(MdcProduction mdcProduction, List<String[]> dateLists) {
@@ -228,7 +240,7 @@
utilizationMonthDto.setProductionName(mdcProduction.getProductionName());
List<UtilizationRate> utilizationMonthList = calculateUtilizationRates(mdcProduction.getId(), dateLists);
- utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);
+ utilizationMonthDto.setUtilizationRateList(utilizationMonthList);
return utilizationMonthDto;
}
@@ -241,7 +253,7 @@
utilizationMonthDto.setProductionName("鎬诲巶");
List<UtilizationRate> utilizationMonthList = calculateUtilizationRatesTotal(productionId, dateLists);
- utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);
+ utilizationMonthDto.setUtilizationRateList(utilizationMonthList);
return utilizationMonthDto;
}
--
Gitblit v1.9.3