From f9bba2ed7e2921b07e84f0ff5035d03de29ed319 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Thu, 22 Aug 2024 19:02:13 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=9F=E8=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/DashboardController.java  | 18 ++++++++++++++++
 .../com/gxwebsoft/shop/entity/Dashboard.java  | 13 ++++++++++++
 .../shop/service/DashboardService.java        | 10 ++++++++-
 .../service/impl/DashboardServiceImpl.java    | 21 +++++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/DashboardController.java b/src/main/java/com/gxwebsoft/shop/controller/DashboardController.java
index 1f0069b..4b59b8e 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/DashboardController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/DashboardController.java
@@ -69,4 +69,22 @@ public class DashboardController extends BaseController  {
         return success(dashboardService.salesAmountStatisticsList(param));
     }
 
+    @OperationLog
+    @ApiOperation("所有板块信息集合趋势图")
+    @GetMapping("/statistics/chart")
+    public ApiResult<Dashboard> statisticsChart(DashBoardParam param) {
+
+        if (param.getCreateTimeStart() == null){//时间不传递，默认开始时间为最近一周
+            param.setCreateTimeStart(DateUtil.formatDate(DateUtil.lastWeek()));
+        }
+        if (param.getCreateTimeEnd()==null){//结束时间为，今天
+            param.setCreateTimeEnd(DateUtil.today()+" 59:59:59");
+        }
+
+        Dashboard dashboard = new Dashboard();
+        dashboard.setSalesAmountStatisticsList(dashboardService.salesAmountStatisticsList(param));
+        dashboard.setOrderStatisticsList(dashboardService.orderStatisticsList(param));
+        return success(dashboard);
+    }
+
 }
diff --git a/src/main/java/com/gxwebsoft/shop/entity/Dashboard.java b/src/main/java/com/gxwebsoft/shop/entity/Dashboard.java
index 42f38e0..22d554f 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/Dashboard.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/Dashboard.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,6 +26,18 @@ public class Dashboard {
     @ApiModelProperty(value = "设备统计")
     private EquipmentStatistics equipmentStatistics;//当日新增的设备，总设备
 
+    @ApiModelProperty(value = "销售统计集合")
+    private List<SalesAmountStatistics> salesAmountStatisticsList;
+
+    @ApiModelProperty(value = "订单统计集合")
+    private List<OrderStatistics> orderStatisticsList;
+
+    @ApiModelProperty(value = "用户统计集合")
+    private List<UserStatistics> userStatisticsList;
+
+    @ApiModelProperty(value = "设备统计集合")
+    private List<EquipmentStatistics> equipmentStatisticsList;
+
     @Data
     @ApiModel(value = "BaseStatistics", description = "基础统计")
     public static class BaseStatistics{
diff --git a/src/main/java/com/gxwebsoft/shop/service/DashboardService.java b/src/main/java/com/gxwebsoft/shop/service/DashboardService.java
index 778fbf3..2adc22b 100644
--- a/src/main/java/com/gxwebsoft/shop/service/DashboardService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/DashboardService.java
@@ -52,8 +52,16 @@ public interface DashboardService extends IService<Dashboard> {
      * 销售额统计趋势图
      *
      * @param param 查询参数
-     * @return SalesAmountStatistics
+     * @return List<Dashboard.SalesAmountStatistics>
      */
     List<Dashboard.SalesAmountStatistics> salesAmountStatisticsList(DashBoardParam param);
 
+
+    /**
+     * 订单统计趋势图
+     *
+     * @param param 查询参数
+     * @return List<Dashboard.OrderStatistics>
+     */
+    List<Dashboard.OrderStatistics> orderStatisticsList(DashBoardParam param);
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/DashboardServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/DashboardServiceImpl.java
index 2fee93b..3ca80a3 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/DashboardServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/DashboardServiceImpl.java
@@ -186,4 +186,25 @@ public class DashboardServiceImpl extends ServiceImpl<DashboardMapper, Dashboard
         return salesAmountStatisticsList;
     }
 
+    @Override
+    public List<Dashboard.OrderStatistics> orderStatisticsList(DashBoardParam param) {
+
+        //TODO 测试数据
+        List<Dashboard.OrderStatistics> orderStatisticsList = new ArrayList<>();
+        List<Date> dateList = new ArrayList<>();
+        dateList.add(DateUtil.parse("2024-08-15"));
+        dateList.add(DateUtil.parse("2024-08-16"));
+        dateList.add(DateUtil.parse("2024-08-17"));
+        dateList.add(DateUtil.parse("2024-08-18"));
+        dateList.forEach(date -> {
+            Dashboard.OrderStatistics orderStatistics=new Dashboard.OrderStatistics();
+            orderStatistics.setDailyNewOrders(10);
+            orderStatistics.setStartStatisticsDate(date);
+            orderStatistics.setEndStatisticsDate(date);
+            orderStatisticsList.add(orderStatistics);
+        });
+
+        return orderStatisticsList;
+    }
+
 }