From 8febff08af6259dc7a21dc1b1b9a16d7936d74cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BA=AC=E9=80=9A?= <2405957150@qq.com> Date: Thu, 29 May 2025 16:23:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/domain/BusinessTripApproval.java | 20 +++++++++++++-- .../domain/NonWorkingDayDrinkingReport.java | 18 ++++++++++++- .../database/domain/PoliceBusinessReport.java | 15 ++++++++++- .../database/domain/PoliceLeaveApproval.java | 15 ++++++++++- .../database/domain/PublicBusinessTrip.java | 8 ++---- .../src/main/resources/application-druid.yml | 4 +-- .../src/main/resources/application.yml | 25 +++---------------- 7 files changed, 70 insertions(+), 35 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java index 390fa48..d67ee94 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java @@ -1,6 +1,7 @@ package com.ruoyi.database.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -40,7 +41,7 @@ public class BusinessTripApproval { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate endDate; - @ApiModelProperty("拟乘交通工具（飞机/火车/汽车/轮船/其他）") + @ApiModelProperty("拟乘交通工具（0-飞机/1-火车/2-汽车/3-轮船/4-其他）") private String transport; @ApiModelProperty("是否自带公务车辆（0-否 1-是）") @@ -55,7 +56,22 @@ public class BusinessTripApproval { @ApiModelProperty("局主要领导意见") private String mainLeaderOpinion; - @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") private LocalDateTime createTime; + + @ApiModelProperty("创建人") + private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty("修改人") + private String updateBy; + + @TableField(exist = false) + private String fTime; + @TableField(exist = false) + private String eTime; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java index 92629a5..fa34fe7 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/NonWorkingDayDrinkingReport.java @@ -1,6 +1,7 @@ package com.ruoyi.database.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -67,7 +68,22 @@ public class NonWorkingDayDrinkingReport { @ApiModelProperty("责任领导签名") private String leaderSign; - @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") private LocalDateTime createTime; + + @ApiModelProperty("创建人") + private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty("修改人") + private String updateBy; + + @TableField(exist = false) + private String fTime; + @TableField(exist = false) + private String eTime; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceBusinessReport.java b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceBusinessReport.java index b195691..2a7c5d5 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceBusinessReport.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceBusinessReport.java @@ -1,6 +1,7 @@ package com.ruoyi.database.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -56,10 +57,22 @@ public class PoliceBusinessReport { @ApiModelProperty("局领导意见") private String leaderOpinion; - @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") private LocalDateTime createTime; @ApiModelProperty("创建人") private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty("修改人") + private String updateBy; + + @TableField(exist = false) + private String fTime; + @TableField(exist = false) + private String eTime; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java index 1d4547d..1ff7da9 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PoliceLeaveApproval.java @@ -1,6 +1,7 @@ package com.ruoyi.database.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -59,10 +60,22 @@ public class PoliceLeaveApproval { @ApiModelProperty("局领导审批意见") private String leaderApproval; - @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("创建时间") private LocalDateTime createTime; @ApiModelProperty("创建人") private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("修改时间") + private LocalDateTime updateTime; + + @ApiModelProperty("修改人") + private String updateBy; + + @TableField(exist = false) + private String fTime; + @TableField(exist = false) + private String eTime; } \ No newline at end of file diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/PublicBusinessTrip.java b/gather-app/src/main/java/com/ruoyi/database/domain/PublicBusinessTrip.java index 195b3e2..a276e46 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/PublicBusinessTrip.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/PublicBusinessTrip.java @@ -25,9 +25,6 @@ public class PublicBusinessTrip { @ApiModelProperty("申请人姓名") private String applicantName; - @ApiModelProperty("警号") - private String policeNumber; - @ApiModelProperty("联系方式") private String contactWay; @@ -94,8 +91,7 @@ public class PublicBusinessTrip { private String updateBy; @TableField(exist = false) - private String fTime; // 临时字段：开始时间字符串 - + private String fTime; @TableField(exist = false) - private String eTime; // 临时字段：结束时间字符串 + private String eTime; } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 83de415..3b31f9d 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://50.146.63.166:55306/PublicAffairs?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/PublicAffairs?useUnicode=true&allowMultiQueries=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: '!QAZ1qaz' + password: '123456' # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 2502f93..13a8c6c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -69,28 +69,9 @@ spring: enabled: true # redis 配置 redis: - # 地址 -# host: 127.0.0.1 - host: 50.146.63.43 - # 端口，默认为6379 -# port: 26379 - port: 26379 - # 数据库索引 - database: 6 - # 密码 - password: livegbs@2019 - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 50 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms + host: 127.0.0.1 + port: 6379 +# password: 123456 # token配置 token: