fanxp 1 年之前
父節點
當前提交
937147cbcd

+ 2 - 0
src/main/java/com/xjrsoft/XjrSoftApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author Zexy
@@ -12,6 +13,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @SpringBootApplication
 @EnableAspectJAutoProxy(exposeProxy = true)
 @ComponentScan(nameGenerator = UniqueNameGenerator.class)
+@EnableScheduling
 public class XjrSoftApplication {
     public static void main(String[] args) {
         SpringApplication.run(XjrSoftApplication.class, args);

+ 31 - 0
src/main/java/com/xjrsoft/module/job/DataSourceTask.java

@@ -0,0 +1,31 @@
+package com.xjrsoft.module.job;
+
+import cn.hutool.db.Db;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.xjrsoft.common.utils.DatasourceUtil;
+import com.xjrsoft.common.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+import java.util.Date;
+
+@Component
+@Slf4j
+public class DataSourceTask {
+    /**
+     * 定时刷新动态数据源连接池
+     */
+    @Scheduled(cron = "0 */5 * * * ?")
+    public void RefreshConnectionPool() {
+        System.out.printf("定时刷新动态数据源连接池:%s", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
+        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+        try {
+            Db use = Db.use(datasource);
+            use.query("select 1");
+        } catch (Exception e) {
+            log.error(e.getMessage(), "定时刷新动态数据源连接池");
+        }
+    }
+}

+ 3 - 1
src/main/resources/sqlScript/20231218_sql.sql

@@ -618,7 +618,6 @@ CREATE TABLE room_rule
     `delete_mark` INT NOT NULL COMMENT '删除标记',
     `enabled_mark` INT NOT NULL COMMENT '有效标志',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `floor_number` int NOT NULL COMMENT '楼层',
     `name` varchar(100) NULL DEFAULT NULL COMMENT '规则名称',
     `rule` varchar(500) NULL DEFAULT NULL COMMENT '规则配置(多个规则用逗号隔开)',
     `remark` varchar(1000) NULL DEFAULT NULL COMMENT '备注',
@@ -892,6 +891,9 @@ CREATE TABLE room_bed_check_record_relation
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `room_bed_check_record_id` bigint NULL DEFAULT NULL COMMENT '查寝记录编号(room_bed_check_record)',
     `room_id` bigint NOT NULL COMMENT '寝室编号(room)',
+    `office_build_id` varchar(100) NULL DEFAULT NULL COMMENT '楼栋(base_office_build)',
+    `floor_number` int NULL DEFAULT NULL COMMENT '楼层',
+    `room_name` varchar(100) NULL DEFAULT NULL COMMENT '寝室名称',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '查寝记录(关联寝室)';