From 204df4954e6ac9092ae3ec0304acc093c844edfb Mon Sep 17 00:00:00 2001 From: panbaolin Date: Thu, 21 May 2026 16:28:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:1.=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8excel?= =?UTF-8?q?=E6=B3=A8=E8=A7=A32.=E6=B7=BB=E5=8A=A0Quartz=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E5=9C=A8pg=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84boolean?= =?UTF-8?q?=E5=92=8Cint=E8=BD=AC=E6=8D=A2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/base/entity/QuartzJob.java | 5 ---- .../modules/base/entity/StasDataSource.java | 13 ---------- ...rtz框架在PG数据库中int和bool转换问题脚本.sql | 26 +++++++++++++++++++ 3 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 jeecg-module-sync/src/main/resources/解决Quartz框架在PG数据库中int和bool转换问题脚本.sql diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/QuartzJob.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/QuartzJob.java index 355cd13..3b92bed 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/QuartzJob.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/QuartzJob.java @@ -42,19 +42,14 @@ public class QuartzJob implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; /**任务类名*/ - @Excel(name="任务类名",width=40) private String jobClassName; /**cron表达式*/ - @Excel(name="cron表达式",width=30) private String cronExpression; /**参数*/ - @Excel(name="参数",width=15) private String parameter; /**描述*/ - @Excel(name="描述",width=40) private String description; /**状态 0正常 -1停止*/ - @Excel(name="状态",width=15,dicCode="quartz_status") @Dict(dicCode = "quartz_status") private Integer status; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasDataSource.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasDataSource.java index 0436241..a62f3cc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasDataSource.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/StasDataSource.java @@ -46,37 +46,24 @@ public class StasDataSource implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; /**实例名称*/ - @Excel(name = "数据库名称", width = 15) private String instanceName; /**数据库类型*/ - @Excel(name = "数据库类型", width = 15) private Integer type; /**数据库端口*/ - @Excel(name = "数据库端口", width = 15) private Integer port; /**服务名*/ - @Excel(name = "服务名", width = 15) private String serveId; /**DBLink*/ - @Excel(name = "DBLink", width = 15) private String dbLink; /**数据库用户名*/ - @Excel(name = "数据库用户名", width = 15) private String username; /**数据库密码*/ - @Excel(name = "数据库密码", width = 15) private String password; /**备注*/ - @Excel(name = "备注", width = 15) private String remark; - /**删除状态*/ - @TableLogic - private Integer delFlag; /**Ip地址*/ - @Excel(name = "数据源地址", width = 15) private String ipAddress; /**描述*/ - @Excel(name = "描述", width = 15) private String description; diff --git a/jeecg-module-sync/src/main/resources/解决Quartz框架在PG数据库中int和bool转换问题脚本.sql b/jeecg-module-sync/src/main/resources/解决Quartz框架在PG数据库中int和bool转换问题脚本.sql new file mode 100644 index 0000000..4c0926d --- /dev/null +++ b/jeecg-module-sync/src/main/resources/解决Quartz框架在PG数据库中int和bool转换问题脚本.sql @@ -0,0 +1,26 @@ +--需登录posgres用户，打开stas数据库窗口执行脚本 + +-- 布尔转int +CREATE OR REPLACE FUNCTION "boolean_to_smallint"("b" bool) +RETURNS "pg_catalog"."int2" AS $BODY$ +BEGIN +RETURN (b::boolean)::bool::int; +END; +$BODY$ +LANGUAGE plpgsql VOLATILE; + +-- int转布尔 +CREATE OR REPLACE FUNCTION "smallint_to_boolean"("i" int2) +RETURNS "pg_catalog"."bool" AS $BODY$ +BEGIN +RETURN (i::int2)::integer::bool; +END; +$BODY$ +LANGUAGE plpgsql VOLATILE; + +-- 在 PostgreSQL 数据库中创建自定义的数据类型转换规则 +CREATE CAST (BOOLEAN AS SMALLINT) WITH FUNCTION boolean_to_smallint AS IMPLICIT; +CREATE CAST (SMALLINT AS BOOLEAN) WITH FUNCTION smallint_to_boolean AS ASSIGNMENT; + +-- 测试 +SELECT true::smallint; \ No newline at end of file