重新调整统计线程实现

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

@@ -31,7 +31,7 @@ public interface PhQueueStatService extends ICRUDService<PhQueueStatEntity, Long
 
     List<PhQueueStatEntity> getBillInfos(PhQueueStatQuery query, PageInfo pageInfo, Context context);
 
-    void saveUpdatePhStatList(List<PhQueueStatEntity> saveAndUpdatelist);
+    void saveUpdatePhStatList(SitePdu site,List<PhQueueStatEntity> saveAndUpdatelist);
 
 
     void updateSitePhStatLog(DateTime attendStart, Long compare, StopWatch stopWatch, SitePdu site, Context context);

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

@@ -378,20 +378,20 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
         return phQueueStatEntity;
     }
 
-
-    public void saveUpdatePhStatList(List<PhQueueStatEntity> saveAndUpdatelist) {
+    @Override
+    public void saveUpdatePhStatList(SitePdu site,List<PhQueueStatEntity> saveAndUpdatelist) {
         if (!ObjectUtils.isEmpty(saveAndUpdatelist)) {
             Map<Boolean, List<PhQueueStatEntity>> saveUpdateCollect = saveAndUpdatelist.parallelStream().collect(Collectors.partitioningBy(i -> i.newEntity()));
 
-            log.info("新增站点评价统计数据，数量：{}", saveUpdateCollect.get(true).size());
+            log.info("新增站点:{} 评价统计数据，数量：{}",site.getSiteName(), saveUpdateCollect.get(true).size());
             if (!ObjectUtils.isEmpty(saveUpdateCollect.get(true))) {
                 //新增列表
                 this.save(saveUpdateCollect.get(true));
             }
-            log.info("更新站点评价统计数据，数量：{}", saveUpdateCollect.get(true).size());
+            log.info("更新站点:{} 评价统计数据，数量：{}",site.getSiteName(), saveUpdateCollect.get(false).size());
             if (!ObjectUtils.isEmpty(saveUpdateCollect.get(false))) {
                 //更新列表
-                this.update(saveUpdateCollect.get(true));
+                this.update(saveUpdateCollect.get(false));
             }
 
         }
@@ -439,7 +439,7 @@ public class PhQueueStatServiceImpl extends AbstractCRUDServiceImpl<PhQueueStatD
 
         List<List<PhQueueStatEntity>> partition = Lists.partition(saveOrUpdateList, 1000);
         for (List<PhQueueStatEntity> phQueueStatEntities : partition) {
-            this.saveUpdatePhStatList(phQueueStatEntities);
+            this.saveUpdatePhStatList(site,phQueueStatEntities);
         }
 
         stopWatch.stop();

bill-manager/src/main/java/com/mortals/xhx/module/pj/service/PjEvaluateStatService.java

@@ -35,7 +35,7 @@ public interface PjEvaluateStatService extends ICRUDService<PjEvaluateStatEntity
 
     List<PjEvaluateStatEntity> getBillInfos(PjEvaluateStatQuery query, PageInfo pageInfo, Context context);
 
-    void saveUpdatePjEvaluateStatList(List<PjEvaluateStatEntity> saveAndUpdatelist);
+    void saveUpdatePjEvaluateStatList(SitePdu site,List<PjEvaluateStatEntity> saveAndUpdatelist);
 
     void updateSitePjStatLog(DateTime attendStart, Long compare, StopWatch stopWatch, SitePdu site, Context context);
 }
\ No newline at end of file

bill-manager/src/main/java/com/mortals/xhx/module/pj/service/impl/PjEvaluateStatServiceImpl.java

@@ -375,19 +375,19 @@ public class PjEvaluateStatServiceImpl extends AbstractCRUDServiceImpl<PjEvaluat
     }
 
     @Override
-    public void saveUpdatePjEvaluateStatList(List<PjEvaluateStatEntity> saveAndUpdatelist) {
+    public void saveUpdatePjEvaluateStatList(SitePdu site,List<PjEvaluateStatEntity> saveAndUpdatelist) {
         if (!ObjectUtils.isEmpty(saveAndUpdatelist)) {
             Map<Boolean, List<PjEvaluateStatEntity>> saveUpdateCollect = saveAndUpdatelist.parallelStream().collect(Collectors.partitioningBy(i -> i.newEntity()));
 
-            log.info("新增站点评价统计数据，数量：{}", saveUpdateCollect.get(true).size());
+            log.info("新增站点:{} 评价统计数据，数量：{}",site.getSiteName(), saveUpdateCollect.get(true).size());
             if (!ObjectUtils.isEmpty(saveUpdateCollect.get(true))) {
                 //新增列表
                 this.save(saveUpdateCollect.get(true));
             }
-            log.info("更新站点评价统计数据，数量：{}", saveUpdateCollect.get(false).size());
+            log.info("更新站点:{} 评价统计数据，数量：{}",site.getSiteName(), saveUpdateCollect.get(false).size());
             if (!ObjectUtils.isEmpty(saveUpdateCollect.get(false))) {
                 //更新列表
-                this.update(saveUpdateCollect.get(true));
+                this.update(saveUpdateCollect.get(false));
             }
 
         }
@@ -434,7 +434,7 @@ public class PjEvaluateStatServiceImpl extends AbstractCRUDServiceImpl<PjEvaluat
 
         List<List<PjEvaluateStatEntity>> partition = Lists.partition(saveAndUpdatelist, 1000);
         for (List<PjEvaluateStatEntity> pjEvaluateStatEntities : partition) {
-            this.saveUpdatePjEvaluateStatList(pjEvaluateStatEntities);
+            this.saveUpdatePjEvaluateStatList(site,pjEvaluateStatEntities);
         }
 
 

bill-manager/src/main/java/com/mortals/xhx/module/stat/service/impl/StatServiceImpl.java

@@ -51,8 +51,6 @@ public class StatServiceImpl extends AbstractCRUDServiceImpl<StatDao, StatEntity
     private PjEvaluateStatService pjEvaluateStatService;
     @Autowired
     private PhQueueStatService phQueueStatService;
-    @Autowired
-    private AccessStatLogService accessStatLogService;
 
 
     @Override