添加首页统计模块 统计近一周

bill-manager/src/main/java/com/mortals/xhx/daemon/task/SiteStatTaskImpl.java

@@ -47,7 +47,7 @@ public class SiteStatTaskImpl implements ITaskExcuteService {
     public void excuteTask(ITask task) throws AppException {
         log.info("站点评价统计任务");
         //统计最近一周
-        for (int i = 0; i < 7; i++) {
+        for (int i = 0; i < 4; i++) {
             DateTime beforeDate = DateUtil.offsetDay(new Date(), -i);
             int year = beforeDate.year();
             int month = beforeDate.month() + 1;

bill-manager/src/main/java/com/mortals/xhx/module/ph/service/impl/PhQueueStatServiceImpl.java

@@ -59,7 +59,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
 
         List<PhQueueEntity> phQueueEntities = phQueueService.find(phQueueQuery);
 
-        log.info("更新站点排队统计数据，站点ID：{}，站点名称：{}，日期：{}，排队数量：{}", entity.getSiteId(), entity.getSiteName(), currentDate, phQueueEntities.size());
+       // log.info("更新站点排队统计数据，站点ID：{}，站点名称：{}，日期：{}，排队数量：{}", entity.getSiteId(), entity.getSiteName(), currentDate, phQueueEntities.size());
         updateSitePhCount(entity, phQueueEntities);
 
         //部门
@@ -123,7 +123,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             List<PhQueueEntity> value = item.getValue();
             Double intAvg = value.stream().mapToInt(e -> e.getWaitTime()).average().orElse(0D);
 
-            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，部门：{}，排队数量：{}", entity.getSiteName(), currentDate, entity.getSectionName(), phQueueEntities.size());
+            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，部门：{}，排队数量：{}", entity.getSiteName(), currentDate,sectionName, phQueueEntities.size());
             PhQueueStatEntity phQueueStatEntity = this.selectOne(new PhQueueStatQuery()
                     .siteId(entity.getSiteId())
                     .sectionName(sectionName)
@@ -168,7 +168,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             if (ObjectUtils.isEmpty(hallName)) return;
             List<PhQueueEntity> value = item.getValue();
             Double intAvg = value.stream().mapToInt(e -> e.getWaitTime()).average().orElse(0D);
-            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，大厅：{}，排队数量：{}", entity.getSiteName(), currentDate, entity.getHallName(), phQueueEntities.size());
+            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，大厅：{}，排队数量：{}", entity.getSiteName(), currentDate, hallName, phQueueEntities.size());
             PhQueueStatEntity phQueueStatEntity = this.selectOne(new PhQueueStatQuery()
                     .siteId(entity.getSiteId())
                     .hallName(hallName)
@@ -213,7 +213,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             if (ObjectUtils.isEmpty(bussiness)) return;
             List<PhQueueEntity> value = item.getValue();
             Double intAvg = value.stream().mapToInt(e -> e.getWaitTime()).average().orElse(0D);
-            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，业务：{}，排队数量：{}", entity.getSiteName(), currentDate, entity.getBusiness(), phQueueEntities.size());
+            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，业务：{}，排队数量：{}", entity.getSiteName(), currentDate, bussiness, phQueueEntities.size());
             PhQueueStatEntity phQueueStatEntity = this.selectOne(new PhQueueStatQuery()
                     .siteId(entity.getSiteId())
                     .business(bussiness)
@@ -257,7 +257,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
             if (ObjectUtils.isEmpty(window)) return;
             List<PhQueueEntity> value = item.getValue();
             Double intAvg = value.stream().mapToInt(e -> e.getWaitTime()).average().orElse(0D);
-            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，业务：{}，排队数量：{}", entity.getSiteName(), currentDate, entity.getBusiness(), phQueueEntities.size());
+            log.info("更新站点排队统计数据，站点名称：{}，日期：{}，窗口：{}，排队数量：{}", entity.getSiteName(), currentDate,window, phQueueEntities.size());
             PhQueueStatEntity phQueueStatEntity = this.selectOne(new PhQueueStatQuery()
                     .siteId(entity.getSiteId())
                     .windowFromnum(window)