From b78fe5762fcc6b767e858e6efa193b02eb70588b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 18 七月 2025 15:50:12 +0800
Subject: [PATCH] 优化巡检
---
/dev/null | 76 --------------------------------------
main-business/src/main/resources/db/migration/postgresql/V20250630153900__create_table_timing_task.sql | 3 +
main-business/src/main/java/com/ruoyi/business/dto/TimingTaskDto.java | 4 +
main-business/src/main/java/com/ruoyi/business/service/impl/TimingTaskServiceImpl.java | 2
4 files changed, 6 insertions(+), 79 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/dto/TimingTaskDto.java b/main-business/src/main/java/com/ruoyi/business/dto/TimingTaskDto.java
index 84b0b81..05bc00c 100644
--- a/main-business/src/main/java/com/ruoyi/business/dto/TimingTaskDto.java
+++ b/main-business/src/main/java/com/ruoyi/business/dto/TimingTaskDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.business.entity.TimingTask;
import lombok.Data;
+import java.util.List;
+
@Data
public class TimingTaskDto extends TimingTask {
- private String inspector;
+ private List<String> inspector;
}
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/TimingTaskServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/TimingTaskServiceImpl.java
index fe1d77e..cb3911d 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/TimingTaskServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/TimingTaskServiceImpl.java
@@ -101,7 +101,7 @@
return userNickNameMap.getOrDefault(id, "鏈煡鐢ㄦ埛");
})
.toList();
- dto.setInspector(inspectorNickNames.toString());
+ dto.setInspector(inspectorNickNames);
}
return dto;
diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250630153900__create_table_timing_task.sql b/main-business/src/main/resources/db/migration/postgresql/V20250630153900__create_table_timing_task.sql
index a0de620..d2ef480 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250630153900__create_table_timing_task.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250630153900__create_table_timing_task.sql
@@ -18,8 +18,9 @@
is_active BOOLEAN DEFAULT TRUE, -- 鏄惁婵�娲�
remarks TEXT, -- 澶囨敞
registrant_id BIGINT, -- 鐧昏浜篿d锛屼笉鍏佽涓虹┖
- registrant VARCHAR(255) NOT NULL, -- 鐧昏浜猴紝涓嶅厑璁镐负绌�
+ registrant VARCHAR(255), -- 鐧昏浜猴紝涓嶅厑璁镐负绌�
registration_date DATE NOT NULL, -- 鐧昏鏃ユ湡锛屼笉鍏佽涓虹┖
+ status VARCHAR(255), -- 鐘舵��
deleted INT NOT NULL DEFAULT 0, -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
create_by VARCHAR(255), -- 鍒涘缓浜虹敤鎴峰悕
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml.example b/ruoyi-admin/src/main/resources/application-prod.yml.example
deleted file mode 100644
index a158a6e..0000000
--- a/ruoyi-admin/src/main/resources/application-prod.yml.example
+++ /dev/null
@@ -1,76 +0,0 @@
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
-# driverClassName: com.mysql.cj.jdbc.Driver # mysql椹卞姩
- driverClassName: org.postgresql.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
-# mysql
-# url: jdbc:mysql://124.220.0.228:3300/ruoyi-java?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# pg
- url: jdbc:postgresql://114.132.189.42:5432/zd-test
- username: postgres
- password: bYD#nM+-BiLb
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 20
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- maxWait: 60000
- # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
- connectTimeout: 30000
- # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
- socketTimeout: 60000
- # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
- timeBetweenEvictionRunsMillis: 60000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- minEvictableIdleTimeMillis: 300000
- # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
- maxEvictableIdleTimeMillis: 900000
- # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
- validationQuery: SELECT VERSION()
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
- allow:
- url-pattern: /druid/*
- # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
- login-username: ruoyi
- login-password: 123456
- filter:
- stat:
- enabled: true
- # 鎱QL璁板綍
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
-# 鍏徃鏈嶅姟鍣� minio
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: ruoyi-zd # 榛樿瀛樺偍妗�
-
--
Gitblit v1.9.3