Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 格式修正

Browse Source
This commit is contained in:
zlg
2024-07-16 15:36:36 +08:00
parent c94acc5eff
commit 29e17a2629
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-domain/src/main/java/com/schisandra/oss/domain/service/impl/SchisandraFileHeatmapDomainServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.schisandra.oss.domain.service.impl; package com.schisandra.oss.domain.service.impl;
import cn.hutool.core.io.unit.DataSizeUtil; 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.convert.SchisandraFileHeatmapBOConverter;
import com.schisandra.oss.domain.bo.SchisandraFileHeatmapBO; import com.schisandra.oss.domain.bo.SchisandraFileHeatmapBO;
import com.schisandra.oss.domain.redis.RedisUtil; import com.schisandra.oss.domain.redis.RedisUtil;
@@ -202,7 +203,9 @@ public class SchisandraFileHeatmapDomainServiceImpl implements SchisandraFileHea
@Override @Override
public HashMap<Object, Object> selectFileDiagramPerMonth(String userId,int type) { public HashMap<Object, Object> selectFileDiagramPerMonth(String userId,int type) {
return schisandraFileHeatmapService.selectFileDiagramPerMonth(userId, type); HashMap<Object,Object> map=new HashMap<>();
map.put("month",schisandraFileHeatmapService.selectFileDiagramPerMonth(userId, type));
return map;
} }
@Override @Override
public List<HashMap<Object, Object>> selectRecentPreviewFile(String userId) { public List<HashMap<Object, Object>> selectRecentPreviewFile(String userId) {

4
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/SchisandraFileHeatmapService.java
View File

@@ -1,8 +1,8 @@
package com.schisandra.oss.infra.basic.service; package com.schisandra.oss.infra.basic.service;
import com.mybatisflex.core.row.Row;
import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap; import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
@@ -57,6 +57,6 @@ public interface SchisandraFileHeatmapService {
Long selectUserUploadAndDownloadflow (String userId,int type); Long selectUserUploadAndDownloadflow (String userId,int type);
Long selectUserUploadAndDownloadCount(String userId ,int type); Long selectUserUploadAndDownloadCount(String userId ,int type);
HashMap<Object,Object>selectFileDiagramPerMonth(String userId,int type); List<Row> selectFileDiagramPerMonth(String userId, int type);
} }

12
schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-infra/src/main/java/com/schisandra/oss/infra/basic/service/impl/SchisandraFileHeatmapServiceImpl.java
View File

@@ -1,7 +1,7 @@
package com.schisandra.oss.infra.basic.service.impl; package com.schisandra.oss.infra.basic.service.impl;
import com.mybatisflex.core.query.QueryWrapper; 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.dao.SchisandraFileHeatmapDao;
import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap; import com.schisandra.oss.infra.basic.entity.SchisandraFileHeatmap;
import com.schisandra.oss.infra.basic.entity.table.SchisandraFileHeatmapTableDef; 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 org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import static com.mybatisflex.core.query.QueryMethods.*; 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 @Override
public HashMap<Object,Object> selectFileDiagramPerMonth(String userId, int type) { public List<Row> selectFileDiagramPerMonth(String userId, int type) {
QueryWrapper queryFlow = new QueryWrapper().select(sum(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.COUNT).as("count"), QueryWrapper queryFlow = new QueryWrapper().select(sum(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.COUNT).as("count"),
dateFormat(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.UPDATE_TIME,"%Y-%m").as("date")) dateFormat(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.UPDATE_TIME,"%Y-%m").as("date"))
.from(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP) .from(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP)
@@ -122,9 +118,7 @@ public class SchisandraFileHeatmapServiceImpl implements SchisandraFileHeatmapSe
.where(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.USER_ID.eq(userId)) .where(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.USER_ID.eq(userId))
.and(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.TYPE.eq(type)); .and(SchisandraFileHeatmapTableDef.SCHISANDRA_FILE_HEATMAP.TYPE.eq(type));
HashMap<Object, Object> map = new HashMap<>(); return schisandraFileHeatmapDao.selectRowsByQuery(queryFlow);
map.put("month", schisandraFileHeatmapDao.selectRowsByQuery(queryFlow));
return map;
} }