From f472aff2734accfc5dc42456afddc7ce79bca263 Mon Sep 17 00:00:00 2001 From: ls Date: Sun, 4 May 2025 15:49:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 3 +- .../src/main/resources/application-prod.yml | 1 + .../main/resources/application-release.yml | 3 +- .../src/main/resources/logback-spring.xml | 6 ++-- .../modules/database/mapper/ClientMapper.java | 2 ++ .../database/mapper/EquipmentMapper.java | 2 ++ .../ExperimentDeviationConditionMapper.java | 2 ++ .../ExperimentDeviationEquipmentMapper.java | 2 ++ .../mapper/ExperimentSampleInfoMapper.java | 2 ++ .../database/mapper/TestStandardsMapper.java | 2 ++ ...perimentDeviationEquipmentServiceImpl.java | 4 +++ .../modules/system/mapper/SysUserMapper.java | 4 +-- scripts/convert_csv_to_xlsx.py | 29 +++++++++++++++++++ 13 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 scripts/convert_csv_to_xlsx.py diff --git a/physical-launcher/src/main/resources/application-dev.yml b/physical-launcher/src/main/resources/application-dev.yml index 6c658d5..51426aa 100644 --- a/physical-launcher/src/main/resources/application-dev.yml +++ b/physical-launcher/src/main/resources/application-dev.yml @@ -197,11 +197,12 @@ mybatis-plus: # 默认数据库表下划线命名 table-underline: true configuration: + cache-enabled: true # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #jeecg专用配置 minidao: base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.* diff --git a/physical-launcher/src/main/resources/application-prod.yml b/physical-launcher/src/main/resources/application-prod.yml index b79d81d..7be8adb 100644 --- a/physical-launcher/src/main/resources/application-prod.yml +++ b/physical-launcher/src/main/resources/application-prod.yml @@ -199,6 +199,7 @@ mybatis-plus: # 默认数据库表下划线命名 table-underline: true configuration: + cache-enabled: true # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 diff --git a/physical-launcher/src/main/resources/application-release.yml b/physical-launcher/src/main/resources/application-release.yml index 0e6967f..6867178 100644 --- a/physical-launcher/src/main/resources/application-release.yml +++ b/physical-launcher/src/main/resources/application-release.yml @@ -203,7 +203,8 @@ mybatis-plus: #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 返回类型为Map,显示null对应的字段 call-setters-on-nulls: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + cache-enabled: true +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #jeecg专用配置 minidao: base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.* diff --git a/physical-launcher/src/main/resources/logback-spring.xml b/physical-launcher/src/main/resources/logback-spring.xml index d2d7a2e..72e9d8e 100644 --- a/physical-launcher/src/main/resources/logback-spring.xml +++ b/physical-launcher/src/main/resources/logback-spring.xml @@ -35,9 +35,9 @@ - - - + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ClientMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ClientMapper.java index e9e395c..dec8a5d 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ClientMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ClientMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.jeecg.modules.database.entity.Client; /** @@ -9,6 +10,7 @@ import org.jeecg.modules.database.entity.Client; * @Date: 2024-08-30 * @Version: V1.0 */ +@CacheNamespace public interface ClientMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/EquipmentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/EquipmentMapper.java index a43f4b0..a5b2d2d 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/EquipmentMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/EquipmentMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.jeecg.modules.database.entity.Equipment; /** @@ -9,6 +10,7 @@ import org.jeecg.modules.database.entity.Equipment; * @Date: 2024-08-30 * @Version: V1.0 */ +@CacheNamespace public interface EquipmentMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java index d893071..958d86c 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationConditionMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.jeecg.modules.database.entity.ExperimentDeviationCondition; /** @@ -9,6 +10,7 @@ import org.jeecg.modules.database.entity.ExperimentDeviationCondition; * @Date: 2024-12-05 * @Version: V1.0 */ +@CacheNamespace public interface ExperimentDeviationConditionMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java index 4b2ce9a..8b1ade0 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentDeviationEquipmentMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.jeecg.modules.database.entity.ExperimentDeviationEquipment; /** @@ -9,6 +10,7 @@ import org.jeecg.modules.database.entity.ExperimentDeviationEquipment; * @Date: 2024-12-05 * @Version: V1.0 */ +@CacheNamespace public interface ExperimentDeviationEquipmentMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java index eb7fcda..e8edde1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentSampleInfoMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.ExperimentSampleInfo; @@ -12,6 +13,7 @@ import java.util.List; * @Date: 2024-12-04 * @Version: V1.0 */ +@CacheNamespace public interface ExperimentSampleInfoMapper extends BaseMapper { @Select("SELECT distinct sample_model FROM experiment_sample_info") diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/TestStandardsMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/TestStandardsMapper.java index 1954ec8..a024677 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/TestStandardsMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/TestStandardsMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.CacheNamespace; import org.jeecg.modules.database.entity.TestStandards; /** @@ -9,6 +10,7 @@ import org.jeecg.modules.database.entity.TestStandards; * @Date: 2024-08-30 * @Version: V1.0 */ +@CacheNamespace public interface TestStandardsMapper extends BaseMapper { } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java index 991c6f4..d78187d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentDeviationEquipmentServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.service.impl; +import cn.hutool.core.util.ObjUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.database.entity.Equipment; @@ -42,6 +43,9 @@ public class ExperimentDeviationEquipmentServiceImpl extends ServiceImpl { /** * 通过用户账号查询用户信息 diff --git a/scripts/convert_csv_to_xlsx.py b/scripts/convert_csv_to_xlsx.py new file mode 100644 index 0000000..5634e2f --- /dev/null +++ b/scripts/convert_csv_to_xlsx.py @@ -0,0 +1,29 @@ +import os +import pandas as pd + +def convert_csv_to_xlsx(directory): + # 遍历目录及其子目录 + for root, dirs, files in os.walk(directory): + for file in files: + # if file.endswith('data.csv'): + # csv_file_path = os.path.join(root, file) + # xlsx_file_path = os.path.splitext(csv_file_path)[0] + '.xlsx' + # + # # 读取CSV文件并转换为XLSX + # df = pd.read_csv(csv_file_path) + # df.to_excel(xlsx_file_path, index=False) + # + # # 删除原始的CSV文件 + # os.remove(csv_file_path) + # print(f"Converted and deleted: {csv_file_path}") + + # 删除所有文件名不等于data.xlsx的文件 + if not file.endswith('data.xlsx'): + file_path = os.path.join(root, file) + os.remove(file_path) + print(f"Deleted: {file_path}") + +if __name__ == "__main__": + # 指定要处理的目录 + directory = 'downloaded_files' + convert_csv_to_xlsx(directory) \ No newline at end of file