开始迁移字典类型模块

src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java

@@ -0,0 +1,35 @@
+package cn.iocoder.dashboard.framework.dict.core.service;
+
+import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+
+import java.util.List;
+
+public interface DictDataFrameworkService {
+
+    /**
+     * 获得指定的字典数据，从缓存中
+     *
+     * @param type 字典类型
+     * @param value 字典数据值
+     * @return 字典数据
+     */
+    SysDictDataDO getDictDataFromCache(String type, String value);
+
+    /**
+     * 解析获得指定的字典数据，从缓存中
+     *
+     * @param type 字典类型
+     * @param label 字典数据标签
+     * @return 字典数据
+     */
+    SysDictDataDO parseDictDataFromCache(String type, String label);
+
+    /**
+     * 获得指定类型的字典数据，从缓存中
+     *
+     * @param type 字典类型
+     * @return 字典数据列表
+     */
+    List<SysDictDataDO> listDictDatasFromCache(String type);
+
+}

src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java

@@ -0,0 +1,19 @@
+package cn.iocoder.dashboard.framework.dict.core.util;
+
+import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 字典工具类
+ */
+@Slf4j
+public class DictUtils {
+
+    private static DictDataFrameworkService service;
+
+    public static void init(DictDataFrameworkService service) {
+        DictUtils.service = service;
+        log.info("[init][初始化 DictUtils 成功]");
+    }
+
+}

src/main/java/cn/iocoder/dashboard/framework/dict/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 字典数据模块
+ *
+ * 通过将字典缓存在内存中，保证性能
+ */
+package cn.iocoder.dashboard.framework.dict;

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.modules.system.controller.dict;
 
 import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.modules.system.controller.dict.vo.SysDataDictSimpleVO;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDataDictSimpleVO;
 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
@@ -16,7 +16,7 @@ import java.util.List;
 
 import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
 
-@Api(tags = "数据字典 API")
+@Api(tags = "字典数据 API")
 @RestController
 @RequestMapping("/system/dict-data")
 public class SysDictDataController {
@@ -32,4 +32,74 @@ public class SysDictDataController {
         return success(SysDictDataConvert.INSTANCE.convertList(list));
     }
 
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysDictData dictData) {
+//        startPage();
+//        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+//        return getDataTable(list);
+//    }
+//
+//    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+//    @GetMapping("/export")
+//    public AjaxResult export(SysDictData dictData) {
+//        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+//        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+//        return util.exportExcel(list, "字典数据");
+//    }
+//
+//    /**
+//     * 查询字典数据详细
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+//    @GetMapping(value = "/{dictCode}")
+//    public AjaxResult getInfo(@PathVariable Long dictCode) {
+//        return AjaxResult.success(dictDataService.selectDictDataById(dictCode));
+//    }
+//
+//    /**
+//     * 根据字典类型查询字典数据信息
+//     */
+//    @GetMapping(value = "/type/{dictType}")
+//    public AjaxResult dictType(@PathVariable String dictType) {
+//        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+//        if (StringUtils.isNull(data)) {
+//            data = new ArrayList<SysDictData>();
+//        }
+//        return AjaxResult.success(data);
+//    }
+//
+//    /**
+//     * 新增字典类型
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+//    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
+//        dict.setCreateBy(SecurityUtils.getUsername());
+//        return toAjax(dictDataService.insertDictData(dict));
+//    }
+//
+//    /**
+//     * 修改保存字典类型
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+//    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
+//        dict.setUpdateBy(SecurityUtils.getUsername());
+//        return toAjax(dictDataService.updateDictData(dict));
+//    }
+//
+//    /**
+//     * 删除字典类型
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+//    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{dictCodes}")
+//    public AjaxResult remove(@PathVariable Long[] dictCodes) {
+//        return toAjax(dictDataService.deleteDictDataByIds(dictCodes));
+//    }
+
 }

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java

