diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/ListHelper.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/ListHelper.java index 4d6d7b4..a18d00c 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/ListHelper.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/aes/ListHelper.java @@ -1,9 +1,11 @@ package com.securitycontrol.common.core.utils.aes; -import org.apache.poi.ss.formula.functions.T; - import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; /** * @author HeiZi @@ -37,4 +39,14 @@ public class ListHelper { return strs; } + /** + * 集合校验 + * @param keyExtractor + * @param + * @return + */ + public static Predicate distinctByKey(Function keyExtractor) { + Map seen = new ConcurrentHashMap<>(10); + return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null; + } } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/DictDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/DictDto.java index b19e4e2..06b9c24 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/DictDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/dto/DictDto.java @@ -1,8 +1,15 @@ package com.securitycontrol.entity.system.dto; +import lombok.Data; + /** * 字典查询 * @author HeiZi */ +@Data public class DictDto { + + private String keyWord; + + private String dictId; } diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/DictVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/DictVo.java new file mode 100644 index 0000000..a8c4a7c --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/DictVo.java @@ -0,0 +1,59 @@ +package com.securitycontrol.entity.system.vo; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * 字典管理 实体类 + * @author HeiZi + */ +@Data +public class DictVo { + /**字典id*/ + private Integer dictId; + + /** + * 字典编码 + */ + private Integer dictCode; + + /** + * 上级节点编码 + */ + private Integer pidCode; + + /** + * 字典名称 + */ + + @NotBlank(message = "字典名称不能为空") + @Length(max = 100,message = "字典名称长度不能超过100个字符") + private String dictName; + /** + * 字典值 + */ + private Integer dictValue; + /** + * 备注 + */ + @Length(max = 100,message = "备注长度不能超过100个字符") + private String remarks; + /** + * 是否删除 + */ + private Integer delFlag; + /** + * 创建时间 + */ + private String createTime; + /** + * 子节点 + */ + private List children; + + + +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml new file mode 100644 index 0000000..cfd7379 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/DictMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + insert into sys_dict (dict_code, dict_name, dict_sort, create_time, del_flag, remarks,p_code) value ( + #{dictCode},#{dictName},#{dictValue},now(),0,#{remarks},#{pidCode} + ) + + + + update sys_dict + set dict_code=#{dictCode},dict_name=#{dictName},dict_sort=#{dictValue},remarks=#{remarks} + where dict_id=#{dictId}; + + + + update sys_dict + set p_code=1 + where dict_id=#{dictId}; + + \ No newline at end of file