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

Merge branch 'refs/heads/zcwy0813-yang' into dev0525

Browse Source
This commit is contained in:
yang
2024-09-10 19:16:03 +08:00
parent 580e5bd100 350921dbe6
commit 4ac7acb033
3 changed files with 9 additions and 9 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/dao/CasesRecordDao.java
View File

@@ -27,7 +27,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
" FROM boe_cases_recommend_push_record a " +
" LEFT JOIN boe_cases b ON a.case_id = b.id " +
" WHERE b.deleted = 0 " +
" AND a.push_status = 5 " +
" AND a.push_status = 3 " +
" AND a.deleted = 0 " +
" AND a.push_user_id = :#{#condition.userId} " +
" AND IF(IFNULL(:#{#condition.keyWord}, '') != '', " +
@@ -63,7 +63,7 @@ public interface CasesRecordDao extends JpaRepository<Cases, String>, JpaSpecifi
" FROM boe_cases_recommend_push_record a " +
" LEFT JOIN boe_cases b ON a.case_id = b.id " +
" WHERE b.deleted = 0 " +
" AND a.push_status = 5 " +
" AND a.push_status = 3 " +
" AND a.deleted = 0 " +
" AND a.push_user_id = :#{#condition.userId} " +
" AND IF(IFNULL(:#{#condition.keyWord}, '') != '', " +

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

@@ -489,7 +489,7 @@ public class CasesServiceImpl implements ICasesService {
String viewRankTag = time + casesRank.getMajorName() + "类浏览量TOP" + (casesRank.getRank() + 1);
CaseViewRankingItemVo caseViewRankingItemVo = new CaseViewRankingItemVo();
caseViewRankingItemVo.setMajorId(casesRank.getMajorId());
caseViewRankingItemVo.setMajorId(String.valueOf(casesRank.getMajorId()));
caseViewRankingItemVo.setMajorName(casesRank.getMajorName());
caseViewRankingItemVo.setTagName(viewRankTag);
caseViewRankingItemVo.setRiseRankTime(casesRank.getRiseRankTime());
@@ -1158,7 +1158,8 @@ public class CasesServiceImpl implements ICasesService {
@Override
@Transactional(rollbackFor = Exception.class)
public void refreshViewsRankOfMajor(){
LocalDateTime riseRankTime = LocalDateTime.now().withDayOfMonth(1).minusDays(1).toLocalDate().atTime(23, 59, 59); // 上月最后一天的结束时间
// LocalDateTime riseRankTime = LocalDateTime.now().withDayOfMonth(1).minusDays(1).toLocalDate().atTime(23, 59, 59); // 上月最后一天的结束时间
LocalDateTime riseRankTime = LocalDateTime.now().minusMonths(2).minusDays(1).toLocalDate().atTime(23, 59, 59); // 上月最后一天的结束时间
int count = casesRankDao.sqlCount("SELECT count(1) FROM boe_cases_rank WHERE deleted=0 AND rise_rank_time = ?1", riseRankTime);
if (count > 0){
return;
@@ -1166,14 +1167,13 @@ public class CasesServiceImpl implements ICasesService {
//获取案例当月排名
String sql =
"SELECT bc.id,bcmt.major_id,bc.views - COALESCE(bc.last_month_views, 0) AS increment,bc.case_owner\n" +
"SELECT bc.id,bcmt.major_id,bc.views - COALESCE(bc.last_month_views, 0) AS increment\n" +
"FROM boe_cases bc\n" +
"JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0";
"JOIN boe_cases_major_type bcmt ON bcmt.case_id = bc.id and bc.deleted=0 and file_path is not null and file_path!=''";
List<Object> caseListOfObject = casesDao.sqlFindList(sql);
// 转为casesRank
List<CasesRank> casesRankList = caseListOfObject.stream()
.filter(o -> Array.get(o, 3)!=null && StringUtils.isNotBlank(Array.get(o, 3).toString()))
.map(o -> {
CasesRank casesRank = new CasesRank();
casesRank.setCaseId(Long.valueOf(Array.get(o, 0).toString()));
@@ -1253,7 +1253,7 @@ public class CasesServiceImpl implements ICasesService {
}
LocalDateTime startTime = month.withDayOfMonth(1);
LocalDateTime endTime = month.plusMonths(1).minusDays(1);
LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).minusDays(1);
List<String> caseIdList = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime,majorId);
QueryBuilder query = QueryBuilder.from(Cases.class);

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

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
@Data
public class CaseViewRankingItemVo {
private Long majorId;
private String majorId;
private String majorName;