@@ -0,0 +1,91 @@
+package cn.iocoder.dashboard.modules.system.controller.dict;
+
+import cn.iocoder.dashboard.common.pojo.CommonResult;
+import cn.iocoder.dashboard.common.pojo.PageResult;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeRespVO;
+import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO;
+import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
+import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.dashboard.common.pojo.CommonResult.success;
+
+@Api(tags = "字典类型 API")
+@RestController
+@RequestMapping("/system/dict-type")
+public class SysDictTypeController {
+
+    @Resource
+    private SysDictTypeService dictTypeService;
+
+    @ApiOperation("/page")
+    @GetMapping("/list")
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Validated SysDictTypePageReqVO reqVO) {
+        return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.pageDictTypes(reqVO)));
+    }
+
+    @ApiOperation("/查询字典详细")
+    @ApiImplicitParam(name = "id", value = "编号", readOnly = true, example = "1024")
+    @GetMapping(value = "/get")
+//    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) {
+        return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id)));
+    }
+
+    @ApiOperation("新增字典类型")
+    @PostMapping("/create")
+//    @PreAuthorize("@ss.hasPermi('system:dict:add')")
+//    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    public CommonResult<Long> createDictType(@Validated @RequestBody SysDictTypeCreateReqVO reqVO) {
+        Long dictTypeId = dictTypeService.createDictType(reqVO);
+        return success(dictTypeId);
+    }
+
+    @ApiOperation("修改字典类型")
+    @PostMapping("update")
+//    @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+//    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    public CommonResult<Boolean> updateDictType(@Validated @RequestBody SysUserUpdateReqVO reqVO) {
+        dictTypeService.updateDictType(reqVO);
+        return success(true);
+    }
+
+    @ApiOperation("删除字典类型")
+    @ApiImplicitParam(name = "id", value = "编号", readOnly = true, example = "1024")
+    @PostMapping("/delete")
+//    @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+    public CommonResult<Boolean> deleteDictType(Long id) {
+        dictTypeService.deleteDictType(id);
+        return success(true);
+    }
+
+
+//    /**
+//     * 获取字典选择框列表
+//     */
+//    @GetMapping("/optionselect")
+//    public AjaxResult optionselect() {
+//        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+//        return AjaxResult.success(dictTypes);
+//    }
+
+    //
+//    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('system:dict:export')")
+//    @GetMapping("/export")
+//    public AjaxResult export(SysDictType dictType) {
+//        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+//        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+//        return util.exportExcel(list, "字典类型");
+//    }
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDataDictSimpleVO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.controller.dict.vo;
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.data;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeBaseVO.java

@@ -0,0 +1,32 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import cn.iocoder.dashboard.framework.excel.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * 字典类型 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class SysDictTypeBaseVO {
+
+    @ApiModelProperty(value = "字典名称", required = true, example = "性别")
+    @NotBlank(message = "字典名称不能为空")
+    @Size(max = 100, message = "字典类型名称长度不能超过100个字符")
+    private String name;
+
+    @ApiModelProperty(value = "字典类型", required = true, example = "sys_common_sex")
+    @NotBlank(message = "字典类型不能为空")
+    @Size(max = 100, message = "字典类型类型长度不能超过100个字符")
+    private String type;
+
+    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "参见 CommonStatusEnum 枚举类")
+    @NotBlank(message = "状态不能为空")
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private Integer status;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java

