From 29e17a2629549bcf0906aa0bb114a4ec8d5b0632 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Tue, 16 Jul 2024 15:36:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SchisandraFileHeatmapDomainServiceImpl.java | 5 ++++- .../basic/service/SchisandraFileHeatmapService.java | 4 ++-- .../impl/SchisandraFileHeatmapServiceImpl.java | 12 +++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java index 9401bda..dfe2018 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java @@ -1,6 +1,7 @@ package com.schisandra.oss.domain.service.impl; import cn.hutool.core.io.unit.DataSizeUtil; +import com.mybatisflex.core.row.Row; import com.schisandra.oss.domain.convert.SchisandraFileHeatmapBOConverter; import com.schisandra.oss.domain.bo.SchisandraFileHeatmapBO; import com.schisandra.oss.domain.redis.RedisUtil; @@ -202,7 +203,9 @@ public class SchisandraFileHeatmapDomainServiceImpl implements SchisandraFileHea @Override public HashMap selectFileDiagramPerMonth(String userId,int type) { - return schisandraFileHeatmapService.selectFileDiagramPerMonth(userId, type); + HashMap map=new HashMap<>(); + map.put("month",schisandraFileHeatmapService.selectFileDiagramPerMonth(userId, type)); + return map; } @Override public List> selectRecentPreviewFile(String userId) { diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraFileHeatmapService.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraFileHeatmapService.java index 1f83099..bb853a8 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraFileHeatmapService.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraFileHeatmapService.java @@ -1,8 +1,8 @@ package com.schisandra.oss.infra.basic.service; +import com.mybatisflex.core.row.Row; import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap; -import java.util.HashMap; import java.util.List; /** @@ -57,6 +57,6 @@ public interface SchisandraFileHeatmapService { Long selectUserUploadAndDownloadflow (String userId,int type); Long selectUserUploadAndDownloadCount(String userId ,int type); - HashMapselectFileDiagramPerMonth(String userId,int type); + List selectFileDiagramPerMonth(String userId, int type); } diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraFileHeatmapServiceImpl.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraFileHeatmapServiceImpl.java index 857cb55..decd576 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraFileHeatmapServiceImpl.java +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraFileHeatmapServiceImpl.java @@ -1,7 +1,7 @@ package com.schisandra.oss.infra.basic.service.impl; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.row.Db; +import com.mybatisflex.core.row.Row; import com.schisandra.oss.infra.basic.dao.SchisandraFileHeatmapDao; import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap; import com.schisandra.oss.infra.basic.entity.table.SchisandraFileHeatmapTableDef; @@ -9,13 +9,9 @@ import com.schisandra.oss.infra.basic.service.SchisandraFileHeatmapService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.List; import static com.mybatisflex.core.query.QueryMethods.*; -import static io.lettuce.core.protocol.CommandKeyword.DB; /** * 文件上传热力图表 表服务实现类 @@ -114,7 +110,7 @@ public class SchisandraFileHeatmapServiceImpl implements SchisandraFileHeatmapSe } @Override - public HashMap selectFileDiagramPerMonth(String userId, int type) { + public List selectFileDiagramPerMonth(String userId, int type) { QueryWrapper queryFlow = new QueryWrapper().select(sum(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.COUNT).as("count"), dateFormat(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.UPDATE_TIME,"%Y-%m").as("date")) .from(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP) @@ -122,9 +118,7 @@ public class SchisandraFileHeatmapServiceImpl implements SchisandraFileHeatmapSe .where(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.USER_ID.eq(userId)) .and(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.TYPE.eq(type)); - HashMap map = new HashMap<>(); - map.put("month", schisandraFileHeatmapDao.selectRowsByQuery(queryFlow)); - return map; + return schisandraFileHeatmapDao.selectRowsByQuery(queryFlow); }