From d69da9b903c107251f77450aac986d2477a5f4c5 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 09 一月 2025 09:52:28 +0800
Subject: [PATCH] 处理设备单表名特殊字符

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 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 2bc6d5f..b444d9d 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
@@ -27,6 +27,15 @@
 @Slf4j
 public class TransferTableDataJob implements Job {
 
+    /**
+     * 鑻ュ弬鏁板彉閲忓悕淇敼 QuartzJobController涓篃闇�瀵瑰簲淇敼  杩佺Щ鏃堕棿  渚嬶細 30
+     */
+    private String parameter;
+
+    public void setParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
     @Resource
     private ISysQuartzLogService sysQuartzLogService;
 
@@ -48,6 +57,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 {
@@ -55,18 +65,23 @@
             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 (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