diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java index b73f90c0..75a4d8f5 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java @@ -10,7 +10,7 @@ import com.njcn.gather.system.dictionary.pojo.param.DictTreeParam; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import com.njcn.gather.system.dictionary.pojo.vo.DictTreeVO; import com.njcn.gather.system.dictionary.service.IDictTreeService; -import com.njcn.gather.system.pojo.constant.DictState; +import com.njcn.gather.system.pojo.constant.DictConst; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -34,7 +34,7 @@ public class DictTreeServiceImpl extends ServiceImpl i // @Override // public void refreshDictTreeCache () { // LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(DictTree::getState, DictState.ENABLE); +// queryWrapper.eq(DictTree::getState, DictConst.ENABLE); // List list = this.list(queryWrapper); // redisUtil.saveByKey(AppRedisKey.DICT_TREE, list); // } @@ -45,7 +45,7 @@ public class DictTreeServiceImpl extends ServiceImpl i boolean result; DictTree dictTree = new DictTree(); BeanUtils.copyProperties(dictTreeParam, dictTree); - if (!Objects.equals(dictTree.getPid(), DictState.PARENT_ID)) { + if (!Objects.equals(dictTree.getPid(), DictConst.FATHER_ID)) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", dictTree.getPid()); @@ -55,9 +55,9 @@ public class DictTreeServiceImpl extends ServiceImpl i dictTree.setPids(instance.getPids() + StrPool.COMMA + instance.getId()); } else { - dictTree.setPids(DictState.PARENT_ID); + dictTree.setPids(DictConst.FATHER_ID); } - dictTree.setState(DictState.ENABLE); + dictTree.setState(DictConst.ENABLE); result = this.save(dictTree); // if (result) { // refreshDictTreeCache(); @@ -79,7 +79,7 @@ public class DictTreeServiceImpl extends ServiceImpl i @Override public boolean deleteDictTree(String id) { - boolean result = this.lambdaUpdate().set(DictTree::getState, DictState.DELETE).in(DictTree::getId, id).update(); + boolean result = this.lambdaUpdate().set(DictTree::getState, DictConst.DELETE).in(DictTree::getId, id).update(); // if (result) { // refreshDictTreeCache(); // } @@ -90,7 +90,7 @@ public class DictTreeServiceImpl extends ServiceImpl i public List queryByPid(String pid) { List collect = new ArrayList<>(); LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(DictTree::getPid, pid).eq(DictTree::getState, DictState.ENABLE).orderByDesc(DictTree::getSort); + query.eq(DictTree::getPid, pid).eq(DictTree::getState, DictConst.ENABLE).orderByDesc(DictTree::getSort); List resultList = this.list(query); DictTree byId = this.getById(pid); @@ -110,7 +110,7 @@ public class DictTreeServiceImpl extends ServiceImpl i public DictTreeVO queryByCode(String code) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.clear(); - query.eq(DictTree::getCode, code).eq(DictTree::getState, DictState.ENABLE); + query.eq(DictTree::getCode, code).eq(DictTree::getState, DictConst.ENABLE); DictTree result = this.getOne(query); if (result != null) { @@ -129,29 +129,29 @@ public class DictTreeServiceImpl extends ServiceImpl i @Override public DictTree queryById(String id) { - return this.lambdaQuery().eq(DictTree::getId, id).eq(DictTree::getState, DictState.ENABLE).one(); + return this.lambdaQuery().eq(DictTree::getId, id).eq(DictTree::getState, DictConst.ENABLE).one(); } @Override public List queryAll() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE); + lambdaQueryWrapper.eq(DictTree::getState, DictConst.ENABLE); return this.list(lambdaQueryWrapper); } @Override public List queryAllByType(Integer type) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE).eq(DictTree::getType, type); + lambdaQueryWrapper.eq(DictTree::getState, DictConst.ENABLE).eq(DictTree::getType, type); return this.list(lambdaQueryWrapper); } @Override public List queryTree() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DictTree::getState, DictState.ENABLE); + lambdaQueryWrapper.eq(DictTree::getState, DictConst.ENABLE); List dictTreeList = this.list(lambdaQueryWrapper); - return dictTreeList.stream().filter(item -> DictState.PARENT_ID.equals(item.getPid())).peek(item -> { + return dictTreeList.stream().filter(item -> DictConst.FATHER_ID.equals(item.getPid())).peek(item -> { item.setLevel(0); item.setChildren(getChildren(item, dictTreeList)); }).collect(Collectors.toList()); diff --git a/system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java b/system/src/main/java/com/njcn/gather/system/pojo/constant/DictConst.java similarity index 82% rename from system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java rename to system/src/main/java/com/njcn/gather/system/pojo/constant/DictConst.java index 103f257d..b44c542c 100644 --- a/system/src/main/java/com/njcn/gather/system/pojo/constant/DictState.java +++ b/system/src/main/java/com/njcn/gather/system/pojo/constant/DictConst.java @@ -4,7 +4,7 @@ package com.njcn.gather.system.pojo.constant; * @author caozehui * @data 2024/11/8 */ -public interface DictState { +public interface DictConst { /** * 状态 0-正常;1-停用;2-删除 默认正常 */ @@ -17,5 +17,5 @@ public interface DictState { /** * 顶层父类的pid */ - String PARENT_ID = "0"; + String FATHER_ID = "0"; }