From 4dcdf5fc2a42ec687f9dd8308ee6fe8363239603 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Wed, 29 Jun 2022 10:44:41 +0800
Subject: [PATCH] zh

---
 .../controller/manage/StatisticsController.java | 17 ++++++++++++++---
 .../com/zh/project0512/mapper/AdminMapper.java  | 14 ++++++++++++++
 .../com/zh/project0512/mapper/BrandMapper.java  |  2 +-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
index 9b294d8..926b42f 100644
--- a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
+++ b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java
@@ -1,7 +1,9 @@
 package com.zh.project0512.controller.manage;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zh.project0512.annotation.AdminTokenValid;
 import com.zh.project0512.mapper.AdminMapper;
+import com.zh.project0512.model.Video;
 import com.zh.project0512.model.dto.RankListDTO;
 import com.zh.project0512.utils.result.Result;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,12 +24,21 @@ import org.springframework.web.bind.annotation.RestController;
 public class StatisticsController {
     @Autowired
     private AdminMapper adminMapper;
-    @Operation(summary = "数据")
+    @Operation(summary = "总数据")
     @PostMapping("/data1")
     @AdminTokenValid
-    public Result rankList(@Validated @RequestBody RankListDTO rankListDTO) {
-       adminMapper.statistics1();
+    public Result data1() {
         return Result.success(  adminMapper.statistics1(), "请求成功");
     }
 
+    @Operation(summary = "视频数据")
+    @PostMapping("/data2")
+    @AdminTokenValid
+    public Result data2(@Validated @RequestBody RankListDTO rankListDTO) {
+        QueryWrapper<Video> qw = new QueryWrapper<>();
+        qw.eq("date_format(creatAt, '%Y-%m-%d')","2022-06-15");
+        adminMapper.statistics2(qw);
+        return Result.success(  adminMapper.statistics2(qw), "请求成功");
+    }
+
 }
diff --git a/src/main/java/com/zh/project0512/mapper/AdminMapper.java b/src/main/java/com/zh/project0512/mapper/AdminMapper.java
index af7b5a0..ce31bd2 100644
--- a/src/main/java/com/zh/project0512/mapper/AdminMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/AdminMapper.java
@@ -1,8 +1,12 @@
 package com.zh.project0512.mapper;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.zh.project0512.model.Admin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zh.project0512.model.User;
+import com.zh.project0512.model.Video;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 /**
@@ -26,4 +30,14 @@ public interface AdminMapper extends BaseMapper<Admin> {
         "sum(IFNULL(v.recommendNum,0)) as recommendNumSum\n" +
         "      from video as v ")
     JSONObject statistics1();
+    @Select("SELECT  \n" +
+        "sum(IFNULL(v.playNum,0)) as playNumSum, \n" +
+        "sum(IFNULL(v.commendNum,0)) as commendNumSum, \n" +
+        "sum(IFNULL(v.collectionNum,0)) as collectionNumSum, \n" +
+        "sum(IFNULL(v.commentNum,0)) as commentNumSum, \n" +
+        "sum(IFNULL(v.reSendNum,0)) as reSendNumSum, \n" +
+        "sum(IFNULL(v.recommendNum,0)) as recommendNumSum\n" +
+        "      from video " +
+        " ${ew.customSqlSegment}")
+    JSONObject statistics2( @Param("ew") Wrapper<Video> queryWrapper);
 }
diff --git a/src/main/java/com/zh/project0512/mapper/BrandMapper.java b/src/main/java/com/zh/project0512/mapper/BrandMapper.java
index 2050486..76b901e 100644
--- a/src/main/java/com/zh/project0512/mapper/BrandMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/BrandMapper.java
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Update;
  * @since 2022-05-26
  */
 public interface BrandMapper extends BaseMapper<Brand> {
-    @Update("update brand set sortWeight = sortWeight + 1 where sortWeight <> 0;;\n" +
+    @Update("update brand set sortWeight = sortWeight + 1 where sortWeight <> 0;\n" +
     "insert into brand ( name, creatAt,sortWeight) VALUES ( #{name}, #{creatAt},1 );")
     void addBrand(Brand brand);
     @Update("<script>" +