浏览代码

标签字典

wujiefeng 1 年之前
父节点
当前提交
aff2f63033

+ 3 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/dictionary/AddDictionaryItemParam.java

@@ -31,6 +31,9 @@ public class AddDictionaryItemParam {
     @Schema(name = "name", description = "项名称", example = "15信息1班")
     private String name;
 
+    @Schema(name = "description", description = "描述", example = "班级")
+    private String description;
+
     @Schema(name = "sort", description = "排序", example = "1")
     private Integer sort = 1;
 

+ 6 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/dictionary/DictionaryItemModel.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import org.springframework.stereotype.Indexed;
 
 import java.util.Dictionary;
+import java.util.List;
 
 @Data
 public class DictionaryItemModel {
@@ -32,6 +33,9 @@ public class DictionaryItemModel {
     @Schema(description = "项名称")
     private String name;
 
+    @Schema(name = "description", description = "描述", example = "班级")
+    private String description;
+
     //类型
     @Schema(description = "项类型")
     private DictionaryType type;
@@ -43,4 +47,6 @@ public class DictionaryItemModel {
     //禁用状态
     @Schema(description = "状态")
     private boolean disable;
+
+    private List<DictionaryItemModel> children;
 }

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/dictionary/DictionaryItemDao.java

@@ -16,4 +16,6 @@ public interface DictionaryItemDao extends MongoDao<DictionaryItem>, DictionaryI
     List<DictionaryItem> findTopByDictionary_IdAndKeyIn(String dictionaryId, List<String> keys);
 
     List<DictionaryItem> findByDictionary_Id(String dictionaryId);
+
+    List<DictionaryItem> findByParentId(String parentId);
 }

+ 2 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/dictionary/DictionaryItem.java

@@ -38,6 +38,8 @@ public class DictionaryItem extends SuperEntity {
     //字典项
     private String name;
 
+    private String description;
+
     //类型
     private DictionaryType type;
 

+ 22 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/dictionary/DictionaryService.java

@@ -256,6 +256,28 @@ public class DictionaryService extends SuperService {
         return ResultContent.buildContent(dictionaryItemList.stream().map(this::toItemModel).toList());
     }
 
+    public Object deepTreeItem(String projectId, String dictionaryKey){
+        if (StringUtils.isBlank(dictionaryKey)){
+            return ResultContent.buildFail("字典编码不能为空");
+        }
+
+        Dictionary dictionary = dictionaryDao.findTopByProjectIdAndKey(projectId, dictionaryKey);
+        if (dictionary == null){
+            return ResultContent.buildFail("字典不存在");
+        }
+        if (dictionary.isDisabled()){
+            return ResultContent.buildFail("字典已被禁用");
+        }
+
+        List<DictionaryItem> list = dictionaryItemDao.findByDictionary_Id(dictionary.getId());
+        return null;
+    }
+
+//    private List<DictionaryItemModel> buildTree(String parentId, List<DictionaryItem> list, List<DictionaryItemModel> treeList){
+//
+//        list.for
+//    }
+
 //    /**
 //     * 字典项向下查询
 //     */