From 5564c5450bb12bf9f31b0fc12133b34fab9b91f9 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期五, 27 九月 2024 15:18:36 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java index fa40a9f..04c55cf 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java @@ -1,6 +1,8 @@ package org.jeecg.modules.screen.service.impl; +import org.jeecg.modules.mdc.entity.EquipmentAlarm; import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor; +import org.jeecg.modules.mdc.mapper.EquipmentAlarmMapper; import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto; import org.jeecg.modules.screen.mapper.MdcSubLargeScreenMapper; import org.jeecg.modules.screen.service.MdcSubLargeScreenService; @@ -10,6 +12,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -22,6 +27,9 @@ @Resource private MdcSubLargeScreenMapper mdcSubLargeScreenMapper; + + @Resource + private EquipmentAlarmMapper equipmentAlarmMapper; private final String today = LocalDate.now().toString(); @@ -80,4 +88,17 @@ } return result; } + + /** + * 璁惧鎶ヨ + * + * @param productionId + * @return + */ + @Override + public List<EquipmentAlarm> equipmentAlarm(String productionId) { + String startDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN)); + String endDate = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(1)); + return equipmentAlarmMapper.equipmentAlarm(productionId, startDate, endDate); + } } -- Gitblit v1.9.3