From d130547c1f3b64cf8544261cdf1d9146ff319756 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 19 五月 2025 13:13:30 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
index 599e05a..171c4ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/ComplaintServiceImpl.java
@@ -1551,12 +1551,17 @@
return vo;
}
+ public static void main(String[] args) {
+ String time = "2022-02-02 - 2023-02-02";
+ String[] split = time.split(" - ");
+ System.out.println(split[0]);
+ }
@Override
- public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(AnalyticStatisticsQuery query, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
+ public List<AnalyticStatisticsTwoVo> analyticStatisticsTwo(String time, List<Complaint> complaints, SimpleDateFormat simpleDateFormat) {
ArrayList<AnalyticStatisticsTwoVo> list = new ArrayList<>();
try {
- if (StringUtils.isNotEmpty(query.getTime())) {
- String[] split = query.getTime().split(" - ");
+ if (StringUtils.isNotEmpty(time)) {
+ String[] split = time.split(" - ");
Date parse = simpleDateFormat.parse(split[0] + " 00:00:00");
Date parse1 = simpleDateFormat.parse(split[1] + " 23:59:59");
complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= parse1.getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
@@ -1587,7 +1592,7 @@
}
} else {
- String time = DateUtils.getBeforeDay(6) + " 00:00:00";
+ time = DateUtils.getBeforeDay(6) + " 00:00:00";
Date parse = simpleDateFormat.parse(time);
// 近7天数据
complaints = complaints.stream().filter(e -> e.getCreateTime().getTime() <= new Date().getTime() && e.getCreateTime().getTime() >= parse.getTime()).collect(Collectors.toList());
@@ -1612,7 +1617,7 @@
}
@Override
- public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(AnalyticStatisticsQuery query, List<Complaint> complaints) {
+ public List<AnalyticStatisticsThreeVo> analyticStatisticsThree(Integer rank, List<Complaint> complaints) {
Map<String, List<Complaint>> groupedByProblemType = complaints.stream()
.collect(Collectors.groupingBy(Complaint::getProblemType));
List<AnalyticStatisticsThreeVo> analyticStatisticsThreeVos = groupedByProblemType.entrySet().stream()
@@ -1624,11 +1629,11 @@
})
.collect(Collectors.toList());
analyticStatisticsThreeVos = analyticStatisticsThreeVos.stream().sorted(Comparator.comparing(AnalyticStatisticsThreeVo::getAllTotal).reversed()).collect(Collectors.toList());
- if (query.getRank() == null) {
+ if (rank == null) {
return analyticStatisticsThreeVos;
- } else if (query.getRank() == 5) {
+ } else if (rank == 5) {
return analyticStatisticsThreeVos.stream().limit(5).collect(Collectors.toList());
- } else if (query.getRank() == 10) {
+ } else if (rank == 10) {
return analyticStatisticsThreeVos.stream().limit(10).collect(Collectors.toList());
}
return Collections.emptyList();
--
Gitblit v1.7.1