From 350921dbe68840832129d04519a3a996999a095f Mon Sep 17 00:00:00 2001 From: yang <1175@qq.com> Date: Tue, 10 Sep 2024 19:15:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E8=90=83=E5=8F=96=EF=BC=8C?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8E=92=E8=A1=8C=E4=B8=8E=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/dao/CasesRecordDao.java | 4 ++-- .../boecase/service/impl/CasesServiceImpl.java | 12 ++++++------ .../module/boecase/vo/CaseViewRankingItemVo.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java index 0dd0ca46..7d0ae946 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -27,7 +27,7 @@ public interface CasesRecordDao extends JpaRepository, 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, 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}, '') != '', " + 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 f49afc09..f9520d5e 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 @@ -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 caseListOfObject = casesDao.sqlFindList(sql); // 转为casesRank List 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 caseIdList = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime,majorId); QueryBuilder query = QueryBuilder.from(Cases.class); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseViewRankingItemVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseViewRankingItemVo.java index ec038370..a7657d6b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseViewRankingItemVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseViewRankingItemVo.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; @Data public class CaseViewRankingItemVo { - private Long majorId; + private String majorId; private String majorName;