From f90c8e0c6f8cf6f81b571b0533ee37aac5c12d51 Mon Sep 17 00:00:00 2001
From: pan <380711010@qq.com>
Date: Thu, 5 Sep 2024 22:36:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=92=8C=E5=B7=A5=E5=85=B7=E7=BB=9F=E8=AE=A1=202=E3=80=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=203=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=88=86=E9=A1=B5=EF=BC=88=E8=BF=98?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E9=83=A8=E5=88=86=E6=B2=A1=E6=9C=89=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/DownloadCountController.java         | 34 ++++++++++---------
 .../com/rzdata/web/domain/DownloadCount.java  |  7 ++++
 .../web/mapper/DownloadCountMapper.java       |  3 ++
 .../web/service/IDownloadCountService.java    |  8 +++++
 .../impl/DownloadCountServiceImpl.java        |  5 +++
 .../resources/mapper/DownloadCountMapper.xml  | 33 ++++++++++++++++--
 6 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/DownloadCountController.java b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/DownloadCountController.java
index 1b3346f..c870af9 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/DownloadCountController.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/DownloadCountController.java
@@ -1,26 +1,17 @@
 package com.rzdata.web.controller.tool;
 
-import javax.servlet.http.HttpServletResponse;
-
-import com.rzdata.common.utils.poi.ExcelUtil;
-import com.rzdata.web.domain.DownloadCount;
-import com.rzdata.web.service.IDownloadCountService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.rzdata.common.annotation.Log;
 import com.rzdata.common.core.controller.BaseController;
 import com.rzdata.common.core.domain.AjaxResult;
-import com.rzdata.common.enums.BusinessType;
 import com.rzdata.common.core.page.TableDataInfo;
+import com.rzdata.common.enums.BusinessType;
+import com.rzdata.common.utils.poi.ExcelUtil;
+import com.rzdata.web.domain.DownloadCount;
+import com.rzdata.web.service.IDownloadCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -48,6 +39,17 @@ public class DownloadCountController extends BaseController
     }
 
 
+    /**
+     * 查询文档下载统计列表
+     */
+    @GetMapping("/doc/list")
+    public TableDataInfo docList(DownloadCount downloadCount)
+    {
+        startPage();
+        List<DownloadCount> list = downloadCountService.selectDownloadDocCountList(downloadCount);
+        return getDataTable(list);
+    }
+
     /**
      * 根据详情统计
      */
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/domain/DownloadCount.java b/tool-tech-admin/src/main/java/com/rzdata/web/domain/DownloadCount.java
index 0411827..b568e07 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/domain/DownloadCount.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/domain/DownloadCount.java
@@ -46,4 +46,11 @@ public class DownloadCount extends BaseEntity
     private String toolDownNum;
     private String nickName;
 
+    /** 文档code */
+    private String docCode;
+    /** 文档名称 */
+    private String docName;
+    /** 文档下载数量 */
+    private String docDownNum;
+
 }
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/mapper/DownloadCountMapper.java b/tool-tech-admin/src/main/java/com/rzdata/web/mapper/DownloadCountMapper.java
index 43c7028..8950a2a 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/mapper/DownloadCountMapper.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/mapper/DownloadCountMapper.java
@@ -61,4 +61,7 @@ public interface DownloadCountMapper
     public int deleteDownloadCountByIds(String[] ids);
 
     List<DownloadCount> userDownList(DownloadCount downloadCount);
+
+    /** 文档下载统计 **/
+    List<DownloadCount> selectDownloadDocCountList(DownloadCount downloadCount);
 }
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/service/IDownloadCountService.java b/tool-tech-admin/src/main/java/com/rzdata/web/service/IDownloadCountService.java
index a976e40..1a3be04 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/service/IDownloadCountService.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/service/IDownloadCountService.java
@@ -66,4 +66,12 @@ public interface IDownloadCountService
      * @return
      */
     List<DownloadCount> userDownList(DownloadCount downloadCount);
+
+    /**
+     * 文档下载统计
+     * @param downloadCount
+     * @return
+     */
+    List<DownloadCount> selectDownloadDocCountList(DownloadCount downloadCount);
+
 }
diff --git a/tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DownloadCountServiceImpl.java b/tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DownloadCountServiceImpl.java
index 1300816..602f444 100644
--- a/tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DownloadCountServiceImpl.java
+++ b/tool-tech-admin/src/main/java/com/rzdata/web/service/impl/DownloadCountServiceImpl.java
@@ -107,4 +107,9 @@ public class DownloadCountServiceImpl implements IDownloadCountService
     public List<DownloadCount> userDownList(DownloadCount downloadCount) {
         return downloadCountMapper.userDownList(downloadCount);
     }
+
+    @Override
+    public List<DownloadCount> selectDownloadDocCountList(DownloadCount downloadCount) {
+        return downloadCountMapper.selectDownloadDocCountList(downloadCount);
+    }
 }
diff --git a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
index 94e7504..be41d49 100644
--- a/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
+++ b/tool-tech-admin/src/main/resources/mapper/DownloadCountMapper.xml
@@ -19,6 +19,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="toolCode"    column="tool_code"    />
         <result property="toolName"    column="tool_name"    />
         <result property="toolDownNum"    column="tool_down_num"    />
+        <result property="docCode"    column="doc_code"    />
+        <result property="docName"    column="doc_name"    />
+        <result property="docDownNum"    column="doc_down_num"    />
         <result property="nickName"    column="nick_name"    />
     </resultMap>
 
@@ -29,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDownloadCountList" parameterType="DownloadCount" resultMap="DownloadCountResult">
         select
-        tdc.business_id,tdc.att_name,tl.tool_code,tl.tool_name,sum(1) as tool_down_num
+        tdc.business_id,tl.tool_code,tl.tool_name,sum(1) as tool_down_num
         from t_download_count tdc
         left join t_tool tl on tdc.business_id = tl.tool_id
         <where>
@@ -47,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND tl.tool_name like concat('%', #{toolName}, '%')
             </if>
         </where>
-        group by tdc.business_id,tdc.att_name,tl.tool_code,tl.tool_name
+        group by tdc.business_id,tl.tool_code,tl.tool_name
     </select>
     
     <select id="selectDownloadCountById" parameterType="String" resultMap="DownloadCountResult">
@@ -124,7 +127,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND business_id = #{businessId}
             </if>
         </where>
-        group by su.nick_name
+        group by su.nick_name,tdc.business_id,tdc.att_name
+    </select>
+
+
+    <select id="selectDownloadDocCountList" parameterType="DownloadCount" resultMap="DownloadCountResult">
+        select
+        tdc.business_id,tl.doc_code,tl.doc_name,sum(1) as doc_down_num
+        from t_download_count tdc
+        left join t_document tl on tdc.business_id = tl.doc_id
+        <where>
+            and business_type = 'doc'
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(tdc.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(tdc.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+            <if test="docCode != null and docCode != ''">
+                AND tl.doc_code like concat('%', #{docCode}, '%')
+            </if>
+            <if test="docName != null and docName != ''">
+                AND tl.doc_name like concat('%', #{docName}, '%')
+            </if>
+        </where>
+        group by tdc.business_id,tl.doc_code,tl.doc_name
     </select>
 
 </mapper>
\ No newline at end of file