From 941195685126a5a8a78777c8c39871b128e5d33f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 18 九月 2024 16:59:27 +0800
Subject: [PATCH] 1
---
docker/init/init.sql | 34 +++++++++++
src/main/java/com/se/simu/domain/po/SimuPo.java | 49 +++++----------
src/main/java/com/se/simu/SimuApplication.java | 4 +
pom.xml | 10 +++
src/main/java/com/se/simu/domain/vo/TaskVo.java | 7 +-
src/main/resources/application.yml | 56 ++++++++++++++++++
6 files changed, 123 insertions(+), 37 deletions(-)
diff --git a/docker/init/init.sql b/docker/init/init.sql
new file mode 100644
index 0000000..585366d
--- /dev/null
+++ b/docker/init/init.sql
@@ -0,0 +1,34 @@
+create extension if not exists postgis cascade;
+
+create extension if not exists "uuid-ossp";
+
+create schema if not exists bs;
+
+create table bs.simu (
+ id serial primary key,
+ pid integer default 0,
+ num integer,
+ name varchar(100),
+ data varchar(8000),
+ status smallint default 0,
+ result varchar(1000),
+ create_time timestamp(6) without time zone default now(),
+ update_time timestamp(6) without time zone,
+ bak varchar(2000)
+);
+
+comment on table bs.simu is '浠跨湡琛�';
+comment on column bs.simu.id is '涓婚敭ID';
+comment on column bs.simu.pid is '鐖禝D';
+comment on column bs.simu.num is '搴忓彿';
+comment on column bs.simu.name is '鍚嶇О';
+comment on column bs.simu.data is '鏁版嵁(JSON)';
+comment on column bs.simu.status is '鐘舵�侊細0-鍒涘缓浠跨湡锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-妯℃嫙鍐呮稘浠跨湡锛�5-澶勭悊浠跨湡鏁版嵁锛�10-瀹屾垚锛�-10-鍑洪敊';
+comment on column bs.simu.result is '缁撴灉';
+comment on column bs.simu.create_time is '鍒涘缓鏃堕棿';
+comment on column bs.simu.update_time is '鏇存柊鏃堕棿';
+comment on column bs.simu.bak is '澶囨敞';
+
+-- insert into bs.simu (pid, num, name, data, status, result, bak) values (0, 1, '浠跨湡01', null, 0, '', null);
+
+select * from bs.simu;
diff --git a/pom.xml b/pom.xml
index 4d71531..5b0e4dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,16 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
+ <!--postgresql-->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ </dependency>
<!--text-->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/src/main/java/com/se/simu/SimuApplication.java b/src/main/java/com/se/simu/SimuApplication.java
index 3d99701..87604e9 100644
--- a/src/main/java/com/se/simu/SimuApplication.java
+++ b/src/main/java/com/se/simu/SimuApplication.java
@@ -11,8 +11,10 @@
*
* @author WWW
* @date 2024-07-16
+ *
+ * exclude = {DataSourceAutoConfiguration.class},
*/
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.se.simu"})
+@SpringBootApplication(scanBasePackages = {"com.se.simu"})
public class SimuApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SimuApplication.class, args);
diff --git a/src/main/java/com/se/simu/domain/po/SimuPo.java b/src/main/java/com/se/simu/domain/po/SimuPo.java
index 5301088..035fdd6 100644
--- a/src/main/java/com/se/simu/domain/po/SimuPo.java
+++ b/src/main/java/com/se/simu/domain/po/SimuPo.java
@@ -17,48 +17,33 @@
@SuppressWarnings("ALL")
public class SimuPo {
@TableId(type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @ApiModelProperty("涓婚敭ID")
private Long id;
- @ApiModelProperty("浠诲姟鍚嶇О")
- private String simuName;
+ @ApiModelProperty("鐖禝D")
+ private Integer pid;
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Timestamp createTime;
+ @ApiModelProperty("搴忓彿")
+ private Integer num;
- @ApiModelProperty("缁撴潫鏃堕棿")
- private Timestamp stopTime;
+ @ApiModelProperty("鍚嶇О")
+ private String name;
- @ApiModelProperty("鏁版嵁婧�")
- private String dataSource;
+ @ApiModelProperty("鏁版嵁(JSON)")
+ private String data;
- @ApiModelProperty("鍦扮悊瑕佺礌锛堟暟鎹被鍨嬶級锛氬缓绛戠墿锛岄亾璺紝姘翠綋锛屾灄鍦�")
- private String dataType;
-
- @ApiModelProperty("鍖哄煙绫诲瀷锛氬吀鍨嬪尯鍩燂紝澶嶆潅鍖哄煙锛岃縼绉诲尯鍩�")
- private String areaType;
-
- @ApiModelProperty("鐘舵�侊細0-鍑嗗锛�1-澶勭悊鏁版嵁锛�2-璇嗗埆鏁版嵁锛�3-鍒嗘瀽缁撴灉锛�10-瀹屾垚锛�20-鍑洪敊")
+ @ApiModelProperty("鐘舵�侊細0-鍒涘缓浠跨湡锛�1-杩炴帴GEDB搴擄紝2-涓嬭浇绌洪棿鏁版嵁锛�3-涓嬭浇楂樼▼鏁版嵁锛�4-妯℃嫙鍐呮稘浠跨湡锛�5-澶勭悊浠跨湡鏁版嵁锛�10-瀹屾垚锛�-10-鍑洪敊")
private Short status;
-
- @ApiModelProperty("鏍囨敞涓暟")
- private Integer marks;
-
- @ApiModelProperty("姝ｇ‘涓暟")
- private Integer corrects;
-
- @ApiModelProperty("閿欒涓暟")
- private Integer errors;
-
- @ApiModelProperty("鍑嗙‘鐜�")
- private Integer precision;
-
- @ApiModelProperty("鑼冨洿")
- private String range;
@ApiModelProperty("缁撴灉")
private String result;
- @ApiModelProperty("浠诲姟澶囨敞")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ private Timestamp createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ private Timestamp updateTime;
+
+ @ApiModelProperty("澶囨敞")
private String bak;
}
diff --git a/src/main/java/com/se/simu/domain/vo/TaskVo.java b/src/main/java/com/se/simu/domain/vo/TaskVo.java
index b7aed3c..4ba6ead 100644
--- a/src/main/java/com/se/simu/domain/vo/TaskVo.java
+++ b/src/main/java/com/se/simu/domain/vo/TaskVo.java
@@ -2,7 +2,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -19,12 +18,12 @@
@ApiModel(value = "浠诲姟瑙嗗浘绫�")
@EqualsAndHashCode(callSuper = false)
public class TaskVo {
- @ApiModelProperty("鍚嶇О")
- private String name;
-
@ApiModelProperty("搴忓彿")
private Integer num;
+ @ApiModelProperty("鍚嶇О")
+ private String name;
+
@ApiModelProperty("鍒嗛〉澶у皬")
private Integer pageSize;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 932fb79..fce9562 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,6 +9,62 @@
matching-strategy: ant_path_matcher
application:
name: SimuServer
+ datasource:
+ name: prod
+ # JDBC 鍩烘湰閰嶇疆 ¤tSchema=public
+ url: jdbc:postgresql://127.0.0.1:5433/ai?useAffectedRows=true
+ username: postgres
+ password: postgres
+ driver-class-name: org.postgresql.Driver
+ platform: POSTGRESQL
+ type: com.alibaba.druid.pool.DruidDataSource
+ # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
+ filters: stat,wall,log4j
+ # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
+ connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ # 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
+ removeAbandoned: true
+ # 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
+ removeAbandonedTimeout: 180
+ # 鍏抽棴 abanded 杩炴帴鏃惰緭鍑洪敊璇棩蹇�
+ logAbandoned: true
+ # 閰嶇疆杩炴帴姹犱俊鎭�
+ druid:
+ ## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
+ initial-size: 5
+ min-idle: 5
+ max-active: 100
+ ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
+ max-wait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ time-between-eviction-runs-millis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ min-evictable-idle-time-millis: 300000
+ max-pool-prepared-statement-per-connection-size: 50
+ pool-prepared-statements: true
+ # 鐢ㄦ潵娴嬭瘯杩炴帴鏄惁鍙敤鐨凷QL璇彞
+ validation-query: SELECT 1
+ # 搴旂敤鍚戣繛鎺ユ睜鐢宠杩炴帴锛屽苟涓攖estOnBorrow涓篺alse鏃讹紝杩炴帴姹犲皢浼氬垽鏂繛鎺ユ槸鍚﹀浜庣┖闂茬姸鎬侊紝濡傛灉鏄紝鍒欓獙璇佽繖鏉¤繛鎺ユ槸鍚﹀彲鐢�
+ test-while-idle: true
+ # 濡傛灉涓簍rue锛岄粯璁ゆ槸false锛屽簲鐢ㄥ悜杩炴帴姹犵敵璇疯繛鎺ユ椂锛岃繛鎺ユ睜浼氬垽鏂繖鏉¤繛鎺ユ槸鍚︽槸鍙敤鐨�
+ test-on-borrow: false
+ # 濡傛灉涓簍rue锛堥粯璁alse锛夛紝褰撳簲鐢ㄤ娇鐢ㄥ畬杩炴帴锛岃繛鎺ユ睜鍥炴敹杩炴帴鐨勬椂鍊欎細鍒ゆ柇璇ヨ繛鎺ユ槸鍚﹁繕鍙敤
+ test-on-return: false
+ # servlet閰嶇疆
+ stat-view-servlet:
+ # sql鐩戞帶寮�鍏�
+ enabled: true
+ # 璁块棶鍐呯疆鐩戞帶椤甸潰鐨勮矾寰勶紝鍐呯疆鐩戞帶椤甸潰鐨勯椤垫槸/druid/index.html
+ url-pattern: /druid/*
+ # 鏄惁鍏佽娓呯┖缁熻鏁版嵁锛岄噸鏂拌绠� true:鍏佽 false:涓嶅厑璁�
+ reset-enable: false
+ # 閰嶇疆鐩戞帶椤甸潰璁块棶璐﹀彿瀵嗙爜
+ login-username: admin
+ login-password: ad_!Druid!_min
+ # 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
+ allow:
+ # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
+ deny:
mybatis-plus:
type-aliases-package: com.se.ai.domain
--
Gitblit v1.9.3