From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 bed9ddd..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;
@@ -24,10 +25,17 @@
* @author Lius
* @date 2024/4/3 10:39
*/
-@PersistJobDataAfterExecution
-@DisallowConcurrentExecution
@Slf4j
public class TransferTableDataJob implements Job {
+
+ /**
+ * 鑻ュ弬鏁板彉閲忓悕淇敼 QuartzJobController涓篃闇�瀵瑰簲淇敼 杩佺Щ鏃堕棿 渚嬶細 30
+ */
+ private String parameter;
+
+ public void setParameter(String parameter) {
+ this.parameter = parameter;
+ }
@Resource
private ISysQuartzLogService sysQuartzLogService;
@@ -50,6 +58,7 @@
if (byJobClassName != null && !byJobClassName.isEmpty()) {
quartzLog.setJobId(byJobClassName.get(0).getId());
}
+ quartzLog.setParams(this.parameter);
log.info("鏁版嵁杩佺Щ浠诲姟 TransferTableDataJob start! 鏃堕棿:" + DateUtils.getNow());
long startTime = System.currentTimeMillis();
try {
@@ -57,18 +66,26 @@
Equipment info = new Equipment();
info.setSavetablename("EquipmentLog");
list.add(info);
- String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -30), DateUtils.STR_DATE_TIME_SMALL);
+ int dayNum = 30;
+ if (StringUtils.isNotBlank(this.parameter)) {
+ try {
+ dayNum = Integer.parseInt(this.parameter);
+ } catch (Exception e) {
+ log.error("鍙傛暟鏍煎紡涓嶅", e);
+ }
+ }
+ 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