From 511d8dd2c6161a170f6d83b281b8b3d1e765ed49 Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Wed, 4 Sep 2024 23:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2BUG=EF=BC=9B=E6=8A=A5=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复：月度均值报表和报表中心不再查询全部后代节点，仅查询本身和直接子节点；新增：报表中心导出为excel
---
 .../resources/mybatis/oil/ThDeviceMapper.xml  |  14 +--
 .../mybatis/oil/ThDeviceReportMapper.xml      | 119 +++++++-----------
 ruoyi-ui/package.json                         |   3 +-
 .../dataStatistics/reportCenter/index.vue     |  33 ++++-
 4 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
index ccb7701..79448d8 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceMapper.xml
@@ -49,13 +49,13 @@
 
     <select id="selectAllDeviceListByDeptId" parameterType="long" resultMap="BaseResultMap">
         WITH dept_hierarchy (dept_id) AS (
-        SELECT dept_id
-        FROM sys_dept
-        WHERE dept_id = #{deptId}
-        UNION ALL
-        SELECT d.dept_id
-        FROM sys_dept d
-        INNER JOIN dept_hierarchy dh ON d.parent_id = dh.dept_id
+            SELECT dept_id
+            FROM sys_dept
+            WHERE dept_id = #{deptId}
+            UNION ALL
+            SELECT d.dept_id
+            FROM sys_dept d
+            INNER JOIN dept_hierarchy dh ON d.parent_id = dh.dept_id
         )
         <include refid="Base_Column_List"/>
         INNER JOIN dept_hierarchy dh ON d.dept_id = dh.dept_id
diff --git a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
index 39fde94..acedb9a 100644
--- a/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
+++ b/RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/ThDeviceReportMapper.xml
@@ -59,96 +59,67 @@
     </select>
 
     <select id="selectAvgDsByMonth" parameterType="map" resultType="map">
