From 3a34ee483ae977f5714b21d736b93805e6cfa91e Mon Sep 17 00:00:00 2001 From: ls Date: Mon, 18 Nov 2024 15:52:18 +0800 Subject: [PATCH] update --- docker-compose-prod.yml | 2 -- docker-compose.yml | 2 -- .../src/main/resources/application-test.yml | 2 +- .../controller/DocumentLibraryController.java | 2 ++ .../modules/database/entity/DocumentHome.java | 4 ++++ .../service/IDocumentLibraryService.java | 4 ++++ .../service/impl/DocumentLibraryServiceImpl.java | 16 ++++++++++++++++ 7 files changed, 27 insertions(+), 5 deletions(-) diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index cf91fed..4660cb1 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -79,8 +79,6 @@ services: container_name: physical-web image: registry.cn-shanghai.aliyuncs.com/physical/physical-web hostname: physical-web - depends_on: - - physical-launcher networks: - physical-boot ports: diff --git a/docker-compose.yml b/docker-compose.yml index bbbbac8..0b17511 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,8 +79,6 @@ services: container_name: physical-web image: registry.cn-shanghai.aliyuncs.com/physical/physical-web hostname: physical-web - depends_on: - - physical-launcher networks: - physical-boot ports: diff --git a/physical-launcher/src/main/resources/application-test.yml b/physical-launcher/src/main/resources/application-test.yml index e57c0b3..f3308d9 100644 --- a/physical-launcher/src/main/resources/application-test.yml +++ b/physical-launcher/src/main/resources/application-test.yml @@ -249,7 +249,7 @@ jeecg: # minio文件上传 minio: minio_url: http://physical-minio:9000 - minio_public_url: http://58.215.212.230:8005/oss/ + minio_public_url: /oss/ minio_name: root minio_pass: 12345678 bucketName: physical 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 2507904..c3cb88a 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 @@ -59,6 +59,8 @@ public class DocumentLibraryController extends JeecgController latest; @Schema(description = "最近访问") private List recently; + @Schema(description = "文档总计") + private Long total; + @Schema(description = "今日新增") + private Long today; } \ 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 6ebb1a9..cbd9496 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 @@ -14,4 +14,8 @@ import java.util.List; public interface IDocumentLibraryService extends IService { List getLatest(); + + Long getTotal(); + + Long getToday(); } 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 6da214c..5544709 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 @@ -1,13 +1,16 @@ package org.jeecg.modules.database.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.util.DateUtils; import org.jeecg.modules.database.entity.DocumentLibrary; 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; /** @@ -26,4 +29,17 @@ public class DocumentLibraryServiceImpl extends ServiceImpl page = new Page<>(1, 5); return list(page, queryWrapper); } + + @Override + public Long getTotal() { + return count(); + } + + @Override + public Long getToday() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("DATE_FORMAT (create_time,'%Y-%m-%d')", + DateUtils.formatDate(new Date(), "yyyy-MM-dd")); + return count(queryWrapper); + } }