From bde8bc0d6a91699433ff63993a9404026802155c Mon Sep 17 00:00:00 2001 From: qraddx Date: Tue, 18 Jan 2022 14:53:59 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=20=E9=80=82=E9=85=8D?= =?UTF-8?q?Oracle=20=E3=80=81PG=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/MybatisPlusMetaObjectHandler.java | 6 +++++- .../config/DruidDataSourceProperties.java | 2 +- .../src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- .../src/main/resources/mapper/SysRoleMapper.xml | 2 +- .../pigx/codegen/entity/GenDatasourceConf.java | 16 ++++++++-------- .../pigx/codegen/entity/GenFormConf.java | 13 ++++++------- .../quartz/controller/SysJobController.java | 8 ++++---- 7 files changed, 27 insertions(+), 24 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java index 2cde63456..0ff3c73c2 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java @@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.mybatis; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.pig4cloud.pigx.common.core.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.security.core.Authentication; @@ -25,11 +26,14 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { log.debug("mybatis plus start insert fill ...."); LocalDateTime now = LocalDateTime.now(); + // 审计字段自动填充 fillValIfNullByName("createTime", now, metaObject, false); fillValIfNullByName("updateTime", now, metaObject, false); fillValIfNullByName("createBy", getUserName(), metaObject, false); fillValIfNullByName("updateBy", getUserName(), metaObject, false); - fillValIfNullByName("delFlag", 1, metaObject, false); + + // 删除标记自动填充 + fillValIfNullByName("delFlag", CommonConstants.STATUS_NORMAL, metaObject, false); } @Override diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java index d09802f4e..46aa0da58 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java @@ -38,6 +38,6 @@ public class DruidDataSourceProperties { /** * 查询数据源的SQL */ - private String queryDsSql = "select * from gen_datasource_conf where del_flag = 0"; + private String queryDsSql = "select * from gen_datasource_conf where del_flag = '0'"; } diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index 706d03a4a..b90c7d164 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -52,7 +52,7 @@ sys_menu.del_flag FROM sys_menu LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id - WHERE sys_menu.del_flag = 0 + WHERE sys_menu.del_flag = '0' AND sys_role_menu.role_id = #{roleId} ORDER BY sys_menu.sort_order DESC @@ -63,7 +63,7 @@ FROM sys_menu m, sys_role_menu rm WHERE m.menu_id = rm.menu_id - AND m.del_flag = 0 + AND m.del_flag = '0' AND rm.role_id IN (#{roleIds}) diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml index f2052a7a5..e7eaa6ea1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -47,7 +47,7 @@ FROM sys_role, sys_user_role WHERE sys_role.role_id = sys_user_role.role_id - AND sys_role.del_flag = 0 + AND sys_role.del_flag = '0' and sys_user_role.user_id = #{userId} diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java index c85100a71..682675bb1 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java @@ -16,10 +16,7 @@ */ package com.pig4cloud.pigx.codegen.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -98,17 +95,20 @@ public class GenDatasourceConf extends Model { /** * 创建时间 */ - private LocalDateTime createDate; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** - * 更新 + * 修改时间 */ - private LocalDateTime updateDate; + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; /** - * 删除标记 + * 0-正常，1-删除 */ @TableLogic + @TableField(fill = FieldFill.INSERT) private String delFlag; } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java index d611d8e17..83c8200a3 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java @@ -17,9 +17,7 @@ package com.pig4cloud.pigx.codegen.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -64,19 +62,20 @@ public class GenFormConf extends Model { /** * 创建时间 */ - @ApiModelProperty(value = "创建时间") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 修改时间 */ - @ApiModelProperty(value = "修改时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; /** - * 删除标记 + * 0-正常，1-删除 */ - @ApiModelProperty(value = "删除标记") + @TableLogic + @TableField(fill = FieldFill.INSERT) private String delFlag; /** diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index 5cd2a72c0..3ef6fdd96 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -77,7 +77,7 @@ public class SysJobController { */ @GetMapping("/{id}") @ApiOperation(value = "唯一标识查询定时任务") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") Long id) { return R.ok(sysJobService.getById(id)); } @@ -127,7 +127,7 @@ public class SysJobController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('job_sys_job_del')") @ApiOperation(value = "唯一标识查询定时任务，暂停任务才能删除") - public R removeById(@PathVariable Integer id) { + public R removeById(@PathVariable Long id) { SysJob querySysJob = this.sysJobService.getById(id); if (JOB_STATUS_NOT_RUNNING.getType().equals(querySysJob.getJobStatus())) { this.taskUtil.removeJob(querySysJob, scheduler); @@ -234,7 +234,7 @@ public class SysJobController { @PostMapping("/run-job/{id}") @PreAuthorize("@pms.hasPermission('job_sys_job_run_job')") @ApiOperation(value = "立刻执行定时任务") - public R runJob(@PathVariable("id") Integer jobId) { + public R runJob(@PathVariable("id") Long jobId) { SysJob querySysJob = this.sysJobService.getById(jobId); return TaskUtil.runOnce(scheduler, querySysJob) ? R.ok() : R.failed(); } @@ -247,7 +247,7 @@ public class SysJobController { @PostMapping("/shutdown-job/{id}") @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") @ApiOperation(value = "暂停定时任务") - public R shutdownJob(@PathVariable("id") Integer id) { + public R shutdownJob(@PathVariable("id") Long id) { SysJob querySysJob = this.sysJobService.getById(id); // 更新定时任务状态条件，运行状态2更新为暂停状态3 this.sysJobService.updateById(