From 6d3e1b631b6f0080faa9a77e2c63bd4f3d3ee49b Mon Sep 17 00:00:00 2001 From: lzq Date: Sat, 30 Aug 2025 17:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/TianQingStatisticsMapper.java | 3 +++ .../pojo/GarbageDisposeSummary.java | 1 + .../service/ShouJuStatisticsService.java | 10 +++++-- .../service/TianQingStatisticsService.java | 23 +++++++++++++--- .../resources/application-dev_tian_qing.yml | 12 ++++----- .../mapper/TianQingStatisticsMapper.xml | 26 +++++++++++++------ 6 files changed, 56 insertions(+), 19 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/TianQingStatisticsMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/TianQingStatisticsMapper.java index 5632ba0..59b3cb2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/TianQingStatisticsMapper.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/mapper/TianQingStatisticsMapper.java @@ -1,5 +1,6 @@ package com.njzscloud.supervisory.statistics.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.njzscloud.supervisory.statistics.pojo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface TianQingStatisticsMapper { Double disposeWeight(@Param("startTime") Long startTime, @Param("endTime") Long endTime); List getOrderAmountSummary(@Param("startTime") Long startTime, @Param("endTime") Long endTime); + + List getGoodsNames(@Param("ew") Wrapper ew, @Param("count") int count); } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java index 25e21cb..222bf4c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/pojo/GarbageDisposeSummary.java @@ -14,5 +14,6 @@ public class GarbageDisposeSummary { private Double weight; private Integer depotType; private String depotName; + private String icon; private Double percentage; } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java index 2efc478..90be6c7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/ShouJuStatisticsService.java @@ -46,13 +46,19 @@ public class ShouJuStatisticsService implements StatisticsService { }); CompletableFuture> garbageDisposeSummary = CompletableFuture.supplyAsync(statisticsMapper::getGarbageDisposeSummary) .thenApply(list -> { - Double garbageDisposeSummary_totalWeight = list.stream() + Double garbageDisposeSummary_totalWeight_1 = list.stream() .filter(it -> it.getDepotType() == 1) .map(GarbageDisposeSummary::getWeight) .reduce(Double::sum).orElse(0D); + Double garbageDisposeSummary_totalWeight_2 = list.stream() + .filter(it -> it.getDepotType() == 2) + .map(GarbageDisposeSummary::getWeight) + .reduce(Double::sum).orElse(0D); for (GarbageDisposeSummary disposeSummary : list) { - disposeSummary.setPercentage(garbageDisposeSummary_totalWeight == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight * 100); + disposeSummary.setPercentage(disposeSummary.getDepotType() == 1 ? + garbageDisposeSummary_totalWeight_1 == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight_1 * 100 : + garbageDisposeSummary_totalWeight_2 == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight_2 * 100); } return list; }) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/TianQingStatisticsService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/TianQingStatisticsService.java index 401d596..747463a 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/TianQingStatisticsService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/statistics/service/TianQingStatisticsService.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.Week; import cn.hutool.core.map.MapUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.njzscloud.common.core.tuple.Tuple2; import com.njzscloud.common.core.tuple.Tuple3; import com.njzscloud.common.core.utils.GroupUtil; @@ -45,13 +46,19 @@ public class TianQingStatisticsService implements StatisticsService { }); CompletableFuture> garbageDisposeSummary = CompletableFuture.supplyAsync(statisticsMapper::getGarbageDisposeSummary) .thenApply(list -> { - Double garbageDisposeSummary_totalWeight = list.stream() + Double garbageDisposeSummary_totalWeight_1 = list.stream() .filter(it -> it.getDepotType() == 1) .map(GarbageDisposeSummary::getWeight) .reduce(Double::sum).orElse(0D); + Double garbageDisposeSummary_totalWeight_2 = list.stream() + .filter(it -> it.getDepotType() == 2) + .map(GarbageDisposeSummary::getWeight) + .reduce(Double::sum).orElse(0D); for (GarbageDisposeSummary disposeSummary : list) { - disposeSummary.setPercentage(garbageDisposeSummary_totalWeight == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight * 100); + disposeSummary.setPercentage(disposeSummary.getDepotType() == 1 ? + garbageDisposeSummary_totalWeight_1 == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight_1 * 100 : + garbageDisposeSummary_totalWeight_2 == 0 ? 0 : disposeSummary.getWeight() / garbageDisposeSummary_totalWeight_2 * 100); } return list; }) @@ -62,12 +69,22 @@ public class TianQingStatisticsService implements StatisticsService { CompletableFuture> currentMonthGarbageDisposeSummary = CompletableFuture.supplyAsync(statisticsMapper::getCurrentMonthGarbageDisposeSummary) .thenApply(list -> { + if (list.size() < 6) { + List goodsNames = statisticsMapper.getGoodsNames(Wrappers.query().eq("depot_type", 2), 6 - list.size()); + for (String goodsName : goodsNames) { + list.add(new GarbageDisposeSummary() + .setGarbageName(goodsName) + .setWeight(0D)); + } + } + Double currentMonthGarbageDisposeSummary_totalWeight = list.stream() .map(GarbageDisposeSummary::getWeight) .reduce(Double::sum).orElse(0D); for (GarbageDisposeSummary disposeSummary : list) { - disposeSummary.setPercentage(disposeSummary.getWeight() / currentMonthGarbageDisposeSummary_totalWeight * 100); + disposeSummary.setPercentage(currentMonthGarbageDisposeSummary_totalWeight == 0 ? 0 : + disposeSummary.getWeight() / currentMonthGarbageDisposeSummary_totalWeight * 100); } return list; }) diff --git a/njzscloud-svr/src/main/resources/application-dev_tian_qing.yml b/njzscloud-svr/src/main/resources/application-dev_tian_qing.yml index 21ebf4e..6bf9d2d 100644 --- a/njzscloud-svr/src/main/resources/application-dev_tian_qing.yml +++ b/njzscloud-svr/src/main/resources/application-dev_tian_qing.yml @@ -3,9 +3,9 @@ spring: multipart: location: D:\ProJects\gov_manage\njzscloud-supervisory-svr\logs\temp datasource: - url: jdbc:mysql://localhost:33061/green_frog?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true - username: dbard01 - password: mik9uvNZ + url: jdbc:mysql://localhost:33061/greenfrog?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true + username: greenfrog + password: admin999 security: auth-ignores: /statistics/** @@ -13,13 +13,13 @@ mybatis-plus: tunnel: enable: true ssh: - host: 121.43.155.83 + host: 47.117.76.168 port: 22 user: root - credentials: D:/我的/再昇云/客户信息归档/达州首炬/dzsj.pem + credentials: D:/我的/再昇云/客户资料/扬州天勤/tqhost.pem localPort: 33061 db: - host: rm-bp1w3397b718u1882.mysql.rds.aliyuncs.com + host: 127.0.0.1 port: 3306 app: diff --git a/njzscloud-svr/src/main/resources/mapper/TianQingStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/TianQingStatisticsMapper.xml index dd49332..a501fb3 100644 --- a/njzscloud-svr/src/main/resources/mapper/TianQingStatisticsMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/TianQingStatisticsMapper.xml @@ -27,23 +27,25 @@ @@ -117,4 +119,12 @@ AND a.out_time >= #{startTime} AND a.out_time #{endTime} +