admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 09:38:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize

Browse Source
This commit is contained in:
开源海哥 2023-04-08 13:37:05 +08:00
parent ba2c2ea75f
commit c4520d522b
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
View File

@ -43,9 +43,9 @@ public class FlexConsts {
/** /**
* 当 entity 使用逻辑删除时，0 为 entity 的正常状态 * 当 entity 使用逻辑删除时，0 为 entity 的正常状态
*/ */
public static final int DEL_STATUS_NORMAL = 0; public static final int LOGIC_DELETE_NORMAL = 0;
/** /**
* 当 entity 使用逻辑删除时，1 为 entity 的删除状态 * 当 entity 使用逻辑删除时，1 为 entity 的删除状态
*/ */
public static final int DEL_STATUS_DELETED = 1; public static final int LOGIC_DELETE_DELETED = 1;
} }

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java
View File

@ -427,7 +427,7 @@ public class CommonsDialectImpl implements IDialect {
String[] primaryKeys = tableInfo.getPrimaryKeys(); String[] primaryKeys = tableInfo.getPrimaryKeys();
sql.append("UPDATE ").append(wrap(tableInfo.getTableName())).append(" SET "); sql.append("UPDATE ").append(wrap(tableInfo.getTableName())).append(" SET ");
sql.append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_DELETED); sql.append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_DELETED);
sql.append(" WHERE "); sql.append(" WHERE ");
for (int i = 0; i < primaryKeys.length; i++) { for (int i = 0; i < primaryKeys.length; i++) {
if (i > 0) { if (i > 0) {
@ -436,7 +436,7 @@ public class CommonsDialectImpl implements IDialect {
sql.append(wrap(primaryKeys[i])).append(" = ?"); sql.append(wrap(primaryKeys[i])).append(" = ?");
} }
sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_NORMAL); sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_NORMAL);
return sql.toString(); return sql.toString();
} }
@ -453,7 +453,7 @@ public class CommonsDialectImpl implements IDialect {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
sql.append("UPDATE "); sql.append("UPDATE ");
sql.append(wrap(tableInfo.getTableName())); sql.append(wrap(tableInfo.getTableName()));
sql.append(" SET ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_DELETED); sql.append(" SET ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_DELETED);
sql.append(" WHERE "); sql.append(" WHERE ");
sql.append("("); sql.append("(");
@ -486,7 +486,7 @@ public class CommonsDialectImpl implements IDialect {
} }
if (StringUtil.isNotBlank(logicDeleteColumn)) { if (StringUtil.isNotBlank(logicDeleteColumn)) {
sql.append(") AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_NORMAL); sql.append(") AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_NORMAL);
} }
return sql.toString(); return sql.toString();
} }
@ -510,7 +510,7 @@ public class CommonsDialectImpl implements IDialect {
//ignore selectColumns //ignore selectColumns
StringBuilder sqlBuilder = new StringBuilder("UPDATE "); StringBuilder sqlBuilder = new StringBuilder("UPDATE ");
sqlBuilder.append(wrap(tableInfo.getTableName())); sqlBuilder.append(wrap(tableInfo.getTableName()));
sqlBuilder.append(" SET ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_DELETED); sqlBuilder.append(" SET ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_DELETED);
buildJoinSql(sqlBuilder, queryWrapper, allTables); buildJoinSql(sqlBuilder, queryWrapper, allTables);
@ -565,7 +565,7 @@ public class CommonsDialectImpl implements IDialect {
//逻辑删除条件，已删除的数据不能被修改 //逻辑删除条件，已删除的数据不能被修改
String logicDeleteColumn = tableInfo.getLogicDeleteColumn(); String logicDeleteColumn = tableInfo.getLogicDeleteColumn();
if (StringUtil.isNotBlank(logicDeleteColumn)) { if (StringUtil.isNotBlank(logicDeleteColumn)) {
sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_NORMAL); sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_NORMAL);
} }
//乐观锁条件 //乐观锁条件
@ -623,7 +623,7 @@ public class CommonsDialectImpl implements IDialect {
//逻辑删除条件，已删除的数据不能被修改 //逻辑删除条件，已删除的数据不能被修改
String logicDeleteColumn = tableInfo.getLogicDeleteColumn(); String logicDeleteColumn = tableInfo.getLogicDeleteColumn();
if (StringUtil.isNotBlank(logicDeleteColumn)) { if (StringUtil.isNotBlank(logicDeleteColumn)) {
queryWrapper.and(new StringQueryCondition(wrap(logicDeleteColumn) + " = " + FlexConsts.DEL_STATUS_NORMAL)); queryWrapper.and(new StringQueryCondition(wrap(logicDeleteColumn) + " = " + FlexConsts.LOGIC_DELETE_NORMAL));
} }
sql.append(buildWhereConditionSql(queryWrapper)); sql.append(buildWhereConditionSql(queryWrapper));
@ -647,7 +647,7 @@ public class CommonsDialectImpl implements IDialect {
//逻辑删除的情况下，需要添加逻辑删除的条件 //逻辑删除的情况下，需要添加逻辑删除的条件
String logicDeleteColumn = tableInfo.getLogicDeleteColumn(); String logicDeleteColumn = tableInfo.getLogicDeleteColumn();
if (StringUtil.isNotBlank(logicDeleteColumn)) { if (StringUtil.isNotBlank(logicDeleteColumn)) {
sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_NORMAL); sql.append(" AND ").append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_NORMAL);
} }
return sql.toString(); return sql.toString();
@ -663,7 +663,7 @@ public class CommonsDialectImpl implements IDialect {
String logicDeleteColumn = tableInfo.getLogicDeleteColumn(); String logicDeleteColumn = tableInfo.getLogicDeleteColumn();
if (StringUtil.isNotBlank(logicDeleteColumn)) { if (StringUtil.isNotBlank(logicDeleteColumn)) {
sql.append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.DEL_STATUS_NORMAL); sql.append(wrap(logicDeleteColumn)).append(" = ").append(FlexConsts.LOGIC_DELETE_NORMAL);
sql.append(" AND ("); sql.append(" AND (");
} }