ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-14 05:01:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化 QueryTypeEnum 枚举值命名

Browse Source
This commit is contained in:
Charles7c
2024-01-23 23:46:34 +08:00
parent 2df4cceedd
commit 9648cf64a4
12 changed files with 82 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/enums/QueryTypeEnum.java
View File

@@ -32,57 +32,70 @@ import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum;
public enum QueryTypeEnum implements IBaseEnum<Integer> {
/**
* 等值查询，例如：WHERE `age` = 18
* 等于 =，例如：WHERE `age` = 18
*/
EQUAL(1, "="),
EQ(1, "="),
/**
* 非等值查询，例如：WHERE `age` != 18
* 不等于 !=，例如：WHERE `age` != 18
*/
NOT_EQUAL(2, "!="),
NE(2, "!="),
/**
* 大于查询，例如：WHERE `age` > 18
* 大于 >，例如：WHERE `age` > 18
*/
GREATER_THAN(3, ">"),
GT(3, ">"),
/**
* 小于查询，例如：WHERE `age` < 18
* 大于等于 >= ，例如：WHERE `age` >= 18
*/
LESS_THAN(4, "<"),
GE(4, ">="),
/**
* 大于等于查询，例如：WHERE `age` >= 18
* 小于 <，例如：WHERE `age` < 18
*/
GREATER_THAN_OR_EQUAL(5, ">="),
LT(5, "<"),
/**
* 小于等于查询，例如：WHERE `age` <= 18
* 小于等于 <=，例如：WHERE `age` <= 18
*/
LESS_THAN_OR_EQUAL(6, "<="),
LE(6, "<="),
/**
* 范围查询，例如：WHERE `age` BETWEEN 10 AND 18
*/
BETWEEN(7, "BETWEEN"),
/**
* 左模糊查询，例如：WHERE `nickname` LIKE '%s'
* LIKE '%值%'，例如：WHERE `nickname` LIKE '%s%'
*/
LEFT_LIKE(8, "LIKE '%s'"),
LIKE(8, "LIKE '%s%'"),
/**
* 中模糊查询，例如：WHERE `nickname` LIKE '%s%'
* LIKE '%值'，例如：WHERE `nickname` LIKE '%s'
*/
INNER_LIKE(9, "LIKE '%s%'"),
LIKE_LEFT(9, "LIKE '%s'"),
/**
* 右模糊查询，例如：WHERE `nickname` LIKE 's%'
* LIKE '值%'，例如：WHERE `nickname` LIKE 's%'
*/
RIGHT_LIKE(10, "LIKE 's%'"),
LIKE_RIGHT(10, "LIKE 's%'"),
/**
* 包含查询，例如：WHERE `age` IN (10, 20, 30)
*/
IN(11, "IN"),
/**
* 不包含查询，例如：WHERE `age` NOT IN (20, 30)
*/
NOT_IN(12, "NOT IN"),
/**
* 空查询，例如：WHERE `email` IS NULL
*/
IS_NULL(13, "IS NULL"),
/**
* 非空查询，例如：WHERE `email` IS NOT NULL
*/

31
continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java
View File

@@ -16,31 +16,26 @@
package top.charles7c.continew.admin.tool.model.entity;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.meta.Column;
import cn.hutool.setting.dialect.Props;
import cn.hutool.setting.dialect.PropsUtil;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import top.charles7c.continew.admin.tool.enums.FormTypeEnum;
import top.charles7c.continew.admin.tool.enums.QueryTypeEnum;
import top.charles7c.continew.starter.core.constant.StringConstants;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 字段配置实体
*
@@ -160,7 +155,7 @@ public class FieldConfigDO implements Serializable {
this.setShowInForm(isRequired);
this.setShowInQuery(isRequired);
this.setFormType(FormTypeEnum.TEXT);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.INNER_LIKE : QueryTypeEnum.EQUAL);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.LIKE : QueryTypeEnum.EQ);
}
public void setColumnName(String columnName) {