事件处置增加按分类查询

event-ui/src/views/event/eventhandling/index.vue

@@ -16,6 +16,13 @@
         <el-date-picker v-model="queryParams.day" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="事件分类" prop="eventTypeXls">
+        <el-select v-model="queryParams.eventTypeXls" placeholder="请选择事件分类" clearable filterable
+                   multiple @keyup.enter.native="handleQuery">
+          <el-option v-for="item in defaultTypeXl" :key="item.id" :label="item.eventTypeName"
+                     :value="item.typeXlId"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -25,6 +32,7 @@
       <el-table-column type="selection" align="center" width="50"/>
       <!--<el-table-column label="事件编号" align="center" prop="eventCode" width="150"/>-->
       <el-table-column label="事件名称" align="center" prop="eventName"/>
+      <el-table-column label="事件分类" align="center" prop="eventTypeName"/>
       <el-table-column label="事件状态" align="center" prop="eventStatus"/>
       <el-table-column label="事件图片" align="center" prop="picturePathList">
         <template slot-scope="scope">
@@ -161,6 +169,9 @@ import {
 } from "@/api/event/eventcatalogue/eventcatalogue";
 import Cookies from 'js-cookie';
 import TcPlayer from '@/components/TcPlayer'; // 视频预览
+import {listByParentId} from "@/api/event/eventtypemonitor/eventtypemonitor";
+
+import {getConfigKey} from "@/api/system/config";
 export default {
   name: "Eventcatalogue",
   components: {TcPlayer},
@@ -202,6 +213,7 @@ export default {
       activities: [],
       showTcPlayer: false,//视频预览弹窗
       playVideo: '',//视频预览地址
+      defaultTypeXl: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -209,6 +221,7 @@ export default {
         eventName: undefined,
         eventStatusValue: null,
         day: this.getNowTime(),
+
       },
       // 表单校验
       rules: {
@@ -222,9 +235,21 @@ export default {
     };
   },
   created() {
-  },
-  mounted() {
-    this.getList();
+    listByParentId({parentId: this.$route.query.pid}).then(response => {
+      let obj = {};
+      let reduce = response.data.reduce((curr, next) => {
+        /*判断对象中是否已经有该属性  没有的话 push 到 curr数组*/
+        obj[next.eventTypeName] ? '' : obj[next.eventTypeName] = curr.push(next);
+        return curr;
+      }, []);// 去重
+      this.defaultTypeXl = reduce.filter(item => {
+        return item.parentId != 0;
+      });
+      this.queryParams.defaultTypeXl = this.defaultTypeXl.map(item => {
+        return item.typeXlId;
+      })
+      this.getList();
+    });
   },
   methods: {
     getUrl(url) {

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/bo/VisuForestCloudMapEventListBO.java

@@ -46,4 +46,5 @@ public class VisuForestCloudMapEventListBO {
     private String cameraCode;
 
     private String isExamine;
+    private String eventTypeName;
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/vo/VisuForestCloudMapVO.java

@@ -62,5 +62,6 @@ public class VisuForestCloudMapVO extends BaseBusinessEntity {
      */
     private String reportSource;
 
+    private List<String> eventTypeXls;
 
 }

src/main/resources/mapper/centereventteventcatalogue/CenterEventViewMapper.xml

@@ -431,9 +431,10 @@
     </select>
 
     <select id="listAll" parameterType="VisuForestCloudMapVO" resultType="VisuForestCloudMapEventListBO">
-        select id eventId, event_code eventCode, event_name eventName, event_status_value eventStatusValue, event_status
-        eventStatus, is_examine isExamine, version, address, create_by cameraCode
-        from centerevent_t_eventcatalogue
+        select a.id eventId, a.event_code eventCode, a.event_name eventName, a.event_status_value eventStatusValue, a.event_status
+        eventStatus, a.is_examine isExamine, a.version, a.address, a.create_by cameraCode, e.event_type_name eventTypeName
+        from centerevent_t_eventcatalogue a
+        left join centerevent_t_eventtype e on a.event_type_xl = e.id
         where report_source = 'reporting_source_1' and event_status_value = 'forest_event_status_1'
         <if test="eventName != null and eventName != ''">
             and event_name like concat('%', #{eventName},'%')
@@ -444,6 +445,12 @@
         <if test="day != null and day != ''">
             and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
         </if>
+        <if test="eventTypeXls!= null and eventTypeXls.size > 0">
+            and event_type_xl in
+            <foreach item="eventTypeXl" collection="eventTypeXls" open="(" separator="," close=")">
+                #{eventTypeXl}
+            </foreach>
+        </if>
         order by create_time desc
     </select>