From 33aea4a7532fcaddbd4262e51900b5102c0aa07c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 09 十月 2024 14:09:52 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 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..a9bc963 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,7 +1,10 @@
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.dto.ToolLifeDto;
import org.jeecg.modules.screen.mapper.MdcSubLargeScreenMapper;
import org.jeecg.modules.screen.service.MdcSubLargeScreenService;
import org.springframework.stereotype.Service;
@@ -10,6 +13,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 +28,9 @@
@Resource
private MdcSubLargeScreenMapper mdcSubLargeScreenMapper;
+
+ @Resource
+ private EquipmentAlarmMapper equipmentAlarmMapper;
private final String today = LocalDate.now().toString();
@@ -80,4 +89,34 @@
}
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);
+ }
+
+ /**
+ * 鍒�鍏峰鍛界鐞�
+ *
+ * @param productionId
+ * @return
+ */
+ @Override
+ public List<ToolLifeDto> toolLifeList(String productionId) {
+ List<ToolLifeDto> toolLifeList = mdcSubLargeScreenMapper.toolLifeList(productionId);
+ if (toolLifeList != null && !toolLifeList.isEmpty()) {
+ for (ToolLifeDto toolLifeDto : toolLifeList) {
+ toolLifeDto.setTId("T" + toolLifeDto.getTId());
+ }
+ }
+ return toolLifeList;
+ }
}
--
Gitblit v1.9.3