From fa1f4cdd548662fc2619c4675588b9797e0dd9fa Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 27 八月 2025 16:16:16 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 28ebc28..a2bfb7c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -69,8 +69,8 @@
String tableName = "";
Boolean isTableExist = false;
if (equip != null) {
- if (StringUtils.isNotBlank(equip.getDrivetype())) {
- tableName = equip.getDrivetype() + "_" + equip.getEquipmentid();
+ if (StringUtils.isNotBlank(equip.getSavetablename())) {
+ tableName = equip.getSavetablename();
isTableExist = equipmentWorkLineService.isTableExist(tableName);
}
}
@@ -519,9 +519,9 @@
//鑾峰彇running杩愯鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> list = this.equipmentRunningTracesLog(equipment.getEquipmentid());
if (list != null && !list.isEmpty()) {
- List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
- this.ergodicTrim(equipList);
- super.saveBatch(equipList);
+// List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
+ this.ergodicTrim(list);
+ super.saveBatch(list);
}
//鑾峰彇鎶ヨ鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> errorList = this.equipmentRunningTracesErrorLog(equipment.getEquipmentid());
@@ -726,18 +726,8 @@
}
@Override
- public List<MdcEquipmentRunningSection> selectRunningData(String equipmentId, Date startDate, Date endDate) {
- return this.baseMapper.selectRunningData(equipmentId, startDate, endDate);
- }
-
- @Override
public List<MdcAlarmListDto> selectAlarmList(MdcAlarmAnalyzeQueryVo mdcAlarmAnalyzeQueryVo, String startDate, String endDate) {
return this.baseMapper.selectAlarmList(mdcAlarmAnalyzeQueryVo, startDate, endDate);
- }
-
- @Override
- public List<Integer> getDataList(String equipmentId, Date date) {
- return this.baseMapper.getDataList(equipmentId, date);
}
private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
--
Gitblit v1.9.3