From 251e6a8b0bba18e5a6090eb2462bd22384fa8e6e Mon Sep 17 00:00:00 2001 From: lishangbu Date: Wed, 29 Dec 2021 08:17:18 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E9=83=A8=E5=88=86=E5=85=BC=E5=AE=B9=E6=80=A7=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plus/gaea/curd/entity/GaeaBaseEntity.java | 101 ++++++++++++++++++ .../modules/dict/dao/entity/GaeaDictItem.java | 10 +- .../service/impl/GaeaDictServiceImpl.java | 4 +- 3 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java b/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java new file mode 100644 index 000000000..9ffadc83d --- /dev/null +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java @@ -0,0 +1,101 @@ +package com.anji.plus.gaea.curd.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.util.Date; + +/** + * 基础数据库实体 + * + * @author lr + * @since 2021-01-12 + */ +public class GaeaBaseEntity extends BaseEntity { + + /** + * 数据ID + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 版本号 + * @Version:乐观锁,，需要添加mybatis plus插件optimisticLockerInterceptor + */ + @TableField(fill = FieldFill.INSERT_UPDATE, update = "%s+1") + @Version + private Integer version; + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getVersion() { + return version; + } + + public void setVersion(Integer version) { + this.version = version; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + +} diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java index 6c34c39f8..cc5618910 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/dao/entity/GaeaDictItem.java @@ -60,7 +60,7 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable { /** * 排序 */ - private Integer sort; + private Integer sortOrder; public String getDictCode() { return dictCode; @@ -102,12 +102,12 @@ public class GaeaDictItem extends GaeaBaseEntity implements Serializable { this.remark = remark; } - public Integer getSort() { - return sort; + public Integer getSortOrder() { + return sortOrder; } - public void setSort(Integer sort) { - this.sort = sort; + public void setSortOrder(Integer sortOrder) { + this.sortOrder = sortOrder; } public Integer getEnabled() { diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java index ea4fe4061..dd378a63c 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dict/service/impl/GaeaDictServiceImpl.java @@ -86,7 +86,7 @@ public class GaeaDictServiceImpl implements GaeaDictService { if (CollectionUtils.isEmpty(dictMap)) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(GaeaDictItem::getDictCode, dictCode).eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()) - .eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSort); + .eq(GaeaDictItem::getLocale, language).orderByAsc(GaeaDictItem::getSortOrder); List list = gaeaDictItemMapper.selectList(wrapper); @@ -154,7 +154,7 @@ public class GaeaDictServiceImpl implements GaeaDictService { public Map> all(String language) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(GaeaDictItem::getEnabled, Enabled.YES.getValue()).eq(GaeaDictItem::getLocale, language) - .orderByAsc(GaeaDictItem::getSort); + .orderByAsc(GaeaDictItem::getSortOrder); List list = gaeaDictItemMapper.selectList(wrapper); Map> all = list.stream()