From e6feea6dbf912f4f01db4821d0cba65dc715179a Mon Sep 17 00:00:00 2001 From: yang <1175@qq.com> Date: Sat, 14 Sep 2024 12:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96=EF=BC=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/boecase/api/CasesApi.java | 4 ++-- .../java/com/xboe/module/boecase/dao/CasesRankDao.java | 2 +- .../java/com/xboe/module/boecase/entity/CasesRank.java | 4 ++-- .../com/xboe/module/boecase/service/ICasesService.java | 2 +- .../module/boecase/service/impl/CasesServiceImpl.java | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 441923e1..70291073 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -698,8 +698,8 @@ public class CasesApi extends ApiBaseController { * 所有上榜的的(专业ID-时间), 用于下拉框.优化可将majorName一并查询，返回为List> todo by anyone */ @GetMapping("/queryAllTimePopularityOfMajor") - public JsonResponse>> queryAllTimePopularityOfMajor() { - Map> time = casesService.queryAllTimePopularityOfMajor(); + public JsonResponse>> queryAllTimePopularityOfMajor() { + Map> time = casesService.queryAllTimePopularityOfMajor(); return success(time); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java index 98c5b576..4669fe76 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java @@ -35,7 +35,7 @@ public class CasesRankDao extends BaseDao { casesRank.setMajorName(o[0].toString()); casesRank.setRiseRankTime(((Timestamp) o[1]).toLocalDateTime()); casesRank.setRank(Integer.valueOf(o[2].toString())); - casesRank.setMajorId(Long.valueOf(o[3].toString())); + casesRank.setMajorId(o[3].toString()); resultList.add(casesRank); } return resultList; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java index 51baf8dc..0d3a3cfc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java @@ -33,7 +33,7 @@ public class CasesRank extends BaseEntity { * 专业ID */ @Column(name = "major_id") - private Long majorId; + private String majorId; /** * 排名 @@ -54,7 +54,7 @@ public class CasesRank extends BaseEntity { @Transient private String majorName; - public CasesRank(Long majorId, LocalDateTime riseRankTime) { + public CasesRank(String majorId, LocalDateTime riseRankTime) { this.majorId = majorId; this.riseRankTime = riseRankTime; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java index aebdf2c7..659174ea 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java @@ -139,6 +139,6 @@ public interface ICasesService{ PageList browsingHistory(Integer pageIndex, Integer pageSize, String accountId, HttpServletRequest request); - Map> queryAllTimePopularityOfMajor(); + Map> queryAllTimePopularityOfMajor(); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index e9d13cf1..7d5592a0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -1188,13 +1188,13 @@ public class CasesServiceImpl implements ICasesService { .map(o -> { CasesRank casesRank = new CasesRank(); casesRank.setCaseId(Long.valueOf(Array.get(o, 0).toString())); - casesRank.setMajorId(Long.valueOf(Array.get(o, 1).toString())); + casesRank.setMajorId(Array.get(o, 1).toString()); casesRank.setMonthlyIncrement(Integer.parseInt(Array.get(o, 2).toString())); casesRank.setRiseRankTime(lastDayOfLastMonth); return casesRank; }).collect(Collectors.toList()); // 根据专业分类进行分组 - Map> casesRankMap = casesRankList.stream().collect(Collectors.groupingBy(CasesRank::getMajorId)); + Map> casesRankMap = casesRankList.stream().collect(Collectors.groupingBy(CasesRank::getMajorId)); // 生成当前月不同分类的最新的浏览量排名 ArrayList lastMonthRank = new ArrayList<>(); @@ -1488,7 +1488,7 @@ public class CasesServiceImpl implements ICasesService { } @Override - public Map> queryAllTimePopularityOfMajor() { + public Map> queryAllTimePopularityOfMajor() { QueryBuilder builder = QueryBuilder.from(CasesRank.class); builder.addField("new CasesRank(majorId,riseRankTime)"); builder.addFilter(FieldFilters.eq("deleted",false)); @@ -1498,7 +1498,7 @@ public class CasesServiceImpl implements ICasesService { // 定义日期时间的格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy-MM"); - Map> collect = list.stream().collect(Collectors.groupingBy + Map> collect = list.stream().collect(Collectors.groupingBy (CasesRank::getMajorId, Collectors.mapping(casesRank -> casesRank.getRiseRankTime().format(formatter), Collectors.toList()))); return collect;