From 6cfbf0b9984312d92cae240cb362e12439142eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Fri, 2 Aug 2024 16:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B0=83=E6=95=B4=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E7=BA=BF=E7=A8=8B=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/access/web/AccessController.java | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/bill-manager/src/main/java/com/mortals/xhx/module/access/web/AccessController.java b/bill-manager/src/main/java/com/mortals/xhx/module/access/web/AccessController.java
index c792227..df662d8 100644
--- a/bill-manager/src/main/java/com/mortals/xhx/module/access/web/AccessController.java
+++ b/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 + "鎴愬姛");
--
2.24.3