1. 完成字典类型的迁移

2. 开始字典数据的迁移

src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictDataMapper.java

@@ -1,9 +1,39 @@
 package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
 
+import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
+import static com.baomidou.mybatisplus.core.metadata.OrderItem.asc;
+
 @Mapper
 public interface SysDictDataMapper extends BaseMapper<SysDictDataDO> {
+
+    default SysDictDataDO selectByLabel(String label) {
+        return selectOne(new QueryWrapper<SysDictDataDO>().eq("label", label));
+    }
+
+    default int selectCountByDictType(String dictType) {
+        return selectCount(new QueryWrapper<SysDictDataDO>().eq("dict_type", dictType));
+    }
+
+    default IPage<SysDictDataDO> selectList(SysDictDataPageReqVO reqVO) {
+        return selectPage(MyBatisUtils.buildPage(reqVO),
+                new QueryWrapperX<SysDictDataDO>().likeIfPresent("label", reqVO.getLabel())
+                        .likeIfPresent("dict_type", reqVO.getDictType())
+                        .eqIfPresent("status", reqVO.getStatus()))
+                .addOrder(asc("dict_type"), asc("sort"));
+    }
+
+    default List<SysDictDataDO> selectList() {
+        return selectList(new QueryWrapper<>());
+    }
+
 }

src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictTypeMapper.java

@@ -0,0 +1,30 @@
+package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
+
+import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.dashboard.framework.mybatis.core.util.MyBatisUtils;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysDictTypeMapper extends BaseMapper<SysDictTypeDO> {
+
+    default IPage<SysDictTypeDO> selectList(SysDictTypePageReqVO reqVO) {
+        return selectPage(MyBatisUtils.buildPage(reqVO),
+                new QueryWrapperX<SysDictTypeDO>().likeIfPresent("name", reqVO.getName())
+                        .likeIfPresent("dict_type", reqVO.getType())
+                        .eqIfPresent("status", reqVO.getStatus())
+                        .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime()));
+    }
+
+    default SysDictTypeDO selectByType(String type) {
+        return selectOne(new QueryWrapperX<SysDictTypeDO>().eq("dict_type", type));
+    }
+
+    default SysDictTypeDO selectByName(String name) {
+        return selectOne(new QueryWrapperX<SysDictTypeDO>().eq("name", name));
+    }
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictDataDO.java

@@ -1,16 +1,12 @@
 package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
-import cn.iocoder.dashboard.framework.excel.Excel;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 /**
  * 字典数据表
  *
@@ -22,45 +18,33 @@ import javax.validation.constraints.Size;
 public class SysDictDataDO extends BaseDO {
 
     /**
-     * 字典编码
+     * 字典数据编号
      */
     @TableId
-    @Excel(name = "字典编码", cellType = Excel.ColumnType.NUMERIC)
     private Long id;
     /**
      * 字典排序
      */
-    @Excel(name = "字典排序", cellType = Excel.ColumnType.NUMERIC)
     private Integer sort;
     /**
      * 字典标签
      */
-    @Excel(name = "字典标签")
-    @NotBlank(message = "字典标签不能为空")
-    @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;
     /**
      * 字典值
      */
-    @Excel(name = "字典键值")
-    @NotBlank(message = "字典键值不能为空")
-    @Size(max = 100, message = "字典键值长度不能超过100个字符")
     private String value;
     /**
      * 字典类型
      *
      * 冗余 {@link SysDictDataDO#getDictType()}
      */
-    @Excel(name = "字典类型")
-    @NotBlank(message = "字典类型不能为空")
-    @Size(max = 100, message = "字典类型长度不能超过100个字符")
     private String dictType;
     /**
      * 状态
      *
      * 枚举 {@link CommonStatusEnum}
      */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private Integer status;
     /**
      * 备注

src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictTypeDO.java

@@ -38,5 +38,9 @@ public class SysDictTypeDO extends BaseDO {
      * 枚举 {@link CommonStatusEnum}
      */
     private Integer status;
+    /**
+     * 备注
+     */
+    private String remark;
 
 }