From f71e39c30acb958181f7198b063633a1110c9a1c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 10 八月 2023 11:32:55 +0800
Subject: [PATCH] 1

---
 src/main/java/com/yssh/mapper/XlsReportMapper.java   |   30 +++++++++++++-
 src/main/resources/mapper/XlsReportMapper.xml        |   37 +++++++++++++++++-
 src/main/java/com/yssh/service/XlsReportService.java |    2 
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yssh/mapper/XlsReportMapper.java b/src/main/java/com/yssh/mapper/XlsReportMapper.java
index 3d24e30..6e023e6 100644
--- a/src/main/java/com/yssh/mapper/XlsReportMapper.java
+++ b/src/main/java/com/yssh/mapper/XlsReportMapper.java
@@ -13,9 +13,33 @@
  */
 @Mapper
 public interface XlsReportMapper {
-    List<XlsReport> selectByPage(@Param("type") String type, @Param("start") String start, @Param("end") String end, @Param("limit") Integer limit, @Param("offset") Integer offset);
+    /**
+     * 鍒嗛〉鏌ヨ鎶ュ憡
+     */
+    List<XlsReport> selectReportByPage(@Param("type") String type, @Param("start") String start, @Param("end") String end, @Param("limit") Integer limit, @Param("offset") Integer offset);
 
-    int xlsExists(@Param("type") String type, @Param("start") String start);
+    /**
+     * 鎶ュ憡鏄惁瀛樺湪
+     */
+    int reportExists(@Param("type") String type, @Param("start") String start);
 
-    int insert(XlsReport xls);
+    /**
+     * 鎻掑叆鎶ュ憡
+     */
+    int insertReport(XlsReport xls);
+
+    /**
+     * 鏌ヨ鏃ュ潎鍊�
+     */
+    double selectDayAvg(@Param("time") String time, @Param("name") String name);
+
+    /**
+     * 鏌ヨ绱鍊�
+     */
+    double selectAccumulate(@Param("start") Integer start, @Param("end") Integer end, @Param("name") String name);
+
+    /**
+     * 鏌ヨ骞寸疮璁″��
+     */
+    double selectYearAccumulate(@Param("time") String time, @Param("name") String name);
 }
diff --git a/src/main/java/com/yssh/service/XlsReportService.java b/src/main/java/com/yssh/service/XlsReportService.java
index 50e9dcf..6bb66e0 100644
--- a/src/main/java/com/yssh/service/XlsReportService.java
+++ b/src/main/java/com/yssh/service/XlsReportService.java
@@ -51,7 +51,7 @@
      * Excel鏄惁宸插瓨鍦�
      */
     private boolean xlsExists(String type, String name) {
-        int rows = mapper.xlsExists(type, name);
+        int rows = mapper.reportExists(type, name);
 
         return rows > 0;
     }
diff --git a/src/main/resources/mapper/XlsReportMapper.xml b/src/main/resources/mapper/XlsReportMapper.xml
index 0e9a8c4..1bd4f46 100644
--- a/src/main/resources/mapper/XlsReportMapper.xml
+++ b/src/main/resources/mapper/XlsReportMapper.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yssh.mapper.QxshMapper">
-    <select id="selectByPage" resultType="com.yssh.entity.xls.XlsReport">
+    <!-- 鍒嗛〉鏌ヨ鎶ュ憡 -->
+    <select id="selectReportByPage" resultType="com.yssh.entity.xls.XlsReport">
         select *
         from xls_report
         <where>
@@ -20,16 +21,46 @@
         limit #{limit} offset #{offset}
     </select>
 
-    <select id="xlsExists" resultType="java.lang.Integer">
+    <!-- 鎶ュ憡鏄惁瀛樺湪 -->
+    <select id="reportExists" resultType="java.lang.Integer">
         select count(*)
         from xls_report
         where type = #{type} and name = #{name}
     </select>
 
-    <insert id="insert" parameterType="com.yssh.entity.xls.XlsReport">
+    <!-- 鎻掑叆鎶ュ憡 -->
+    <insert id="insertReport" parameterType="com.yssh.entity.xls.XlsReport">
        insert into xls_report
        (name, type, path, create_time)
        values
        (#{name}, #{type}, #{path}, #{createTime})
     </insert>
+
+    <!-- 鏌ヨ鏃ュ潎鍊� -->
+    <select id="selectDayAvg" resultType="java.lang.Double">
+        select format(avg(value), 2)
+        from yssh_qxsh
+        where time like #{time} and name = #{name};
+    </select>
+
+    <!-- 鏌ヨ鏃ュ潎鍊� -->
+    <select id="selectDayAvg" resultType="java.lang.Double">
+        select format(avg(value), 2)
+        from yssh_qxsh
+        where time like #{time} and name = #{name};
+    </select>
+
+    <!-- 鏌ヨ绱鍊� -->
+    <select id="selectAccumulate" resultType="java.lang.Double">
+        select format(avg(value), 2)
+        from yssh_qxsh
+        where time between #{start} and #{end} and name = #{name};
+    </select>
+
+    <!-- 鏌ヨ骞寸疮璁″�� -->
+    <select id="selectYearAccumulate" resultType="java.lang.Double">
+        select format(avg(value), 2)
+        from yssh_qxsh
+        where time like #{time} and name = #{name};
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3