From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 2 Sep 2021 15:45:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20MP=E5=AD=97=E6=AE=B5=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=9B=B4=E6=94=B9=E4=B8=BA=20NOT=5FNULL=20?= =?UTF-8?q?=E4=B8=AA=E5=88=AB=E7=89=B9=E6=AE=8A=E5=AD=97=E6=AE=B5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=B3=A8=E8=A7=A3=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 6 +++--- .../ruoyi/common/core/domain/entity/SysUser.java | 5 +++++ .../com/ruoyi/generator/domain/GenTableColumn.java | 8 ++++++++ .../generator/service/GenTableServiceImpl.java | 14 +------------- .../service/impl/SysOssConfigServiceImpl.java | 7 +------ 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d94ca65d1..6e4888dcc 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -200,11 +200,11 @@ mybatis-plus: # NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断) # DEFAULT 默认的,一般只用于注解里 # NEVER 不加入 SQL - insertStrategy: NOT_EMPTY + insertStrategy: NOT_NULL # 字段验证策略之 update,在 update 的时候的字段验证策略 - updateStrategy: NOT_EMPTY + updateStrategy: NOT_NULL # 字段验证策略之 select,在 select 的时候的字段验证策略既 wrapper 根据内部 entity 生成的 where 条件 - selectStrategy: NOT_EMPTY + selectStrategy: NOT_NULL # Swagger配置 swagger: diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index c5c82fd6c..6e44a3b95 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -78,6 +78,11 @@ public class SysUser implements Serializable { /** * 密码 */ + @TableField( + insertStrategy = FieldStrategy.NOT_EMPTY, + updateStrategy = FieldStrategy.NOT_EMPTY, + whereStrategy = FieldStrategy.NOT_EMPTY + ) private String password; @JsonIgnore diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index 92ba7a982..246036089 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -44,6 +44,7 @@ public class GenTableColumn implements Serializable { /** * 列描述 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String columnComment; /** @@ -65,36 +66,43 @@ public class GenTableColumn implements Serializable { /** * 是否主键（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isPk; /** * 是否自增（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isIncrement; /** * 是否必填（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isRequired; /** * 是否为插入字段（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isInsert; /** * 是否编辑字段（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isEdit; /** * 是否列表字段（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isList; /** * 是否查询字段（1是） */ + @TableField(updateStrategy = FieldStrategy.IGNORED) private String isQuery; /** diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index 55ab9ce35..9280abc73 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -3,7 +3,6 @@ package com.ruoyi.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; @@ -131,18 +130,7 @@ public class GenTableServiceImpl extends ServicePlusImpl 0) { for (GenTableColumn cenTableColumn : genTable.getColumns()) { - genTableColumnMapper.update(cenTableColumn, - new LambdaUpdateWrapper() - .set(StringUtils.isBlank(cenTableColumn.getColumnComment()), GenTableColumn::getColumnComment, null) - .set(StringUtils.isBlank(cenTableColumn.getIsPk()), GenTableColumn::getIsPk, null) - .set(StringUtils.isBlank(cenTableColumn.getIsIncrement()), GenTableColumn::getIsIncrement, null) - .set(StringUtils.isBlank(cenTableColumn.getIsInsert()), GenTableColumn::getIsInsert, null) - .set(StringUtils.isBlank(cenTableColumn.getIsEdit()), GenTableColumn::getIsEdit, null) - .set(StringUtils.isBlank(cenTableColumn.getIsList()), GenTableColumn::getIsList, null) - .set(StringUtils.isBlank(cenTableColumn.getIsQuery()), GenTableColumn::getIsQuery, null) - .set(StringUtils.isBlank(cenTableColumn.getIsRequired()), GenTableColumn::getIsRequired, null) - .set(StringUtils.isBlank(cenTableColumn.getDictType()), GenTableColumn::getDictType, "") - .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId())); + genTableColumnMapper.updateById(cenTableColumn); } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java index a67abe541..5a6e8de55 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java @@ -88,12 +88,7 @@ public class SysOssConfigServiceImpl extends ServicePlusImpl luw = new LambdaUpdateWrapper<>(); - luw.set(StringUtils.isBlank(config.getPrefix()), SysOssConfig::getPrefix, ""); - luw.set(StringUtils.isBlank(config.getRegion()), SysOssConfig::getRegion, ""); - luw.set(StringUtils.isBlank(config.getExt1()), SysOssConfig::getExt1, ""); - luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId()); - return setConfigCache(update(config, luw), config); + return setConfigCache(updateById(config), config); } /**