From 8a6d160963ff362fea468637b1a0873d445d7aea Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 29 四月 2025 16:07:06 +0800
Subject: [PATCH] 大屏修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java
index fdb1f67..806a300 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/impl/AnalysisRecycleDataServiceImpl.java
@@ -13,10 +13,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -31,49 +28,61 @@
@Override
- public Map<String,Long> recycleLarge(Integer analysisType) {
- Map<String,Long> map = new HashMap<>();
+ public Map<String,Integer> recycleLarge(Integer analysisType) {
+ Map<String,Integer> map = new HashMap<>();
if (analysisType == 1) {
// 年份
String year = LocalDateTime.now().getYear()+"年";
- long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ AnalysisRecycleData analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
year = LocalDateTime.now().minusYears(1).getYear()+"年";
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
year = LocalDateTime.now().minusYears(2).getYear()+"年";
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
year = LocalDateTime.now().minusYears(3).getYear()+"年";
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
year = LocalDateTime.now().minusYears(4).getYear()+"年";
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
year = LocalDateTime.now().minusYears(5).getYear()+"年";
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, year));
- map.put(year,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, year).last("LIMIT 1"));
+ map.put(year,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
return map;
} else{
// 月份
String month = new SimpleDateFormat("yyyy年MM月").format(new Date());
- long count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ AnalysisRecycleData analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month, Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(1)));
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(2)));
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(3)));
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(4)));
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
month = new SimpleDateFormat("yyyy年MM月").format(DateUtils.localDateTimeToDate(LocalDateTime.now().minusMonths(5)));
- count = this.count(Wrappers.lambdaQuery(AnalysisRecycleData.class).eq(AnalysisRecycleData::getAnalysisValue, month));
- map.put(month,count);
+ analysisRecycleData = this.getOne(Wrappers.lambdaQuery(AnalysisRecycleData.class)
+ .eq(AnalysisRecycleData::getAnalysisValue, month).last("LIMIT 1"));
+ map.put(month,Objects.nonNull(analysisRecycleData)?analysisRecycleData.getOrderCount():0);
return map;
}
}
--
Gitblit v1.7.1