From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 ef07a3a..5d910c2 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
@@ -35,8 +35,12 @@
@Override
@Transactional(readOnly = true)
public List<EquipmentMachingDto> getEquipmentSequencenumber(String tableName, Date startTime, Date endTime) {
- List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
- return convertData(list);
+ try {
+ List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
+ return convertData(list);
+ } catch (Exception e) {
+ return null;
+ }
}
@Override
@@ -45,6 +49,34 @@
return count != 0;
}
+ @Override
+ public List<String> 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);
+ }
+
+ @Override
+ public MdcEquipmentDto findProductCountStartTime(String saveTableName, String productCount, Date startTime, Date endTime) {
+ try {
+ return equipmentWorkLineMapper.findProductCountStartTime(saveTableName, productCount, startTime, endTime);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+ @Override
+ public MdcEquipmentDto findProductCountEndTime(String saveTableName, String productCount, Date startTime, Date endTime) {
+ try {
+ return equipmentWorkLineMapper.findProductCountEndTime(saveTableName, productCount, startTime, endTime);
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
List<EquipmentMachingDto> dto = new ArrayList<>();
--
Gitblit v1.9.3