diff --git a/physical-launcher/src/main/resources/application-dev.yml b/physical-launcher/src/main/resources/application-dev.yml index 657158a..0243f8a 100644 --- a/physical-launcher/src/main/resources/application-dev.yml +++ b/physical-launcher/src/main/resources/application-dev.yml @@ -230,7 +230,7 @@ jeecg: #webapp文件路径 webapp: /opt/webapp shiro: - excludeUrls: /database/experimentDoc/**,/sys/common/upload,/sys/common/download,/sys/user/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** + excludeUrls: /library/documentLibrary/home,/database/experimentDoc/**,/sys/common/upload,/sys/common/download,/sys/user/**,/test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: accessKey: ?? diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java index c3cb88a..27a0ce6 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/DocumentLibraryController.java @@ -61,6 +61,7 @@ public class DocumentLibraryController extends JeecgController favorite; + private List favorite; @Schema(description = "最新文档") - private List latest; + private List latest; @Schema(description = "最近访问") - private List recently; + private List recently; @Schema(description = "文档总计") - private Long total; + private Long total; @Schema(description = "今日新增") - private Long today; + private Long today; + @Schema(description = "分类文档") + private Map> category; + } \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentLibraryService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentLibraryService.java index cbd9496..0fda50a 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentLibraryService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentLibraryService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.DocumentLibrary; import java.util.List; +import java.util.Map; /** * @Description: 知识库 @@ -18,4 +19,7 @@ public interface IDocumentLibraryService extends IService { Long getTotal(); Long getToday(); + + Map> getCategory(); + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java index a904e85..36d23e9 100755 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java @@ -28,6 +28,7 @@ public class DocumentFavoritesServiceImpl extends ServiceImpl getTopFavoritesByUserId(String userId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DocumentFavorites::getUserId, userId); + queryWrapper.orderByDesc(DocumentFavorites::getCreateTime); Page page = new Page<>(1, 10); List list = list(page, queryWrapper); return list; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java index 5544709..03cd2d5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentLibraryServiceImpl.java @@ -10,8 +10,7 @@ import org.jeecg.modules.database.mapper.DocumentLibraryMapper; import org.jeecg.modules.database.service.IDocumentLibraryService; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @Description: 知识库 @@ -42,4 +41,21 @@ public class DocumentLibraryServiceImpl extends ServiceImpl> getCategory() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNull(DocumentLibrary::getParentId); + queryWrapper.eq(DocumentLibrary::getType, "FOLDER"); + List folderList = list(queryWrapper); + Map> map = new HashMap<>(); + folderList.forEach(folder -> { + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(DocumentLibrary::getParentId, folder.getId()); + queryWrapper1.eq(DocumentLibrary::getType, "DOCUMENT"); + queryWrapper1.orderByDesc(DocumentLibrary::getCreateTime); + map.put(folder.getTitle(), list(queryWrapper1)); + }); + return map; + } }