事件中心首页时间范围索索

event-ui/src/api/event/index/index.js

@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+export function getList(timeArr) {
+  return  request({
+    url: 'center-event/index/countyList/',
+    method: 'get',
+    params: { timeArr }
+  })
+}
+export function getList1(timeArr) {
+  return  request({
+    url: 'center-event/index/getEventmapdept/',
+    method: 'get',
+    params: { timeArr }
+  })
+}

event-ui/src/views/components/eventdept/frist.vue

@@ -5,6 +5,8 @@
 <script>
 import {Chart} from "highcharts-vue";
 import request from "@/utils/request";
+import { getList } from '@/api/event/index'
+import { formatTimestampToDateString } from '@/utils/oaUtil'
 
 export default {
   name: 'extend-graphDemo-highchartsColumn',
@@ -90,21 +92,25 @@ export default {
       },
     }
   },
+  watch:{
+    daList:function(val){
+      val  = val.length>0 ? [formatTimestampToDateString(val [0]),formatTimestampToDateString(val [1])]:[]
+      this.geteventdept(val);
+    }
+  },
   mounted() {
     this.geteventdept()
   },
-
+  props:['daList'],
   methods: {
     myCallback() {
       // console.log("this is callback function");
     },
-    geteventdept() {
-      request({
-        url: 'center-event/index/countyList',
-        method: 'get',
-        // params: query
-      }).then((res) => {
+    geteventdept(val) {
+      getList(val).then((res) => {
         if (res.code === 200) {
+          this.chartOptions.xAxis.categories = [];
+          this.chartOptions.series.forEach(series => series.data = []);
           for (let i = 0; i < res.data.length; i++) {
             // debugger
             this.chartOptions.xAxis.categories.push(res.data[i].name);

event-ui/src/views/components/eventdept/middle.vue

@@ -5,9 +5,12 @@
 import Highcharts from './highcharts.js';
 import HighchartsVue from './highcharts.js';
 import request from "@/utils/request";
+import { getList } from '@/api/event/index'
+import { formatTimestampToDateString } from '@/utils/oaUtil'
 
 export default {
   name: 'ChartComponent',
+  props:['daList'],
   data() {
     return {
       chart: null,  // 将 chart 移至 data() 中
@@ -86,14 +89,18 @@ export default {
     });
     this.geteventdept();
   },
+  watch:{
+    daList:function(val){
+      val  = val.length>0 ? [formatTimestampToDateString(val [0]),formatTimestampToDateString(val [1])]:[]
+      this.geteventdept(val);
+    }
+  },
   methods: {
-    geteventdept() {
-      request({
-        url: 'center-event/index/countyList',
-        method: 'get',
-        // params: query
-      }).then((res) => {
+    geteventdept(val) {
+     getList(val).then((res) => {
         if (res.code === 200) {
+          this.chart.xAxis.categories = [];
+          this.chart.series.forEach(series => series.data.data = []);
           let sbTotal = 0;
           let qrTotal = 0;
           let qsTotal = 0;
@@ -113,7 +120,6 @@ export default {
             this.chart.series[0].data[4].update(gdTotal);
           }
         }
-        console.log(res)
       })
     }
   }

event-ui/src/views/components/eventdept/scecond.vue

@@ -5,12 +5,15 @@
 <script>
 import {Chart} from "highcharts-vue";
 import request from "@/utils/request";
+import { getList1 } from '@/api/event/index'
+import { formatTimestampToDateString } from '@/utils/oaUtil'
 
 export default {
   name: 'extend-graphDemo-highchartsColumn',
   components: {
     highcharts: Chart
   },
+  props:['daList'],
   data() {
     return {
       chartOptions: {
@@ -90,17 +93,21 @@ export default {
   mounted() {
     this.geteventdept()
   },
+  watch:{
+    daList:function(val){
+      val  = val.length>0 ? [formatTimestampToDateString(val [0]),formatTimestampToDateString(val [1])]:[]
+      this.geteventdept(val);
+    }
+  },
   methods: {
     myCallback() {
       // console.log("this is callback function");
     },
-    geteventdept() {
-      request({
-        url: 'center-event/index/getEventmapdept',
-        method: 'get',
-        // params: query
-      }).then((res) => {
+    geteventdept(val) {
+      getList1(val).then((res) => {
         if (res.code === 200) {
+          this.chartOptions.xAxis.categories = [];
+          this.chartOptions.series.forEach(series => series.data = []);
           // debugger
           for (let i = 0; i < res.data.length; i++) {
             // debugger

event-ui/vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://117.78.49.164:3031`,
         // target: `http://10.0.0.14:3031`,
-        target: `http://121.36.228.66:3031`,
+        target: `http://127.0.0.1:3031`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

src/main/java/com/sooka/sponest/event/index/controller/IndexController.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.event.index.controller;
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
+import com.sooka.sponest.event.index.domin.Index;
 import com.sooka.sponest.event.index.service.ICenterevenTEventIndexService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,30 +21,28 @@ public class IndexController extends BaseController {
     /**
      * 县区统计
      *
-     * @return
      */
     @GetMapping("countyList")
-    public R countyList() {
-        return R.ok(centerevenTEventIndexService.selectdistrictAndCountyStatistics());
+    public R countyList(Index index) {
+        return R.ok(centerevenTEventIndexService.selectdistrictAndCountyStatistics(index));
+
     }
 
     /**
      * 行管局统计
      *
-     * @return
      */
     @GetMapping("getEventmapdept")
-    public R getEventmapdept() {
-        return R.ok(centerevenTEventIndexService.selectCentereventTEventmapdeptList());
+    public R getEventmapdept(Index index) {
+        return R.ok(centerevenTEventIndexService.selectCentereventTEventmapdeptList(index));
     }
 
     /**
      * 系统报告-事件统计
      *
-     * @return
      */
     @GetMapping("/eventReport")
-    public R eventReport() {
-        return R.ok(centerevenTEventIndexService.selectStgz());
+    public R eventReport(Index index) {
+        return R.ok(centerevenTEventIndexService.selectStgz(index));
     }
 }

src/main/java/com/sooka/sponest/event/index/domin/Index.java

@@ -0,0 +1,18 @@
+package com.sooka.sponest.event.index.domin;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class Index extends BaseEntity {
+
+    private String reportTime;
+
+    private List<String> timeArr;
+
+}

src/main/java/com/sooka/sponest/event/index/mapper/CenterenvenTEventIndexMapper.java

@@ -1,5 +1,7 @@
 package com.sooka.sponest.event.index.mapper;
 
+import com.sooka.sponest.event.index.domin.Index;
+
 import java.util.List;
 import java.util.Map;
 
@@ -10,12 +12,12 @@ public interface CenterenvenTEventIndexMapper {
      *
      * @return
      */
-    List<Map<String, Object>> selectCentereventTEventCountyList();
+    List<Map<String, Object>> selectCentereventTEventCountyList(Index index);
 
     /**
      * 行管局统计
      *
      * @return
      */
-    List<Map<String, Object>> selectCentereventTEventmapdept();
+    List<Map<String, Object>> selectCentereventTEventmapdept(Index index);
 }

src/main/java/com/sooka/sponest/event/index/service/ICenterevenTEventIndexService.java

@@ -1,5 +1,7 @@
 package com.sooka.sponest.event.index.service;
 
+import com.sooka.sponest.event.index.domin.Index;
+
 import java.util.List;
 import java.util.Map;
 
@@ -13,19 +15,19 @@ public interface ICenterevenTEventIndexService {
      *
      * @return
      */
-    List<Map<String, Object>> selectdistrictAndCountyStatistics();
+    List<Map<String, Object>> selectdistrictAndCountyStatistics(Index index);
 
     /**
      * 行管局统计
      *
      * @return
      */
-    List<Map<String, Object>> selectCentereventTEventmapdeptList();
+    List<Map<String, Object>> selectCentereventTEventmapdeptList(Index index);
 
     /**
      * 系统报告-事件统计
      *
      * @return
      */
-    Map<String, Long> selectStgz();
+    Map<String, Long> selectStgz(Index index);
 }

src/main/java/com/sooka/sponest/event/index/service/impl/CenterevenTEventIndexServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.event.index.service.impl;
 
+import com.sooka.sponest.event.index.domin.Index;
 import com.sooka.sponest.event.index.mapper.CenterenvenTEventIndexMapper;
 import com.sooka.sponest.event.index.service.ICenterevenTEventIndexService;
 import org.apache.commons.collections4.MapUtils;
@@ -22,8 +23,8 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
      * @return
      */
     @Override
-    public List<Map<String, Object>> selectdistrictAndCountyStatistics() {
-        return centerenvenTEventIndexMapper.selectCentereventTEventCountyList();
+    public List<Map<String, Object>> selectdistrictAndCountyStatistics(Index index) {
+        return centerenvenTEventIndexMapper.selectCentereventTEventCountyList(index);
     }
 
     /**
@@ -32,8 +33,8 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
      * @return
      */
     @Override
-    public List<Map<String, Object>> selectCentereventTEventmapdeptList() {
-        return centerenvenTEventIndexMapper.selectCentereventTEventmapdept();
+    public List<Map<String, Object>> selectCentereventTEventmapdeptList(Index index) {
+        return centerenvenTEventIndexMapper.selectCentereventTEventmapdept(index);
     }
 
     /**
@@ -42,14 +43,14 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
      * @return
      */
     @Override
-    public Map<String, Long> selectStgz() {
+    public Map<String, Long> selectStgz(Index index) {
         Map<String, Long> resultMap = new HashMap<>();
         Long countqr = 0L;
         Long countcl = 0L;
         Long countbj = 0L;
         Long countgd = 0L;
         // （一）
-        List<Map<String, Object>> list = this.selectdistrictAndCountyStatistics();
+        List<Map<String, Object>> list = this.selectdistrictAndCountyStatistics(index);
         for (Map<String, Object> map : list) {
             Long qr = MapUtils.getLong(map, "qr");
             Long qs = MapUtils.getLong(map, "qs");
@@ -98,7 +99,7 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
         resultMap.put("countbj", countbj);
         resultMap.put("countgd", countgd);
         // （二）
-        list = this.selectCentereventTEventmapdeptList();
+        list = this.selectCentereventTEventmapdeptList(index);
         for (Map<String, Object> map : list) {
             Long total = MapUtils.getLong(map, "total");
             switch (MapUtils.getString(map, "dept_id")) {

src/main/resources/mapper/index/CentereventTEventIndexMapper.xml

@@ -6,174 +6,206 @@
 
     <select id="selectCentereventTEventCountyList" resultType="Map">
         SELECT
-            a.`name` ,
-            IFNULL( sb, 0 ) 'sb',
-                IFNULL( qr, 0 ) 'qr',
-                IFNULL( wb, 0 ) 'wb',
-                IFNULL( cf, 0 ) 'cf',
-                IFNULL( qs, 0 ) 'qs',
-                IFNULL( bj, 0 ) 'bj',
-                IFNULL( gd, 0 ) 'gd'
+        a.`name` ,
+        IFNULL( sb, 0 ) 'sb',
+        IFNULL( qr, 0 ) 'qr',
+        IFNULL( wb, 0 ) 'wb',
+        IFNULL( cf, 0 ) 'cf',
+        IFNULL( qs, 0 ) 'qs',
+        IFNULL( bj, 0 ) 'bj',
+        IFNULL( gd, 0 ) 'gd'
+
+
+        FROM
+        (
+        SELECT
+        `name`,
+        sum( sb ) sb,
+        sum( qr ) qr,
+        sum( wb ) wb,
+        sum( cf ) cf
+
+
+        FROM
+        (
+        SELECT
+        CASE
+
+        WHEN b.camera_name LIKE '%双辽%' THEN
+        '双辽市'
+        WHEN b.camera_name LIKE '%伊通%' THEN
+        '伊通县'
+        WHEN b.camera_name LIKE '%梨树%' THEN
+        '梨树县'
+        WHEN b.camera_name LIKE '%铁东%' THEN
+        '铁东区'
+        WHEN b.camera_name LIKE '%铁西%' THEN
+        '铁西区' ELSE '四平市'
+        END `name`,
+        a.sb,
+        a.qr,
+        a.wb,
+        a.cf
+
+
+        FROM
+        (
+        SELECT
+        create_by,
+        count( event_status_value = 'forest_event_status_1' OR NULL ) sb,
+        count( event_status_value = 'forest_event_status_7' OR NULL ) qr,
+        count( event_status_value = 'forest_event_status_3' OR NULL ) wb,
+        count( event_status_value = 'forest_event_status_4' OR NULL ) cf
+
+
+        FROM
+        onest_event.centerevent_t_eventcatalogue
+        <where>
+            dept_id IS NULL AND report_source = 'reporting_source_1' AND data_status = '0'
+            <if test="timeArr != null  and timeArr.size > 0">and report_time between #{timeArr[0]} and #{timeArr[1]}
+            </if>
+        </where>
+        GROUP BY
+        create_by
+        ) a
+        INNER JOIN onest_monitor.centermonitor_t_camera b ON b.id = a.create_by
+        UNION ALL
+        SELECT
+        CASE
+
+        WHEN b.address LIKE '%双辽%' THEN
+        '双辽市'
+        WHEN b.address LIKE '%伊通%' THEN
+        '伊通县'
+        WHEN b.address LIKE '%梨树%' THEN
+        '梨树县'
+        WHEN b.address LIKE '%铁东%' THEN
+        '铁东区'
+        WHEN b.address LIKE '%铁西%' THEN
+        '铁西区' ELSE '四平市'
+        END `name`,
+        a.sb,
+        a.qr,
+        a.wb,
+        a.cf
+
+
+        FROM
+        (
+        SELECT
+        create_by,
+        count( event_status_value = 'forest_event_status_1' OR NULL ) sb,
+        count( event_status_value = 'forest_event_status_7' OR NULL ) qr,
+        count( event_status_value = 'forest_event_status_3' OR NULL ) wb,
+        count( event_status_value = 'forest_event_status_4' OR NULL ) cf
+
+
+        FROM
+        onest_event.centerevent_t_eventcatalogue
+        <where>
+            dept_id IS NULL AND report_source = 'reporting_source_4' AND data_status = '0'
+            <if test="timeArr != null  and timeArr.size > 0">and report_time between #{timeArr[0]} and #{timeArr[1]}
+            </if>
+        </where>
+        GROUP BY
+        create_by
+        ) a
+        INNER JOIN onest_monitor.centermonitor_t_monitoring_device b ON b.id = a.create_by
+        ) t
+        GROUP BY
+        `name`
+        ) a
+        LEFT JOIN (
+        SELECT
+        `name`,
+        sum( qs ) qs,
+        sum( bj ) bj,
+        sum( gd ) gd
+        FROM
+        (
+        SELECT
+        CASE
+
+        WHEN
+        CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%369%' THEN
+        '双辽市'
+        WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%370%' THEN
+        '伊通县'
+        WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%371%' THEN
+        '梨树县'
+        WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%372%' THEN
+        '铁东区'
+        WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%373%' THEN
+        '铁西区' ELSE '四平'
+        END `name`,
+        a.qs,
+        a.bj,
+        a.gd
         FROM
-            (
-                SELECT
-                    `name`,
-                    sum( sb ) sb,
-                    sum( qr ) qr,
-                    sum( wb ) wb,
-                    sum( cf ) cf
-                FROM
-                    (
-                        SELECT
-                            CASE
-
-                                WHEN b.camera_name LIKE '%双辽%' THEN
-                                    '双辽市'
-                                WHEN b.camera_name LIKE '%伊通%' THEN
-                                    '伊通县'
-                                WHEN b.camera_name LIKE '%梨树%' THEN
-                                    '梨树县'
-                                WHEN b.camera_name LIKE '%铁东%' THEN
-                                    '铁东区'
-                                WHEN b.camera_name LIKE '%铁西%' THEN
-                                    '铁西区' ELSE '四平市'
-                                END `name`,
-                            a.sb,
-                            a.qr,
-                            a.wb,
-                            a.cf
-                        FROM
-                            (
-                                SELECT
-                                    create_by,
-                                    count( event_status_value = 'forest_event_status_1' OR NULL ) sb,
-                                    count( event_status_value = 'forest_event_status_7' OR NULL ) qr,
-                                    count( event_status_value = 'forest_event_status_3' OR NULL ) wb,
-                                    count( event_status_value = 'forest_event_status_4' OR NULL ) cf
-                                FROM
-                                    onest_event.centerevent_t_eventcatalogue
-                                WHERE
-                                    dept_id IS NULL AND report_source = 'reporting_source_1' AND data_status = '0'
-                                GROUP BY
-                                    create_by
-                            ) a
-                                INNER JOIN onest_monitor.centermonitor_t_camera b ON b.id = a.create_by
-                        UNION ALL
-                        SELECT
-                            CASE
-
-                                WHEN b.address LIKE '%双辽%' THEN
-                                    '双辽市'
-                                WHEN b.address LIKE '%伊通%' THEN
-                                    '伊通县'
-                                WHEN b.address LIKE '%梨树%' THEN
-                                    '梨树县'
-                                WHEN b.address LIKE '%铁东%' THEN
-                                    '铁东区'
-                                WHEN b.address LIKE '%铁西%' THEN
-                                    '铁西区' ELSE '四平市'
-                                END `name`,
-                            a.sb,
-                            a.qr,
-                            a.wb,
-                            a.cf
-                        FROM
-                            (
-                                SELECT
-                                    create_by,
-                                    count( event_status_value = 'forest_event_status_1' OR NULL ) sb,
-                                    count( event_status_value = 'forest_event_status_7' OR NULL ) qr,
-                                    count( event_status_value = 'forest_event_status_3' OR NULL ) wb,
-                                    count( event_status_value = 'forest_event_status_4' OR NULL ) cf
-                                FROM
-                                    onest_event.centerevent_t_eventcatalogue
-                                WHERE
-                                    dept_id IS NULL AND report_source = 'reporting_source_4' AND data_status = '0'
-                                GROUP BY
-                                    create_by
-                            ) a
-                                INNER JOIN onest_monitor.centermonitor_t_monitoring_device b ON b.id = a.create_by
-                    ) t
-                GROUP BY
-                    `name`
-            ) a
-                LEFT JOIN (
-                SELECT
-                    `name`,
-                    sum( qs ) qs,
-                    sum( bj ) bj,
-                    sum( gd ) gd
-                FROM
-                    (
-                        SELECT
-                            CASE
-
-                                WHEN
-                                    CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%369%' THEN
-                                    '双辽市'
-                                WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%370%' THEN
-                                    '伊通县'
-                                WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%371%' THEN
-                                    '梨树县'
-                                WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%372%' THEN
-                                    '铁东区'
-                                WHEN CONCAT( b.ancestors, ',', b.dept_id ) LIKE '%373%' THEN
-                                    '铁西区' ELSE '四平'
-                                END `name`,
-                            a.qs,
-                            a.bj,
-                            a.gd
-                        FROM
-                            (
-                                SELECT
-                                    dept_id,
-                                    count( event_status_value = 'forest_event_status_2' OR NULL ) qs,
-                                    count( event_status_value = 'forest_event_status_5' OR NULL ) bj,
-                                    count( event_status_value = 'forest_event_status_6' OR NULL ) gd
-                                FROM
-                                    onest_event.centerevent_t_eventcatalogue
-                                WHERE
-                                    dept_id IS NOT NULL AND data_status = '0'
-                                GROUP BY
-                                    dept_id
-                            ) a
-                                INNER JOIN onest_system.sys_dept b ON b.dept_id = a.dept_id
-                    ) t
-                GROUP BY
-                    `name`
-            ) b ON b.`name` = a.`name`
-        WHERE a.`name` != '四平市';
+        (
+        SELECT
+        dept_id,
+        count( event_status_value = 'forest_event_status_2' OR NULL ) qs,
+        count( event_status_value = 'forest_event_status_5' OR NULL ) bj,
+        count( event_status_value = 'forest_event_status_6' OR NULL ) gd
+        FROM
+        onest_event.centerevent_t_eventcatalogue
+        <where>
+            dept_id IS NOT NULL AND data_status = '0'
+            <if test="timeArr != null  and timeArr.size > 0">and report_time between #{timeArr[0]} and #{timeArr[1]}
+            </if>
+        </where>
+        GROUP BY
+        dept_id
+        ) a
+        INNER JOIN onest_system.sys_dept b ON b.dept_id = a.dept_id
+        ) t
+        GROUP BY
+        `name`
+        ) b ON b.`name` = a.`name`
+        <where>
+            <if test="true">and a.`name` != '四平市'</if>
+        </where>
     </select>
 
     <select id="selectCentereventTEventmapdept" resultType="Map">
         SELECT
-            a.`name` ,
-            b.total ,
-            a.dept_id
+        a.`name` ,
+        b.total ,
+        a.dept_id
+        FROM
+        (
+        SELECT
+        dept_id,
+        IFNull(dept_as,dept_name) `name`,
+        order_num
+
+        FROM
+        onest_system.sys_dept
+        WHERE
+        dept_id IN ( 367, 3772, 3773, 3774, 3775, 3776, 3777, 3778 )
+        ) a
+        LEFT JOIN (
+        SELECT
+        c.dept_id,
+        count(*) total,
+        a.report_time
         FROM
-            (
-                SELECT
-                    dept_id,
-                    IFNull(dept_as,dept_name) `name`,
-                    order_num
-                FROM
-                    onest_system.sys_dept
-                WHERE
-                    dept_id IN ( 367, 3772, 3773, 3774, 3775, 3776, 3777, 3778 )
-            ) a
-                LEFT JOIN (
-                SELECT
-                    c.dept_id,
-                    count(*) total
-                FROM
-                    ( SELECT event_code, event_status_value FROM onest_event.centerevent_t_eventcatalogue
-                    WHERE event_status_value IN ( 'forest_event_status_2', 'forest_event_status_5', 'forest_event_status_6' ) AND data_status = '0' ) a
-                        INNER JOIN onest_event.centerevent_t_dept_event c ON c.event_code = a.event_code
-                        AND c.dept_handle_type = 'dept_handleType_3'
-                GROUP BY
-                    c.dept_id
-            ) b ON b.dept_id = a.dept_id
+        ( SELECT event_code, event_status_value, report_time FROM onest_event.centerevent_t_eventcatalogue
+        WHERE
+            event_status_value IN ( 'forest_event_status_2', 'forest_event_status_5', 'forest_event_status_6' ) AND
+            data_status = '0'
+          ) a
+            INNER JOIN onest_event.centerevent_t_dept_event c ON c.event_code = a.event_code
+            AND c.dept_handle_type = 'dept_handleType_3'
+        GROUP BY
+        c.dept_id
+        ) b ON b.dept_id = a.dept_id
+        <where>
+        <if test="timeArr != null  and timeArr.size > 0">and b.report_time between #{timeArr[0]} and #{timeArr[1]}
+        </if>
+    </where>
         ORDER BY
-            order_num;
+        order_num;
     </select>
 </mapper>