hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-06 09:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy-0913-yang-case'

Browse Source
This commit is contained in:
nisen
2024-09-14 13:04:00 +08:00
parent 012f987de0 e6feea6dbf
commit cb0e784d5e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java
View File

@@ -698,8 +698,8 @@ public class CasesApi extends ApiBaseController {
* 所有上榜的的(专业ID-时间), 用于下拉框.优化可将majorName一并查询，返回为List<List<Entity>> todo by anyone
*/
@GetMapping("/queryAllTimePopularityOfMajor")
public JsonResponse<Map<Long, List<String>>> queryAllTimePopularityOfMajor() {
Map<Long, List<String>> time = casesService.queryAllTimePopularityOfMajor();
public JsonResponse<Map<String, List<String>>> queryAllTimePopularityOfMajor() {
Map<String, List<String>> time = casesService.queryAllTimePopularityOfMajor();
return success(time);
}

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java
View File

@@ -35,7 +35,7 @@ public class CasesRankDao extends BaseDao<CasesRank> {
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;

4
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRank.java
View File

@@ -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;
}

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesService.java
View File

@@ -139,6 +139,6 @@ public interface ICasesService{
PageList<CasesBrowsingHistoryVo> browsingHistory(Integer pageIndex, Integer pageSize, String accountId, HttpServletRequest request);
Map<Long, List<String>> queryAllTimePopularityOfMajor();
Map<String, List<String>> queryAllTimePopularityOfMajor();
}

8
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
View File

@@ -1194,13 +1194,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<Long, List<CasesRank>> casesRankMap = casesRankList.stream().collect(Collectors.groupingBy(CasesRank::getMajorId));
Map<String, List<CasesRank>> casesRankMap = casesRankList.stream().collect(Collectors.groupingBy(CasesRank::getMajorId));
// 生成当前月不同分类的最新的浏览量排名
ArrayList<CasesRank> lastMonthRank = new ArrayList<>();
@@ -1494,7 +1494,7 @@ public class CasesServiceImpl implements ICasesService {
}
@Override
public Map<Long, List<String>> queryAllTimePopularityOfMajor() {
public Map<String, List<String>> queryAllTimePopularityOfMajor() {
QueryBuilder builder = QueryBuilder.from(CasesRank.class);
builder.addField("new CasesRank(majorId,riseRankTime)");
builder.addFilter(FieldFilters.eq("deleted",false));
@@ -1504,7 +1504,7 @@ public class CasesServiceImpl implements ICasesService {
// 定义日期时间的格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy-MM");
Map<Long, List<String>> collect = list.stream().collect(Collectors.groupingBy
Map<String, List<String>> collect = list.stream().collect(Collectors.groupingBy
(CasesRank::getMajorId, Collectors.mapping(casesRank -> casesRank.getRiseRankTime().format(formatter), Collectors.toList())));
return collect;