Merge pull request '大屏接口响应速率优化' (#58) from zzw-one into master
All checks were successful
continuous-integration/drone/tag Build is passing

Reviewed-on: #58
This commit is contained in:
root 2024-08-29 14:18:57 +08:00
commit fe75d590b9
2 changed files with 7 additions and 7 deletions

View File

@ -20,8 +20,8 @@ public interface CheckTicketRepository extends MongoRepository<CheckTicket,Strin
@Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}") @Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}")
List<CheckTicket> findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day); List<CheckTicket> findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day);
List<CheckTicket> findByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime); Long countByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime);
@Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}") // @Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}")
List<CheckTicket> findByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime); Long countByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime);
} }

View File

@ -41,14 +41,14 @@ public class CheckTicketServiceImpl implements CheckTicketService {
LocalDateTime hourEndTime = hourStartTime.plusHours(1); LocalDateTime hourEndTime = hourStartTime.plusHours(1);
String begintime = formatter.format(hourStartTime); String begintime = formatter.format(hourStartTime);
String resulttime = formatter.format(hourEndTime); String resulttime = formatter.format(hourEndTime);
List<CheckTicket> checkTickets; Long checkTickets;
if (starTime != null && endTime != null && starTime.equals(endTime)){ if (starTime != null && endTime != null && starTime.equals(endTime)){
checkTickets = checkTicketRepository.findByCheckticketdateAndChecktickettimeBetween(starTime,begintime,resulttime); checkTickets = checkTicketRepository.countByCheckticketdateAndChecktickettimeBetween(starTime,begintime,resulttime);
}else { }else {
checkTickets = checkTicketRepository.findByCheckticketdateBetweenAndChecktickettimeBetween(starTime,endTime,begintime,resulttime); checkTickets = checkTicketRepository.countByCheckticketdateBetweenAndChecktickettimeBetween(starTime,endTime,begintime,resulttime);
} }
map.put("date",begintime+"-"+resulttime); map.put("date",begintime+"-"+resulttime);
map.put("count", String.valueOf(checkTickets.stream().count())); map.put("count", String.valueOf(checkTickets));
mapList.add(map); mapList.add(map);
} }