From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
index b5233df..f8a8311 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
@@ -34,10 +34,25 @@
@Override
@Transactional(readOnly = true)
- public List<EquipmentMachingDto> getEquipmentSequencenumber(String drivetype, String equipmentid, Date startTime, Date endTime) {
- String tableName = drivetype + "_" + equipmentid;
+ public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
return convertData(list);
+ }
+
+ @Override
+ public Boolean isTableExist(String tableName) {
+ Integer count = equipmentWorkLineMapper.isTableExist(tableName);
+ return count != 0;
+ }
+
+ @Override
+ public List<Map<String, Object>> findRunningData(String tableName, Date startTime, Date endTime) {
+ return equipmentWorkLineMapper.findRunningData(tableName, startTime, endTime);
+ }
+
+ @Override
+ public List<EquipmentMachingDto> getEquipProgramNum(String drivetype, String equipmentid, Date startTime, Date endTime) {
+ return equipmentWorkLineMapper.getEquipProgramNum(drivetype + "_" + equipmentid, startTime, endTime);
}
private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
@@ -59,7 +74,7 @@
ei.setFeedrate(map.get("feedrate") == null ? null : map.get("feedrate").toString());
ei.setFeedbeilv(map.get("feedbeilv") == null ? null : map.get("feedbeilv").toString());
ei.setProgramnumber(map.get("Programnumber") == null ? null : map.get("Programnumber").toString());
- ei.setSequencenumber(map.get("SEQUENCENUMBER") == null ? null : map.get("SEQUENCENUMBER").toString());
+ ei.setSequencenumber(map.get("Sequencenumber") == null ? null : map.get("Sequencenumber").toString());
ei.setExecutingcode(map.get("executingcode") == null ? null : map.get("executingcode").toString());
ei.setProductName(map.get("ProductName") == null ? null : map.get("ProductName").toString());
dto.add(ei);
--
Gitblit v1.9.3