重新调整统计线程实现

bill-manager/src/main/java/com/mortals/xhx/module/access/web/AccessController.java

@@ -28,27 +28,27 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 /**
-*
-* 区域接入
-*
-* @author zxfei
-* @date 2024-07-02
-*/
+ * 区域接入
+ *
+ * @author zxfei
+ * @date 2024-07-02
+ */
 @RestController
 @RequestMapping("access")
 @Slf4j
-public class AccessController extends BaseCRUDJsonBodyMappingController<AccessService,AccessEntity,Long> {
+public class AccessController extends BaseCRUDJsonBodyMappingController<AccessService, AccessEntity, Long> {
     @Autowired
     private AccessService accessService;
 
-    public AccessController(){
-        super.setModuleDesc( "区域接入");
+    public AccessController() {
+        super.setModuleDesc("区域接入");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-                this.addDict(model, "type", TypeEnum.getEnumMap());
+        this.addDict(model, "type", TypeEnum.getEnumMap());
         super.init(model, context);
     }
 
@@ -73,10 +73,12 @@ public class AccessController extends BaseCRUDJsonBodyMappingController<AccessSe
             DateTime attendEnd = DateUtil.parseDate(accessQuery.getAccessTimeEnd());
             Long compare = DateUtil.between(attendEnd, attendStart, DateUnit.DAY);
             log.info("计算天数区间：{}", compare);
-            List<SitePdu> statSiteList = accessService.getStatSiteList( new AccessQuery());
+            accessQuery.setAccessTimeStart(null);
+            accessQuery.setAccessTimeEnd(null);
+            List<SitePdu> statSiteList = accessService.getStatSiteList(accessQuery);
             for (SitePdu site : statSiteList) {
                 StatThread statThread = new StatThread(attendStart, compare, site, context,
-                        Arrays.asList(StatTypeEnum.STAT_PH.getValue(),StatTypeEnum.STAT_PJ.getValue(),StatTypeEnum.STAT_ALL.getValue()));
+                        Arrays.asList(StatTypeEnum.STAT_PH.getValue(), StatTypeEnum.STAT_PJ.getValue(), StatTypeEnum.STAT_ALL.getValue()));
                 ThreadPool.getInstance().execute(statThread);
             }
             model.put("message_info", busiDesc + "成功");