From fd4799fb341ee0dcbae2e59cb52d9112a425e155 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 16:44:40 +0800
Subject: [PATCH] 修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
index 16045d3..8834661 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.StrUtils;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.service.IEquipmentService;
import org.jeecg.modules.mdc.util.DateUtils;
@@ -75,16 +76,16 @@
}
String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -dayNum), DateUtils.STR_DATE_TIME_SMALL);
for (Equipment equipment : list) {
+ if (StrUtils.isNotBlankOrNull(equipment.getEquipmentid()) && equipment.getEquipmentid().contains("-")) {
+ continue;
+ }
if (StringUtils.isNotBlank(equipment.getSavetablename())) {
String tableName = equipmentService.checkTableExists(equipment.getSavetablename());
if (StringUtils.isNotBlank(tableName)) {
String backupTableName = equipmentService.checkTableExists(equipment.getSavetablename() + "_backup");
if (StringUtils.isNotBlank(backupTableName)) {
- Integer num = equipmentService.checkTableDataNum(equipment.getSavetablename(), day);
- if (num > 0) {
- equipmentService.insertTableData(backupTableName, tableName, day);
- equipmentService.deleteTableData(tableName, day);
- }
+ equipmentService.insertTableData(backupTableName, tableName, day);
+ equipmentService.deleteTableData(tableName, day);
} else {
//澶囦唤琛ㄤ笉瀛樺湪鍒涘缓澶囦唤琛ㄥ苟杩佺Щ鏁版嵁
equipmentService.insertNoTableData(tableName + "_backup", tableName, day);
--
Gitblit v1.9.3