@@ -0,0 +1,11 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@ApiModel("字典类型创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysDictTypeCreateReqVO extends SysDictTypeBaseVO {
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelRespVO.java

@@ -0,0 +1,24 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import cn.iocoder.dashboard.framework.excel.Excel;
+import lombok.Data;
+
+/**
+ * 字典类型 Excel 导出响应 VO
+ */
+@Data
+public class SysDictTypeExcelRespVO {
+
+    @Excel(name = "字典主键", cellType = Excel.ColumnType.NUMERIC)
+    private Long id;
+
+    @Excel(name = "字典名称")
+    private String name;
+
+    @Excel(name = "字典类型")
+    private String type;
+
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private Integer status;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypePageReqVO.java

@@ -0,0 +1,17 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("字典类型分页列表 Request VO")
+@Data
+public class SysDictTypePageReqVO {
+
+    @ApiModelProperty(value = "字典类型名称", example = "芋道", notes = "模糊匹配")
+    private String name;
+
+    @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 SysCommonStatusEnum 枚举类")
+    private Integer status;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeRespVO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@ApiModel("字典类型信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysDictTypeRespVO extends SysDictTypeBaseVO {
+
+    @ApiModelProperty(value = "字典类型编号", required = true, example = "1024")
+    private Integer id;
+
+    @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
+    private Date createTime;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java

@@ -0,0 +1,21 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@ApiModel("字典类型精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysDictTypeSimpleRespVO {
+
+    @ApiModelProperty(value = "字典类型编号", required = true, example = "1024")
+    private Integer id;
+
+    @ApiModelProperty(value = "字典类型名称", required = true, example = "芋道")
+    private String name;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java

@@ -0,0 +1,19 @@
+package cn.iocoder.dashboard.modules.system.controller.dict.vo.type;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel("字典类型更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysDictTypeUpdateReqVO extends SysDictTypeBaseVO {
+
+    @ApiModelProperty(value = "字典类型编号", required = true, example = "1024")
+    @NotNull(message = "字典类型编号不能为空")
+    private Long id;
+
+}

src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.modules.system.convert.dict;
 
-import cn.iocoder.dashboard.modules.system.controller.dict.vo.SysDataDictSimpleVO;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDataDictSimpleVO;
 import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java

@@ -0,0 +1,18 @@
+package cn.iocoder.dashboard.modules.system.convert.dict;
+
+import cn.iocoder.dashboard.common.pojo.PageResult;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeRespVO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface SysDictTypeConvert {
+
+    SysDictTypeConvert INSTANCE = Mappers.getMapper(SysDictTypeConvert.class);
+
+    PageResult<SysDictTypeRespVO> convertPage(PageResult<SysDictTypeDO> bean);
+
+    SysDictTypeRespVO convert(SysDictTypeDO bean);
+
+}

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

@@ -1,7 +1,6 @@
 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.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,9 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 /**
  * 字典类型表
  *
@@ -26,29 +22,21 @@ public class SysDictTypeDO extends BaseDO {
      * 字典主键
      */
     @TableId
-    @Excel(name = "字典主键", cellType = Excel.ColumnType.NUMERIC)
     private Long id;
     /**
      * 字典名称
      */
-    @Excel(name = "字典名称")
-    @NotBlank(message = "字典名称不能为空")
-    @Size(max = 100, message = "字典类型名称长度不能超过100个字符")
     private String name;
     /**
      * 字典类型
      */
     @TableField("dict_type")
-    @Excel(name = "字典类型")
-    @NotBlank(message = "字典类型不能为空")
-    @Size(max = 100, message = "字典类型类型长度不能超过100个字符")
     private String type;
     /**
      * 状态
      *
      * 枚举 {@link CommonStatusEnum}
      */
-    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private Integer status;
 
 }

src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java

@@ -0,0 +1,26 @@
+package cn.iocoder.dashboard.modules.system.service.dict;
+
+import cn.iocoder.dashboard.common.pojo.PageResult;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCreateReqVO;
+import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
+import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserUpdateReqVO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+
+/**
+ * 字典类型 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface SysDictTypeService {
+
+    PageResult<SysDictTypeDO> pageDictTypes(SysDictTypePageReqVO reqVO);
+
+    SysDictTypeDO getDictType(Long id);
+
+    Long createDictType(SysDictTypeCreateReqVO reqVO);
+
+    void updateDictType(SysUserUpdateReqVO reqVO);
+
+    void deleteDictType(Long id);
+
+}