From 0aa00cd0593e363a88c152ce07734dd738513603 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期六, 12 十月 2024 10:56:38 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 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 28fc4e6..1e18d1b 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();
@@ -37,7 +46,9 @@
mdcProductDayscheduleDtos = mdcSubLargeScreenMapper.todayProductionProgress(productionId, today);
if (mdcProductDayscheduleDtos != null && !mdcProductDayscheduleDtos.isEmpty()) {
for (MdcProductDayscheduleDto mdcProductDayscheduleDto : mdcProductDayscheduleDtos) {
- mdcProductDayscheduleDto.setPassRate(new BigDecimal(mdcProductDayscheduleDto.getQualifiedCount()).divide(new BigDecimal(mdcProductDayscheduleDto.getCompletionCount()), 0, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ if (mdcProductDayscheduleDto.getCompletionCount() != 0) {
+ mdcProductDayscheduleDto.setPassRate(new BigDecimal(mdcProductDayscheduleDto.getQualifiedCount()).divide(new BigDecimal(mdcProductDayscheduleDto.getCompletionCount()), 0, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP));
+ }
}
}
return mdcProductDayscheduleDtos;
@@ -78,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 mdcSubLargeScreenMapper.toolLifeList(productionId);
+ }
}
--
Gitblit v1.9.3