diff --git a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysDictData.java b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysDictData.java index e82aed1..e33d6fc 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysDictData.java +++ b/mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysDictData.java @@ -53,6 +53,10 @@ public class SysDictData extends BaseEntity @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; + /** + * 父级ID标志 + */ + @Excel(name = "父级ID标志") private Integer partId; public Integer getPartId() { diff --git a/mcwl-system/src/main/java/com/mcwl/system/init/DictInit.java b/mcwl-system/src/main/java/com/mcwl/system/init/DictInit.java index 1caedcb..038184f 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/init/DictInit.java +++ b/mcwl-system/src/main/java/com/mcwl/system/init/DictInit.java @@ -31,7 +31,13 @@ public class DictInit implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { + this.dict(); + } + //初始化防擦 + public void dict(){ + + long startTime = System.currentTimeMillis(); // 记录开始时间 log.info("初始化字典数据..."); SysDictData dictData = new SysDictData(); @@ -53,7 +59,8 @@ public class DictInit implements ApplicationRunner { )); dictCache.put(type, subMap); }); - log.info("字典数据初始化完成..."); + long cost = System.currentTimeMillis() - startTime; // 计算耗时 + log.info("字典数据初始化完成,耗时 {} 毫秒", cost); // 打印耗时 } /** diff --git a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysDictDataServiceImpl.java b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysDictDataServiceImpl.java index d492aee..e89015d 100644 --- a/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysDictDataServiceImpl.java +++ b/mcwl-system/src/main/java/com/mcwl/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,14 @@ package com.mcwl.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.mcwl.common.core.domain.entity.SysDictData; import com.mcwl.common.utils.DictUtils; +import com.mcwl.system.init.DictInit; import com.mcwl.system.mapper.SysDictDataMapper; import com.mcwl.system.service.ISysDictDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 字典 业务层处理 @@ -19,6 +21,9 @@ public class SysDictDataServiceImpl implements ISysDictDataService @Autowired private SysDictDataMapper dictDataMapper; + @Autowired + private DictInit dictInit; + /** * 根据条件分页查询字典数据 * @@ -70,6 +75,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService dictDataMapper.deleteDictDataById(dictCode); List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); DictUtils.setDictCache(data.getDictType(), dictDatas); + //初始化字典 + dictInit.dict(); } } @@ -87,6 +94,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); DictUtils.setDictCache(data.getDictType(), dictDatas); + //初始化字典 + dictInit.dict(); } return row; } @@ -105,6 +114,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { List dictDatas = dictDataMapper.selectDictDataByType(data.getDictType()); DictUtils.setDictCache(data.getDictType(), dictDatas); + //初始化字典表 + dictInit.dict(); } return row; } diff --git a/mcwl-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/mcwl-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 21cd6d8..330817b 100644 --- a/mcwl-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/mcwl-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -32,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dict_type = #{dictType} + + AND part_id = #{partId} + AND dict_label like concat('%', #{dictLabel}, '%') @@ -106,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, remark, create_by, + part_id, create_time )values( #{dictSort}, @@ -118,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, + #{partId}, sysdate() )