From 7401116d78140b7e9bdc965bc229bbbcbe01f7a0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 四月 2025 11:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/CategoryService.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/CategoryService.java b/server/src/main/java/com/doumee/service/business/CategoryService.java
index 6a87833..69d9486 100644
--- a/server/src/main/java/com/doumee/service/business/CategoryService.java
+++ b/server/src/main/java/com/doumee/service/business/CategoryService.java
@@ -3,7 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.vo.CategoryDcaProblemDto;
import com.doumee.dao.web.vo.CategoryVO;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -102,9 +104,15 @@
* @param categoryType
* @return
*/
- List<CategoryVO> getCategoryVOTree(Integer categoryType);
+ List<CategoryVO> getCategoryVOTree(String categoryType,Integer categoryId);
+ List<CategoryDcaProblemDto> findListForDca(Category category);
- List<CategoryVO> getCategoryVOList(Integer categoryType);
+ List<CategoryVO> getCategoryVOList(Integer categoryType,Integer isRoot);
+
+ List<CategoryVO> getCategoryVOForGCXTree(Integer categoryId);
List<Category> treeList(Category param );
+
+ String importDcaBatch(MultipartFile file);
+ String initRedis();
}
--
Gitblit v1.9.3