From c107112fcbe4262077d9f1fb6382e635d9c89dcc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 七月 2025 09:26:27 +0800
Subject: [PATCH] 视频监控URL增加一个路径参数&date=以备实现手动刷新
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
index c6fb7af..c05c768 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientSv.java
@@ -60,6 +60,10 @@
rsVo.pageCurr = qo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountDayDao.selectClientIds4DayStatistics(params);
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
+ params.put("clientIdsJson", clientIdsJson);
+
rsVo.obj = stClientAmountDayDao.selectDayStatistics(params);
}
return rsVo ;
@@ -83,6 +87,10 @@
rsVo.pageCurr = qo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
+ List<VoStClientIdAmountYearRecord> clientIds = stClientAmountMonthDao.selectClientIds4MonthStatistics(params);
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
+ params.put("clientIdsJson", clientIdsJson);
+
rsVo.obj = stClientAmountMonthDao.selectMonthStatistics(params);
}
return rsVo ;
@@ -105,13 +113,7 @@
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
- Long itemTotal = 0L ;
- String clientIdsJson = null ;
- if(oneYear){
- itemTotal = stClientAmountYearDao.selectCountYearStatistics4OneYear(params) ;
- }else{
- itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
- }
+ Long itemTotal = stClientAmountYearDao.selectCountYearStatistics(params) ;
if(itemTotal != null && itemTotal > 0) {
rsQrVo.pageSize = qo.pageSize;
@@ -119,22 +121,14 @@
rsQrVo.calculateAndSet(itemTotal, params);
List<VoStClientIdAmountYearRecord> clientIds = stClientAmountYearDao.selectClientIds4YearStatistics(params);
- clientIdsJson = JSON.toJSONString(clientIds) ;
+ String clientIdsJson = JSON.toJSONString(clientIds) ;
List<VoStClientAmountYearRecords> group = new ArrayList<>();
int count = 1 ;
for(int year: yearGrp){
params.put("year", year);
- List<VoStClientAmountYearRecord> list ;
- if(oneYear){
- list = stClientAmountYearDao.selectYearStatistics4OneYear(params);
- }else{
- if(clientIdsJson != null){
- params.put("clientIdsJson", clientIdsJson);
- }
- list = stClientAmountYearDao.selectYearStatistics(params);
- }
-
+ params.put("clientIdsJson", clientIdsJson);
+ List<VoStClientAmountYearRecord> list = stClientAmountYearDao.selectYearStatistics(params);
if(group.isEmpty()){
this.completion(group, list);
}
--
Gitblit v1.8.0