From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 15:45:57 +0800
Subject: [PATCH] update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 14 +-------------
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 5 +++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 7 +------
ruoyi-admin/src/main/resources/application.yml | 6 +++---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 8 ++++++++
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 d94ca65..6e4888d 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -200,11 +200,11 @@
# 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 c5c82fd..6e44a3b 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 @@
/**
* 瀵嗙爜
*/
+ @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 92ba7a9..2460360 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 @@
/**
* 鍒楁弿杩�
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String columnComment;
/**
@@ -65,36 +66,43 @@
/**
* 鏄惁涓婚敭锛�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 55ab9ce..9280abc 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 @@
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 @@
int row = baseMapper.updateById(genTable);
if (row > 0) {
for (GenTableColumn cenTableColumn : genTable.getColumns()) {
- genTableColumnMapper.update(cenTableColumn,
- new LambdaUpdateWrapper<GenTableColumn>()
- .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 a67abe5..5a6e8de 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 Boolean updateByBo(SysOssConfigBo bo) {
SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
validEntityBeforeSave(config);
- LambdaUpdateWrapper<SysOssConfig> 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);
}
/**
--
Gitblit v1.9.3