-        SELECT
-        TO_CHAR(d.report_time, 'YYYY-MM') AS month,
-        ROUND(AVG(TO_NUMBER(d.ds)), 8) AS avg_ds
-        FROM
-        th_device_report d
-        WHERE
-        d.sn IN (
-        SELECT
-        d.sn
-        FROM
-        th_device d
-        LEFT JOIN sys_dept p ON d.dept_id = p.dept_id
-        WHERE
-        d.dept_id IN (
-        SELECT dept_id
-        FROM sys_dept
-        START WITH dept_id = #{deptId}
-        CONNECT BY PRIOR dept_id = parent_id
-        )
-        )
-        AND d.report_time &gt;= TO_DATE(#{startMonth}, 'YYYY-MM')
-        AND d.report_time &lt;= ADD_MONTHS(TO_DATE(#{endMonth}, 'YYYY-MM'), 1)
-        GROUP BY
-        TO_CHAR(d.report_time, 'YYYY-MM')
-        ORDER BY
-        month
+        SELECT TO_CHAR(d.report_time, 'YYYY-MM') AS month,
+               ROUND(AVG(TO_NUMBER(d.ds)), 8)    AS avg_ds
+        FROM th_device_report d
+        WHERE d.sn IN (SELECT d.sn
+                       FROM th_device d
+                                LEFT JOIN sys_dept p ON d.dept_id = p.dept_id
+                       WHERE d.dept_id IN (SELECT dept_id
+                                           FROM sys_dept START WITH dept_id = #{deptId}
+                                               CONNECT BY PRIOR dept_id = parent_id))
+          AND d.report_time &gt;= TO_DATE(#{startMonth}, 'YYYY-MM')
+          AND d.report_time &lt;= ADD_MONTHS(TO_DATE(#{endMonth}, 'YYYY-MM'), 1)
+        GROUP BY TO_CHAR(d.report_time, 'YYYY-MM')
+        ORDER BY month
     </select>
 
     <select id="selectDeviceAvgByMonth" parameterType="map" resultType="map">
         SELECT d.sn,
-        td.name,
-        td.address,
-        td.longitude,
-        td.latitude,
-        p.dept_name,
-        ROUND(AVG(TO_NUMBER(d.ds)), 8)  AS avg_ds,
-        ROUND(AVG(TO_NUMBER(d.dbz)), 8) AS avg_dbz,
-        ROUND(AVG(TO_NUMBER(d.gbz)), 8) AS avg_gbz
+               td.name,
+               td.address,
+               td.longitude,
+               td.latitude,
+               p.dept_name,
+               ROUND(AVG(TO_NUMBER(d.ds)), 8)  AS avg_ds,
+               ROUND(AVG(TO_NUMBER(d.dbz)), 8) AS avg_dbz,
+               ROUND(AVG(TO_NUMBER(d.gbz)), 8) AS avg_gbz
         FROM th_device_report d
-        LEFT JOIN th_device td ON d.sn = td.sn
-        LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
-        WHERE td.dept_id IN (SELECT dept_id
-        FROM sys_dept
-        START WITH dept_id = #{deptId}
-        CONNECT BY PRIOR dept_id = parent_id)
-        AND d.report_time &gt;= TO_DATE(#{startMonth}, 'YYYY-MM')
-        AND d.report_time &lt;= ADD_MONTHS(TO_DATE(#{endMonth}, 'YYYY-MM'), 1)
+                 LEFT JOIN th_device td ON d.sn = td.sn
+                 LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
+        WHERE td.dept_id IN (SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR parent_id = #{deptId})
+          AND d.report_time &gt;= TO_DATE(#{startMonth}, 'YYYY-MM')
+          AND d.report_time &lt;= ADD_MONTHS(TO_DATE(#{endMonth}, 'YYYY-MM'), 1)
         GROUP BY d.sn, p.dept_name, td.name, td.address, td.longitude, td.latitude
         ORDER BY p.dept_name
     </select>
 
     <select id="selectDeptAvgByMonth" parameterType="map" resultType="map">
         SELECT p.dept_name,
-        ROUND(AVG(TO_NUMBER(d.ds)), 8)  AS avg_ds,
-        ROUND(AVG(TO_NUMBER(d.dbz)), 8) AS avg_dbz,
-        ROUND(AVG(TO_NUMBER(d.gbz)), 8) AS avg_gbz
+               ROUND(AVG(TO_NUMBER(d.ds)), 8)  AS avg_ds,
+               ROUND(AVG(TO_NUMBER(d.dbz)), 8) AS avg_dbz,
+               ROUND(AVG(TO_NUMBER(d.gbz)), 8) AS avg_gbz
         FROM th_device_report d
-        LEFT JOIN th_device td ON d.sn = td.sn
-        LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
-        WHERE td.dept_id IN (SELECT dept_id FROM sys_dept START WITH dept_id = #{deptId} CONNECT BY PRIOR dept_id = parent_id)
-        AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
+                 LEFT JOIN th_device td ON d.sn = td.sn
+                 LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
+        WHERE td.dept_id IN
+              (SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR parent_id = #{deptId})
+          AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
         GROUP BY p.dept_name
         ORDER BY p.dept_name
     </select>
 
     <select id="selectAllAvgByMonth" parameterType="map" resultType="map">
-        SELECT
-        TO_CHAR(d.report_time, 'YYYY-MM') AS month,
-        ROUND(AVG(TO_NUMBER(d.ds)), 8) AS avg_ds,
-        ROUND(AVG(TO_NUMBER(d.dbz)), 8) AS avg_dbz,
-        ROUND(AVG(TO_NUMBER(d.gbz)), 8) AS avg_gbz
-        FROM
-        th_device_report d
-        WHERE
-        d.sn IN (
-        SELECT
-        td.sn
-        FROM
-        th_device td
-        LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
-        WHERE
-        td.dept_id IN (
-        SELECT dept_id
-        FROM sys_dept
-        START WITH dept_id = #{deptId}
-        CONNECT BY PRIOR dept_id = parent_id
-        )
-        )
-        AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
-        GROUP BY
-        TO_CHAR(d.report_time, 'YYYY-MM')
+        SELECT TO_CHAR(d.report_time, 'YYYY-MM') AS month,
+               ROUND(AVG(TO_NUMBER(d.ds)), 8)    AS avg_ds,
+               ROUND(AVG(TO_NUMBER(d.dbz)), 8)   AS avg_dbz,
+               ROUND(AVG(TO_NUMBER(d.gbz)), 8)   AS avg_gbz
+        FROM th_device_report d
+        WHERE d.sn IN (SELECT td.sn
+                       FROM th_device td
+                                LEFT JOIN sys_dept p ON td.dept_id = p.dept_id
+                       WHERE td.dept_id IN  (SELECT dept_id FROM sys_dept WHERE dept_id = #{deptId} OR parent_id = #{deptId}))
+          AND TO_CHAR(d.report_time, 'YYYY-MM') = #{month}
+        GROUP BY TO_CHAR(d.report_time, 'YYYY-MM')
     </select>
 </mapper>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 5926578..d5629d7 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -63,7 +63,8 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/ruoyi-ui/src/views/dataStatistics/reportCenter/index.vue b/ruoyi-ui/src/views/dataStatistics/reportCenter/index.vue
index 37f3c12..0dd11cd 100644
--- a/ruoyi-ui/src/views/dataStatistics/reportCenter/index.vue
+++ b/ruoyi-ui/src/views/dataStatistics/reportCenter/index.vue
@@ -15,6 +15,9 @@
         >
         </el-date-picker>
       </el-col>
+      <el-col :span="12">
+        <el-button type="primary" icon="eel-icon-download" @click="exportToExcel">导出</el-button>
+      </el-col>
     </el-row>
     <el-row>
       <div class="report-center__header ">
@@ -84,6 +87,7 @@
 <script>
 import DeptTree from "@/components/DeptTree/index.vue";
 import { reportCenterApi } from "@/api/statistics/reportCenter.js";
+import * as XLSX from "xlsx";
 import to from "@/utils/await-to.js";
 export default {
   name: "ReportCenter",
@@ -93,6 +97,7 @@ export default {
   data() {
     return {
       month: "",
+      dept: {},
       deptId: "",
       tableData1: [],
       tableData2: [],
@@ -115,6 +120,7 @@ export default {
       this.month = `${year}-${month < 10 ? "0" + month : month}`;
     },
     handleDeptChange(dept) {
+      this.dept = dept;
       this.deptId = dept.deptId;
       this.getReportCenterData();
     },
@@ -145,7 +151,6 @@ export default {
         this.$message.error(err);
         return;
       }
-      console.log(res);
       const { currMonth: cm, lastMonth: lm, deptAvg } = res.data;
       const currMonth = Object.assign({}, cm[0]);
       const lastMonth = Object.assign({}, lm[0]);
@@ -170,7 +175,31 @@ export default {
 
       this.tableData1 = [currMonth, lastMonth, changeRate];
       this.tableData2 = deptAvg;
-      console.log(this.tableData1);
+    },
+    exportToExcel() {
+      this.$message.success("导出成功");
+        // 创建一个新的工作簿
+        const wb = XLSX.utils.book_new();
+        const filename = `${this.dept.deptName} ${this.month.replace("-", "年") + "月"}`;
+        // 创建一个新的工作表
+        const ws_name = "SheetJS";
+        const ws_data = [
+          [filename],
+          ["名称", "读数", "低报值", "高报值"],
+          ...this.tableData1.map(row => [this.getTableFirstColumnName(row), row.avg_ds, row.avg_dbz, row.avg_gbz]),
+          ["部门名", "读数", "低报值", "高报值"],
+          ...this.tableData2.map(row => [row.dept_name, row.avg_ds, row.avg_dbz, row.avg_gbz])
+        ];
+        const ws = XLSX.utils.aoa_to_sheet(ws_data);
+
+        // 合并第一行的前四个单元格
+        if(!ws['!merges']) ws['!merges'] = [];
+        ws['!merges'].push({s: {r: 0, c: 0}, e: {r: 0, c: 3}});
+
+        // 将工作表添加到工作簿中
+        XLSX.utils.book_append_sheet(wb, ws, ws_name);
+
+        XLSX.writeFile(wb, `${filename}.xlsx`);
     },
   },
 };