Merge branch 'dev' into dev-2.0_test

# Conflicts:
#	src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java
#	src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/FireIncidentController.java
#	src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/AlarmEventService.java
#	src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java
#	src/main/java/com/sooka/sponest/event/index/service/impl/CenterevenTEventIndexServiceImpl.java
#	src/main/java/com/sooka/sponest/event/urge/service/impl/EventDownServiceImpl.java
#	src/main/java/com/sooka/sponest/event/utils/EventConstants.java
#	src/main/resources/mapper/centereventteventcatalogue/CenterEventViewMapper.xml

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

@@ -42,10 +42,11 @@ export function delDownloads(id) {
     method: 'delete'
   })
 }
+
 //下载事件的视频
 export function eventhandleDownload(id) {
   return request({
-    url: 'center-event/eventcatalogue/eventhandleDownload/' + id,
+    url: 'center-event/downloads/eventhandleDownload/' + id,
     method: 'get'
   })
 }

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

@@ -37,14 +37,6 @@ export function addEventcatalogue(data) {
   })
 }
 
-//下载事件的视频
-export function eventhandleDownload(id) {
-  return request({
-    url: base + '/eventcatalogue/eventhandleDownload/' + id,
-    method: 'get'
-  })
-}
-
 // 删除事件目录
 export function delEventcatalogue(id) {
   return request({

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

@@ -1,381 +1,263 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-<!--                        <el-form-item label="事件编码" prop="eventCode">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.eventCode"-->
-<!--                                    placeholder="请输入事件编码"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </el-form-item>-->
-                        <el-form-item label="事件名称" prop="eventName">
-                            <el-input
-                                    v-model="queryParams.eventName"
-                                    placeholder="请输入事件名称"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-<!--                        <el-form-item label="视频路径" prop="path">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.path"-->
-<!--                                    placeholder="请输入视频路径"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </el-form-item>-->
-<!--                        <el-form-item label="视频下载是否成功" prop="flag">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.flag"-->
-<!--                                    placeholder="请输入视频下载是否成功"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </el-form-item>-->
-<!--                        <el-form-item label="失败原因" prop="reason">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.reason"-->
-<!--                                    placeholder="请输入失败原因"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </el-form-item>-->
-<!--                        <el-form-item label="创建人名称" prop="createName">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.createName"-->
-<!--                                    placeholder="请输入创建人名称"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </el-form-item>-->
-<!--                        <el-form-item label="更新人名称" prop="updateName">-->
-<!--                            <el-input-->
-<!--                                    v-model="queryParams.updateName"-->
-<!--                                    placeholder="请输入更新人名称"-->
-<!--                                    clearable-->
-<!--                                    size="small"-->
-<!--                                    @keyup.enter.native="handleQuery"-->
-<!--                            />-->
-<!--                        </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>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" @submit.native.prevent>
+      <el-form-item label="事件名称" prop="eventName">
+        <el-input
+          v-model="queryParams.eventName"
+          placeholder="请输入事件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-<!--            <el-col :span="1.5">-->
-<!--                <el-button-->
-<!--                        type="primary"-->
-<!--                        plain-->
-<!--                        icon="el-icon-plus"-->
-<!--                        size="mini"-->
-<!--                        @click="handleAdd"-->
-<!--                        v-hasPermi="['event:downloads:add']"-->
-<!--                >新增</el-button>-->
-<!--            </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--                <el-button-->
-<!--                        type="success"-->
-<!--                        plain-->
-<!--                        icon="el-icon-edit"-->
-<!--                        size="mini"-->
-<!--                        :disabled="single"-->
-<!--                        @click="handleUpdate"-->
-<!--                        v-hasPermi="['event:downloads:edit']"-->
-<!--                >修改</el-button>-->
-<!--            </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--                <el-button-->
-<!--                        type="danger"-->
-<!--                        plain-->
-<!--                        icon="el-icon-delete"-->
-<!--                        size="mini"-->
-<!--                        :disabled="multiple"-->
-<!--                        @click="handleDelete"-->
-<!--                        v-hasPermi="['event:downloads:remove']"-->
-<!--                >删除</el-button>-->
-<!--            </el-col>-->
-<!--            <el-col :span="1.5">-->
-<!--                <el-button-->
-<!--                        type="warning"-->
-<!--                        plain-->
-<!--                        icon="el-icon-download"-->
-<!--                        size="mini"-->
-<!--                        @click="handleExport"-->
-<!--                        v-hasPermi="['event:downloads:export']"-->
-<!--                >导出</el-button>-->
-<!--            </el-col>-->
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" :data="downloadsList" @selection-change="handleSelectionChange">
-            <el-table-column  width="55" align="center" />
-<!--                    <el-table-column label="${comment}" align="center" prop="id" />-->
-<!--                    <el-table-column label="事件编码" align="center" prop="eventCode" />-->
-                    <el-table-column label="事件名称" align="center" prop="eventName" />
-<!--                    <el-table-column label="视频路径" align="center" prop="path" />-->
-          <el-table-column label="视频下载状态" align="center" prop="flag">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.downloads_status" :value="scope.row.flag"/>
-            </template>
-          </el-table-column>
-                    <el-table-column label="失败原因" align="center" prop="reason" />
-<!--                    <el-table-column label="创建人名称" align="center" prop="createName" />-->
-<!--                    <el-table-column label="更新人名称" align="center" prop="updateName" />-->
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)"
-                              v-if="scope.row.flag == '1'">视频查看
-                  </el-button>
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            @click="handleDownload(scope.row)"
-                             v-if="scope.row.flag == '0' && scope.row.reason !='该时段未查询到录像信息'"
-                    >下载</el-button>
-<!--                    <el-button-->
-<!--                            size="mini"-->
-<!--                            type="text"-->
-<!--                            icon="el-icon-delete"-->
-<!--                            @click="handleDelete(scope.row)"-->
-<!--                            v-hasPermi="['event:downloads:remove']"-->
-<!--                    >删除</el-button>-->
-                </template>
-            </el-table-column>
-        </el-table>
+    <el-table v-loading="loading" :data="downloadsList" @selection-change="handleSelectionChange">
+      <el-table-column label="事件名称" align="center" prop="eventName" width="500"/>
+      <el-table-column label="视频下载状态码" align="center" prop="flag"/>
+      <el-table-column label="说明" align="center" prop="reason"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)"
+                     v-if="scope.row.flag == '200'">视频查看
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-download" @click="handleDownload(scope.row)"
+                     v-if="scope.row.flag != '200' && scope.row.flag != '202'">下载
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <pagination
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-        />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-<!--      <el-dialog title="视频预览" :visible.sync="showTcPlayer" width="40%" customClass="customWidthMp4">-->
-<!--        <TcPlayer ref="TcPlayer" :playVideo="playVideo" :widthHeigt="[100,100]"></TcPlayer>-->
-<!--      </el-dialog>-->
-      <el-dialog :visible.sync="showTcPlayer" height="40%" width="40%" title="视频预览" @close="closeDialog">
-        <div style="height:400px;text-align:center">
-          <video
-            width="100%"
-            height="100%"
-            :src="playVideo"
-            controls="controls"
-            ref="video"
-          ></video>
-        </div>
-      </el-dialog>
+    <el-dialog :visible.sync="showTcPlayer" height="40%" width="40%" title="视频预览" @close="closeDialog">
+      <div style="height:400px;text-align:center">
+        <video ref="video" width="100%" height="100%" :src="playVideo" controls="controls"></video>
+      </div>
+    </el-dialog>
 
-        <!-- 添加或修改【请填写功能名称】对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                                <el-form-item label="事件编码" prop="eventCode">
-                                    <el-input v-model="form.eventCode" placeholder="请输入事件编码" />
-                                </el-form-item>
-                                <el-form-item label="事件名称" prop="eventName">
-                                    <el-input v-model="form.eventName" placeholder="请输入事件名称" />
-                                </el-form-item>
-                                <el-form-item label="视频路径" prop="path">
-                                    <el-input v-model="form.path" placeholder="请输入视频路径" />
-                                </el-form-item>
-                                <el-form-item label="视频下载是否成功" prop="flag">
-                                    <el-input v-model="form.flag" placeholder="请输入视频下载是否成功" />
-                                </el-form-item>
-                                <el-form-item label="失败原因" prop="reason">
-                                    <el-input v-model="form.reason" placeholder="请输入失败原因" />
-                                </el-form-item>
-                                <el-form-item label="创建人名称" prop="createName">
-                                    <el-input v-model="form.createName" placeholder="请输入创建人名称" />
-                                </el-form-item>
-                                <el-form-item label="更新人名称" prop="updateName">
-                                    <el-input v-model="form.updateName" placeholder="请输入更新人名称" />
-                                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
-    </div>
+    <!-- 添加或修改【请填写功能名称】对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="事件编码" prop="eventCode">
+          <el-input v-model="form.eventCode" placeholder="请输入事件编码"/>
+        </el-form-item>
+        <el-form-item label="事件名称" prop="eventName">
+          <el-input v-model="form.eventName" placeholder="请输入事件名称"/>
+        </el-form-item>
+        <el-form-item label="视频路径" prop="path">
+          <el-input v-model="form.path" placeholder="请输入视频路径"/>
+        </el-form-item>
+        <el-form-item label="视频下载是否成功" prop="flag">
+          <el-input v-model="form.flag" placeholder="请输入视频下载是否成功"/>
+        </el-form-item>
+        <el-form-item label="失败原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入失败原因"/>
+        </el-form-item>
+        <el-form-item label="创建人名称" prop="createName">
+          <el-input v-model="form.createName" placeholder="请输入创建人名称"/>
+        </el-form-item>
+        <el-form-item label="更新人名称" prop="updateName">
+          <el-input v-model="form.updateName" placeholder="请输入更新人名称"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import { listDownloads, getDownloads, delDownloads, addDownloads, updateDownloads,eventhandleDownload } from "@/api/event/downloads/downloads";
-    import TcPlayer from '@/components/TcPlayer'; // 视频预览
-    export default {
-        name: "Downloads",
-      components: {TcPlayer},
-        dicts: ['downloads_status'],
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 【请填写功能名称】表格数据
-                    downloadsList: [],
-                // 弹出层标题
-                title: "",
-                // 是否显示弹出层
-                showTcPlayer: false,//视频预览弹窗
-                playVideo: '',//视频预览地址
-                open: false,
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    eventCode: null,
-                    eventName: null,
-                    path: null,
-                    flag: null,
-                    reason: null,
-                    createName: null,
-                    updateName: null,
+  import {
+    addDownloads,
+    delDownloads,
+    eventhandleDownload,
+    getDownloads,
+    listDownloads,
+    updateDownloads
+  } from "@/api/event/downloads/downloads";
+  import TcPlayer from '@/components/TcPlayer'; // 视频预览
+  export default {
+    name: "Downloads",
+    components: {TcPlayer},
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 【请填写功能名称】表格数据
+        downloadsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        showTcPlayer: false,//视频预览弹窗
+        playVideo: '',//视频预览地址
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          eventCode: null,
+          eventName: null,
+          path: null,
+          flag: null,
+          reason: null,
+          createName: null,
+          updateName: null,
         },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {}
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      /** 查询【请填写功能名称】列表 */
+      getList() {
+        this.loading = true;
+        listDownloads(this.queryParams).then(response => {
+          this.downloadsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      handleDetail(row) {
+        this.showTcPlayer = true;
+        this.playVideo = row.path;
+      },
+      handleDownload(row) {
+        const id = row.eventCode
+        eventhandleDownload(id).then(response => {
+          if (response.data.code == 200) {
+            this.$modal.msgSuccess("下载成功");
+          } else {
+            if (response.data.msg == null) {
+              response.data.msg = "下载失败";
             }
+            this.$modal.msgError(response.data.msg);
+          }
+        });
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          id: null,
+          eventCode: null,
+          eventName: null,
+          path: null,
+          flag: null,
+          reason: null,
+          createBy: null,
+          createName: null,
+          createTime: null,
+          updateBy: null,
+          updateName: null,
+          updateTime: null
         };
-        },
-        created() {
-            this.getList();
-        },
-        methods: {
-            /** 查询【请填写功能名称】列表 */
-            getList() {
-                this.loading = true;
-                listDownloads(this.queryParams).then(response => {
-                    this.downloadsList = response.rows;
-                    this.total = response.total;
-                    this.loading = false;
-                });
-            },
-            // 取消按钮
-            cancel() {
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.id)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加【请填写功能名称】";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const id = row.id || this.ids
+        getDownloads(id).then(response => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改【请填写功能名称】";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateDownloads(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
                 this.open = false;
-                this.reset();
-            },
-            handleDetail(row) {
-              this.showTcPlayer = true;
-                this.playVideo = row.path;
-            },
-          handleDownload(row) {
-            const id = row.eventCode
-            eventhandleDownload(id).then(response => {
-              if(response.data.code == 200){
-                this.$modal.msgSuccess("下载成功");
-              }else{
-                this.$modal.msgError(response.data.msg);
-              }
-
-            });
-          },
-            // 表单重置
-            reset() {
-                this.form = {
-                        id: null,
-                        eventCode: null,
-                        eventName: null,
-                        path: null,
-                        flag: null,
-                        reason: null,
-                        createBy: null,
-                        createName: null,
-                        createTime: null,
-                        updateBy: null,
-                        updateName: null,
-                        updateTime: null
-            };
-                this.resetForm("form");
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1;
                 this.getList();
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length!==1
-                this.multiple = !selection.length
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset();
-                this.open = true;
-                this.title = "添加【请填写功能名称】";
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset();
-                const id = row.id || this.ids
-                getDownloads(id).then(response => {
-                    this.form = response.data;
-                    this.open = true;
-                    this.title = "修改【请填写功能名称】";
-                });
-            },
-            /** 提交按钮 */
-            submitForm() {
-                this.$refs["form"].validate(valid => {
-                    if (valid) {
-                        if (this.form.id != null) {
-                            updateDownloads(this.form).then(response => {
-                                this.$modal.msgSuccess("修改成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        } else {
-                            addDownloads(this.form).then(response => {
-                                this.$modal.msgSuccess("新增成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        }
-                    }
-                });
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const ids = row.id || this.ids;
-                this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function() {
-                    return delDownloads(ids);
-                }).then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                }).catch(() => {});
-            },
-    /** 导出按钮操作 */
-    handleExport() {
+              });
+            } else {
+              addDownloads(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const ids = row.id || this.ids;
+        this.$modal.confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项？').then(function () {
+          return delDownloads(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {
+        });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
         this.download('event/downloads/export', {
-            ...this.queryParams
+          ...this.queryParams
         }, `downloads_${new Date().getTime()}.xlsx`)
+      }
     }
-    }
-    };
+  };
 </script>

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

@@ -357,7 +357,6 @@
   import {
     addEventcatalogue,
     delEventcatalogue,
-    eventhandleDownload,
     getEventcatalogue,
     listByPc,
     listcentereventtfirelog,
@@ -365,6 +364,7 @@
     listSJfl,
     listYuAn
   } from "@/api/event/eventcatalogue/eventcatalogue";
+  import {eventhandleDownload} from "@/api/event/downloads/downloads";
   import {getConfigKey} from "@/api/system/config";
   import {listByParentId} from "@/api/event/eventtypemonitor/eventtypemonitor";
   import Deptselector from '@/views/components/deptselector';

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CenterEventViewController.java

@@ -144,4 +144,26 @@ public class CenterEventViewController extends BaseController {
         startPage();
         return getDataTable(centerEventViewService.listAll(visuForestCloudMapVO));
     }
+
+    /**
+     * 住建事件统计
+     *
+     * @param visuForestCloudMapVO
+     * @return
+     */
+    @PostMapping("/getHousingConstructionEventCount")
+    public R getHousingConstructionEventCount(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
+        return R.ok(centerEventViewService.getHousingConstructionEventCount(visuForestCloudMapVO));
+    }
+
+    /**
+     * 住建事件列表
+     *
+     * @param visuForestCloudMapVO
+     * @return
+     */
+    @PostMapping("/getHousingConstructionEventList")
+    public R getHousingConstructionEventList(@RequestBody VisuForestCloudMapVO visuForestCloudMapVO) {
+        return R.ok(centerEventViewService.getHousingConstructionEventList(visuForestCloudMapVO));
+    }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTDownloadsController.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.event.centereventteventcatalogue.controller;
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -12,12 +13,13 @@ import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
-import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
 import com.sooka.sponest.event.utils.EventConstants;
+import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -35,7 +37,7 @@ public class CentereventTDownloadsController extends BaseController {
     private ICentereventTDownloadsService centereventTDownloadsService;
 
     @Autowired
-    private ICentereventTEventcatalogueService centereventTEventcatalogueService;
+    private RemoteMonitorService remoteMonitorService;
 
 //    @Autowired
 //    private RemoteMessageService remoteMessageService;
@@ -80,12 +82,6 @@ public class CentereventTDownloadsController extends BaseController {
         return getDataTable(list);
     }
 
-    @PostMapping("/downloadsMonth")
-    public AjaxResult downloadsMonth(@RequestBody Map<String, Object> params) throws Exception {
-        centereventTEventcatalogueService.downloadsCommon(params);
-        return AjaxResult.success();
-    }
-
     /**
      * 导出【请填写功能名称】列表
      */
@@ -120,7 +116,7 @@ public class CentereventTDownloadsController extends BaseController {
     /**
      * 修改【请填写功能名称】
      */
-    @RequiresPermissions("event:downloads:edit")
+//    @RequiresPermissions("event:downloads:edit")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CentereventTDownloads centereventTDownloads) {
@@ -136,4 +132,30 @@ public class CentereventTDownloadsController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(centereventTDownloadsService.deleteCentereventTDownloadsByIds(ids));
     }
+
+    /**
+     * 事件视频下载
+     *
+     * @param id
+     * @return
+     */
+    @Log(title = "事件视频下载", businessType = BusinessType.OTHER)
+    @GetMapping("/eventhandleDownload/{id}")
+    public R eventhandleDownload(@PathVariable("id") String id) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("id", id);
+        List<Map<String, Object>> list = centereventTDownloadsService.downloadsCommon(params);
+        // 校验 已下载不让重复下载
+        if (StringUtils.isEmpty(list)) {
+            return R.fail("已下载的视频，不能重复下载!");
+        } else {
+            return remoteMonitorService.getPlaybackByTime(list);
+        }
+    }
+
+    @PostMapping("/downloadsMonth")
+    public R downloadsMonth(@RequestBody Map<String, Object> params) {
+        List<Map<String, Object>> list = centereventTDownloadsService.downloadsCommon(params);
+        return remoteMonitorService.getPlaybackByTime(list);
+    }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.centereventteventcatalogue.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.SpringUtils;
@@ -18,7 +17,6 @@ import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.domain.SysUser;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.CentereventtDeptEventBO;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
@@ -32,15 +30,11 @@ import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.utils.EventProducerUtil;
 import com.sooka.sponest.event.utils.ExcelUtil;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
-import com.sooka.sponest.exchange.api.RemoteExchangeService;
-import com.sooka.sponest.exchange.api.domain.FireEventVO;
 import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -363,59 +357,4 @@ public class CentereventTEventcatalogueController extends BaseController {
         centereventTEventcatalogueService.reportFirePreventionOffice(centereventtDeptEventBO);
         return AjaxResult.success();
     }
-
-    /**
-     * 事件视频下载
-     *
-     * @param id
-     * @return
-     */
-    @Log(title = "事件视频下载", businessType = BusinessType.OTHER)
-    @GetMapping("/eventhandleDownload/{id}")
-    public AjaxResult eventhandleDownload(@PathVariable("id") String id) {
-        //校验 已下载不让重复下载
-        CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
-        centereventTDownloads.setEventCode(id);
-        centereventTDownloads.setFlag("1");
-        List<CentereventTDownloads> downloadsList = centereventTDownloadsService.selectCentereventTDownloadsList(centereventTDownloads);
-        if (StringUtils.isNotEmpty(downloadsList)) {
-            return AjaxResult.error("已下载的视频，不能重复下载!");
-        } else {
-            return AjaxResult.success(centereventTEventcatalogueService.eventhandleDownload(id));
-        }
-    }
-
-    /**
-     * 119事件推送
-     *
-     * @param fireEventVO
-     * @return
-     */
-    @PostMapping("/push3rdSystemEvent")
-    public R push3rdSystemEvent(@Validated @RequestBody FireEventVO fireEventVO) {
-        if (StringUtils.isBlank(fireEventVO.getEventId()) || StringUtils.isBlank(fireEventVO.getEventCode())) {
-            return R.ok(HttpStatus.UNSUPPORTED_TYPE, "参数异常");
-        }
-        // 101森林火情、102秸秆禁烧、103建筑物火情、1002消防占道、510水压监测异常、1001电瓶车进电梯
-        if (!Arrays.asList("101", "102", "103", "510", "1001", "1002", "1003", "1004").contains(fireEventVO.getEventType())) {
-            return R.ok(HttpStatus.UNSUPPORTED_TYPE, "无法推送该类型事件");
-        }
-        List<String> pictures = fireEventVO.getEventPicture().stream().map(item -> item.substring(item.indexOf("group1"))).collect(Collectors.toList());
-        fireEventVO.setPictureUrlList(pictures);
-        R result = SpringUtils.getBean(RemoteExchangeService.class).receiveEventData(fireEventVO);
-        logger.info("事件接受参数：{}, 事件结果返回：{}", JSON.toJSONString(fireEventVO), JSON.toJSONString(result));
-        if (200 == result.getCode()) {
-            // log
-            CentereventTFireLog log = new CentereventTFireLog();
-            log.setId(IdUtils.simpleUUID());
-            log.setEventCode(fireEventVO.getEventCode());
-            log.setLogContent(SecurityUtils.getLoginUser().getSysUser().getNickName() + "推送该事件至119接处警");
-            centereventTFireLogService.insertCentereventTFireLog(log);
-            CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue();
-            centereventTEventcatalogue.setId(fireEventVO.getEventId());
-            centereventTEventcatalogue.setIsPush("1");
-            return R.ok(centereventTEventcatalogueService.updateCentereventTEventcatalogue(centereventTEventcatalogue));
-        }
-        return result;
-    }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/FireIncidentController.java

@@ -8,20 +8,14 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.DaHuaEventBO;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.service.AlarmEventService;
-import com.sooka.sponest.event.centereventteventtype.domain.CentereventTEventtype;
-import com.sooka.sponest.event.centereventteventtype.service.ICentereventTEventtypeService;
 import com.sooka.sponest.event.centereventtreportmessage.domain.CentereventTReportmessage;
 import com.sooka.sponest.event.centereventtreportmessage.service.ICentereventTReportmessageService;
-import com.sooka.sponest.exchange.api.domain.FireEventVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,9 +36,6 @@ public class FireIncidentController {
     @Autowired
     private ICentereventTReportmessageService centereventTReportmessageService;
 
-    @Autowired
-    private ICentereventTEventtypeService centereventTEventtypeService;
-
     /**
      * 传感器事件上报
      *
@@ -61,7 +52,7 @@ public class FireIncidentController {
             logger.error(e.getMessage());
         }
         if (StringUtils.isBlank(eventCode)) {
-            eventCode = System.currentTimeMillis() + "_";
+            eventCode = System.currentTimeMillis() + "_ ";
         }
         try {
             String[] array = eventCode.split("_");
@@ -86,11 +77,14 @@ public class FireIncidentController {
      */
     @PostMapping("/updateFireEventImage")
     public AjaxResult updateFireEventImage(@RequestBody DaHuaEventBO eventBO) throws ClientException {
-        if (StringUtils.isBlank(eventBO.getEventCode()) || StringUtils.isBlank(eventBO.getLogId())) {
+        CentereventTReportmessage centereventTReportmessage = null;
+        if (StringUtils.isNotBlank(eventBO.getEventCode()) && StringUtils.isNotBlank(eventBO.getLogId())) {
+            // 通过eventCode获取报文信息
+            centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
+        }
+        if (StringUtils.isNull(centereventTReportmessage)) {
             return AjaxResult.success("参数异常");
         }
-        // 通过eventCode获取报文信息
-        CentereventTReportmessage centereventTReportmessage = centereventTReportmessageService.selectCentereventTReportmessageById(eventBO.getEventCode());
         // 解析报文
         JSONObject context = JSONObject.parseObject(centereventTReportmessage.getContext()).getJSONObject("info");
         eventBO.setAlarmCode(context.getString("alarmCode"));
@@ -100,47 +94,32 @@ public class FireIncidentController {
     }
 
     /**
-     * 119事件上报
+     * 住建事件上报
      *
-     * @param fireEventVO
-     * @return
+     * @param sensorEventVo
+     * @return R
      */
-    @Log(title = "事件上报", businessType = BusinessType.INSERT)
-    @PostMapping("/insert3rdSystemEvent")
-    public R insert3rdSystemEvent(@Validated @RequestBody FireEventVO fireEventVO) {
-        // 验证token
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (StringUtils.isNull(loginUser)) {
-            logger.error("权限认证失败---{}", fireEventVO);
-            return R.fail("权限认证失败");
-        }
-        // 根据事件小类，反查事件大类
-        CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(fireEventVO.getEventType());
-        if (StringUtils.isNull(eventtype)) {
-            logger.error("不支持的事件类型---{}", fireEventVO);
-            return R.fail("不支持的事件类型");
-        }
-        StringBuilder eventCode = new StringBuilder();
+    @PostMapping("/insertHousingConstructionEvent")
+    public R insertHousingConstructionEvent(@RequestBody SensorEventVo sensorEventVo) {
+        String eventCode = null;
         try {
-            fireEventVO.setEventSupType(eventtype.getParentId());
-            // 处理上报逻辑
-            eventCode.append(alarmEventService.insert3rdSystemEvent(fireEventVO));
+            eventCode = alarmEventService.insertHousingConstructionEvent(sensorEventVo);
         } catch (Exception e) {
             logger.error(e.getMessage());
         }
-        if (StringUtils.isBlank(eventCode.toString())) {
-            eventCode.append(System.currentTimeMillis());
+        if (StringUtils.isBlank(eventCode)) {
+            eventCode = System.currentTimeMillis() + "_ ";
         }
-        // 写入报文
         try {
+            String[] array = eventCode.split("_");
             CentereventTReportmessage tReportMessage = new CentereventTReportmessage();
-            tReportMessage.setId(eventCode.toString());
-            tReportMessage.setSource("119接处警-" + eventtype.getEventTypeName());
-            tReportMessage.setContext(JSON.toJSONString(fireEventVO));
+            tReportMessage.setId(array[0]);
+            tReportMessage.setSource("数字住建-" + array[1]);
+            tReportMessage.setContext(JSON.toJSONString(sensorEventVo));
             centereventTReportmessageService.insertCentereventTReportmessage(tReportMessage);
         } catch (Exception e) {
             logger.error(e.getMessage());
         }
-        return R.ok(null, "接收成功");
+        return R.ok();
     }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/sensor/SensorEventVo.java

@@ -34,4 +34,6 @@ public class SensorEventVo {
     private String address;// 地址
 
     private String picture;// 图片
+
+    private String deptType;
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/mapper/CenterEventViewMapper.java

@@ -39,5 +39,7 @@ public interface CenterEventViewMapper {
 
     List<VisuForestCloudMapEventListBO> listAll(VisuForestCloudMapVO visuForestCloudMapVO);
 
-    List<VisuForestCloudMapEventListBO> getEventFileAll(VisuForestCloudMapVO visuForestCloudMapVO);
+    Map<String, Object> getHousingConstructionEventCount(VisuForestCloudMapVO visuForestCloudMapVO);
+
+    List<VisuForestCloudMapEventListBO> getHousingConstructionEventList(VisuForestCloudMapVO visuForestCloudMapVO);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/mapper/CentereventTDownloadsMapper.java

@@ -1,8 +1,10 @@
 package com.sooka.sponest.event.centereventteventcatalogue.mapper;
 
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -52,7 +54,5 @@ public interface CentereventTDownloadsMapper {
      */
     int deleteCentereventTDownloadsByIds(String[] ids);
 
-    List<CentereventTDownloads> validDownloadIs();
-
-    CentereventTDownloads validDownloadIsOne(String logId);
+    List<CentereventTEventcatalogue> getbeforedateDownload(Map<String, Object> params);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/mapper/CentereventTEventcatalogueMapper.java

@@ -5,7 +5,6 @@ import com.sooka.sponest.event.urge.domain.EventReminder;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 事件目录Mapper接口
@@ -63,6 +62,4 @@ public interface CentereventTEventcatalogueMapper {
     List<EventReminder> getReminderTime(@Param("isUrged") String isUrged, @Param("eventStatusValue") String eventStatusValue);
 
     CentereventTEventcatalogue mqtest(@Param("start") String start, @Param("end") String end, @Param("limit") int limit);
-
-    List<CentereventTEventcatalogue> getbeforedateDownload(Map<String, Object> params);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/AlarmEventService.java

@@ -7,7 +7,6 @@ import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.DaHuaOthe
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.EventsVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.HaiKangEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
-import com.sooka.sponest.exchange.api.domain.FireEventVO;
 
 public interface AlarmEventService {
 
@@ -31,7 +30,6 @@ public interface AlarmEventService {
     // 传感器事件
     String insertSensorEvent(SensorEventVo sensorEventVo);
 
-
-    // 119接处警
-    String insert3rdSystemEvent(FireEventVO fireEventVO);
+    // 住建事件
+    String insertHousingConstructionEvent(SensorEventVo sensorEventVo);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/ICenterEventViewService.java

@@ -38,4 +38,8 @@ public interface ICenterEventViewService {
     VisuForestEventTodayEventListBO eventPush(VisuForestCloudMapVO visuForestCloudMapVO);
 
     List<VisuForestCloudMapEventListBO> listAll(VisuForestCloudMapVO visuForestCloudMapVO);
+
+    Map<String, Object> getHousingConstructionEventCount(VisuForestCloudMapVO visuForestCloudMapVO);
+
+    List<VisuForestCloudMapEventListBO> getHousingConstructionEventList(VisuForestCloudMapVO visuForestCloudMapVO);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/ICentereventTDownloadsService.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.event.centereventteventcatalogue.service;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Service接口
@@ -52,7 +53,5 @@ public interface ICentereventTDownloadsService {
      */
     int deleteCentereventTDownloadsByIds(String[] ids);
 
-    List<CentereventTDownloads> validDownloadIs();
-
-    CentereventTDownloads validDownloadIsOne(String logId);
+    List<Map<String, Object>> downloadsCommon(Map<String, Object> params);
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/ICentereventTEventcatalogueService.java

@@ -1,13 +1,11 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service;
 
-import com.ruoyi.common.core.domain.R;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.CentereventtDeptEventBO;
 import com.sooka.sponest.event.urge.domain.EventReminder;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 事件目录Service接口
@@ -82,9 +80,5 @@ public interface ICentereventTEventcatalogueService {
 
     void reportFirePreventionOffice(CentereventtDeptEventBO centereventtDeptEventBO);
 
-    R eventhandleDownload(String id);
-
     CentereventTEventcatalogue mqtest(String start, String end, int limit);
-
-    void downloadsCommon(Map<String, Object> params) throws InterruptedException;
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -8,7 +8,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteDeptService;
+import com.ruoyi.system.api.domain.SysDept;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
@@ -26,7 +27,6 @@ import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogS
 import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
-import com.sooka.sponest.exchange.api.domain.FireEventVO;
 import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
@@ -95,9 +95,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = eventsVo.getSrcName();
         Date reportTime = eventsVo.getData().getSendTime();
         String address = eventsVo.getData().getAlarm().getPlaceName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
-                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -156,9 +155,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = eventsVo.getSrcName();
         Date reportTime = haiKangEventVo.getSendTime();
         String address = eventsVo.getData().getText()[0].getOrgName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
-                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -176,60 +174,54 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     }
 
     // 事件目录
-    private void insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
+    private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime) {
         //生成uuid
         String eventCode = IdUtils.simpleUUID();
-        eventcatalogue.setId(eventCode);
-        eventcatalogue.setEventCode(eventCode);
-        eventcatalogue.setIsUrged(SYS_ISURGE_2);// sys_isurge_2
-        eventcatalogue.setEventStatus(null == eventcatalogue.getEventStatus() ? "上报" : eventcatalogue.getEventStatus());
-        eventcatalogue.setEventStatusValue(null == eventcatalogue.getEventStatusValue() ? FOREST_EVENT_STATUS_1 : eventcatalogue.getEventStatusValue());// forest_event_status_1
-        if (null == eventcatalogue.getCreateTime()) {
-            eventcatalogue.setCreateTime(DateUtils.getNowDate());
+        centereventTEventcatalogue.setId(eventCode);
+        centereventTEventcatalogue.setEventCode(eventCode);
+        if (null == centereventTEventcatalogue.getReportSource()) {
+            centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_1);//reporting_source_1
         }
-        centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcatalogue);
+        centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);//sys_isurge_2
+        centereventTEventcatalogue.setEventStatus("上报");
+        centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_1);//forest_event_status_1
+        centereventTEventcatalogue.setCreateBy(centerdataTCamera.getId());
+        centereventTEventcatalogue.setCreateName(centerdataTCamera.getCameraName());
+        centereventTEventcatalogue.setCreateTime(null == createTime ? DateUtils.getNowDate() : createTime);
+        centereventTEventcatalogueService.insertCentereventTEventcatalogue(centereventTEventcatalogue);
+        return centereventTEventcatalogue;
     }
 
     // 事件部门
-    private void insertEventDept(CentereventTEventcatalogue eventcatalogue, List<CenterdataTAidevicedept> listDept) {
+    private void insertEventDept(CentereventTEventcatalogue centereventTEventcatalogue, List<CenterdataTAidevicedept> listDept) {
         listDept.forEach(item -> {
-            CentereventDeptEvent deptEvent = new CentereventDeptEvent();
-            deptEvent.setId(IdUtils.fastSimpleUUID());
-            deptEvent.setEventCode(eventcatalogue.getEventCode());
-            deptEvent.setDeptId(item.getMapDeptId());
-            deptEvent.setDeptName(item.getMapDeptName());
-            deptEvent.setIsUrged(SYS_ISURGE_2);
-            deptEvent.setEventStatus(eventcatalogue.getEventStatus());
-            deptEvent.setEventStatusValue(eventcatalogue.getEventStatusValue());
-            if (REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())) {
-                deptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_1);
-                deptEvent.setCreateBy(eventcatalogue.getCreateBy());
-            } else {
-                deptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_2);
-            }
-            deptEvent.setCreateName(eventcatalogue.getCreateName());
-            deptEvent.setCreateTime(eventcatalogue.getCreateTime());
-            centereventTDeptEventService.insertCentereventTDeptEvent(deptEvent);
+            CentereventDeptEvent centereventTDeptEvent = new CentereventDeptEvent();
+            centereventTDeptEvent.setId(IdUtils.fastSimpleUUID());
+            centereventTDeptEvent.setEventCode(centereventTEventcatalogue.getEventCode());
+            centereventTDeptEvent.setDeptId(item.getMapDeptId());
+            centereventTDeptEvent.setDeptName(item.getMapDeptName());
+            centereventTDeptEvent.setIsUrged(SYS_ISURGE_2);
+            centereventTDeptEvent.setEventStatus("上报");
+            centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_1);
+            centereventTDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_2);
+            centereventTDeptEvent.setCreateName(centereventTEventcatalogue.getCreateName());
+            centereventTDeptEvent.setCreateTime(centereventTEventcatalogue.getCreateTime());
+            centereventTDeptEventService.insertCentereventTDeptEvent(centereventTDeptEvent);
         });
     }
 
     // 事件日志
-    private String insertEventLog(CentereventTEventcatalogue eventcatalogue) {
-        CentereventTFireLog fireLog = new CentereventTFireLog();
-        fireLog.setId(IdUtils.simpleUUID());
-        fireLog.setEventCode(eventcatalogue.getEventCode());
-        fireLog.setLogContent(eventcatalogue.getEventName() + System.getProperty("line.separator") + eventcatalogue.getEventDescription());
-        fireLog.setOperation(BUS_OPER_TYPE_2);
-        if (REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())) {
-            fireLog.setOperationType(LOG_OPER_TYPE_4);
-            fireLog.setCreateBy(eventcatalogue.getCreateBy());
-        } else {
-            fireLog.setOperationType(LOG_OPER_TYPE_3);
-        }
-        fireLog.setCreateName(eventcatalogue.getCreateName());
-        fireLog.setCreateTime(eventcatalogue.getCreateTime());
-        centereventTFireLogService.insertCentereventTFireLog(fireLog);
-        return fireLog.getId();
+    private String insertEventLog(CentereventTEventcatalogue centereventTEventcatalogue) {
+        CentereventTFireLog centereventTFireLog = new CentereventTFireLog();
+        centereventTFireLog.setId(IdUtils.simpleUUID());
+        centereventTFireLog.setEventCode(centereventTEventcatalogue.getEventCode());
+        centereventTFireLog.setLogContent(centereventTEventcatalogue.getEventName() + System.getProperty("line.separator") + centereventTEventcatalogue.getEventDescription());
+        centereventTFireLog.setOperation(BUS_OPER_TYPE_2);
+        centereventTFireLog.setOperationType(LOG_OPER_TYPE_3);
+        centereventTFireLog.setCreateName(centereventTEventcatalogue.getCreateName());
+        centereventTFireLog.setCreateTime(centereventTEventcatalogue.getCreateTime());
+        centereventTFireLogService.insertCentereventTFireLog(centereventTFireLog);
+        return centereventTFireLog.getId();
     }
 
 
@@ -270,9 +262,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = infoVO.getDeviceName();
         Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate());
         String address = centerdataTCamera.getCameraRegion();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
-                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaFireEventVO.getCreateTime());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -415,9 +406,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = centerdataTCamera.getCameraName();
         Date reportTime = DateUtils.timestampToTime(daHuaOtherEventVO.getOccurrenceTime());
         String address = daHuaOtherEventVO.getAddress();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
-                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaOtherEventVO.getCreateTime());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaOtherEventVO.getCreateTime());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -449,9 +439,10 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 事件目录
         CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(sensorEventVo.getEventTypeXl());
         String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(),
-                REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1, sensorEventVo.getSensorId(), sensorEventVo.getReportor(), DateUtils.getNowDate());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress());
+        centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_4);
+        CenterdataTCamera centerdataTCamera = new CenterdataTCamera(sensorEventVo.getSensorId(), sensorEventVo.getReportor());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -468,37 +459,56 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         return centereventTEventcatalogue.getEventCode() + "_" + eventtype.getEventTypeName();
     }
 
-    /**
-     * 119平台上报事件
-     *
-     * @param fireEventVO
-     * @return
-     */
+    @Transactional
     @Override
-    public String insert3rdSystemEvent(FireEventVO fireEventVO) {
-        // 事件信息
-        CentereventTEventcatalogue eventcatalogue = new CentereventTEventcatalogue(fireEventVO.getEventSupType(), fireEventVO.getEventType(), fireEventVO.getEventName(), fireEventVO.getEventDescription(),
-                fireEventVO.getEventLongitude(), fireEventVO.getEventLatitude(), fireEventVO.getEventReporter(), fireEventVO.getEventReportTime(), fireEventVO.getEventLocation(), REPORTING_SOURCE_5,
-                "签收", FOREST_EVENT_STATUS_2, SecurityUtils.getLoginUser().getSysUser().getUserId().toString(), SecurityUtils.getLoginUser().getSysUser().getNickName(), DateUtils.getNowDate());
-        eventcatalogue.setDeptId(SecurityUtils.getLoginUser().getSysUser().getDeptId());
-        eventcatalogue.setDeptName(SecurityUtils.getLoginUser().getSysUser().getDeptNames());
-        this.insertEventCatalogue(eventcatalogue);
-        // 事件部门
-        List<CenterdataTAidevicedept> listDept = new ArrayList<>();
-        listDept.add(new CenterdataTAidevicedept(eventcatalogue.getDeptId(), eventcatalogue.getDeptName()));
-        this.insertEventDept(eventcatalogue, listDept);
-        String logId = this.insertEventLog(eventcatalogue);
-        List<CenterdataTAttach> attachList = new ArrayList<>();
-        for (String picture : fireEventVO.getPictureUrlList()) {
-            CenterdataTAttach attach = new CenterdataTAttach();
-            attach.setBusId(logId);
-            attach.setAttachPath(picture);
-            attach.setBusIndx(BUS_INDEX_1);
-            attach.setBusSource("3RD");
-            attach.setFileType(FILE_TYPE_1);
-            attachList.add(attach);
+    public String insertHousingConstructionEvent(SensorEventVo sensorEventVo) {
+        // 验证是否配置市级住建局
+        SysDept sysDept = new SysDept();
+        sysDept.setDeptId(Long.valueOf(SI_PING));
+        sysDept.setDeptType(sensorEventVo.getDeptType());// 住建：sys_dept_type_31，执法：
+        List<SysDept> listDept = SpringUtils.getBean(RemoteDeptService.class).getDeptsByDeptType(sysDept).getData();
+        if (StringUtils.isEmpty(listDept)) {
+            logger.info("无法匹配相关部门！");
+            return "";
+        }
+        // 事件目录
+        CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(sensorEventVo.getEventTypeXl());
+        String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress());
+        centereventTEventcatalogue.setId(IdUtils.simpleUUID());
+        centereventTEventcatalogue.setEventCode(centereventTEventcatalogue.getId());
+        centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_5);
+        centereventTEventcatalogue.setIsUrged(SYS_ISURGE_2);//sys_isurge_2
+        centereventTEventcatalogue.setEventStatus("归档");
+        centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_6);//forest_event_status_6
+        if ("sys_dept_type_31".equals(sensorEventVo.getDeptType())) {
+            centereventTEventcatalogue.setDeptId(Long.parseLong(sensorEventVo.getSensorId()));
+            centereventTEventcatalogue.setDeptName(sensorEventVo.getReportor());
+        } else {
+            centereventTEventcatalogue.setDeptId(listDept.get(0).getDeptId());
+            centereventTEventcatalogue.setDeptName(listDept.get(0).getDeptName());
         }
-        remoteDataService.delAndInsertBatch(JSON.toJSONString(attachList));
-        return eventcatalogue.getEventCode();
+        centereventTEventcatalogue.setCreateBy(sensorEventVo.getSensorId());
+        centereventTEventcatalogue.setCreateName(sensorEventVo.getReportor());
+        centereventTEventcatalogue.setCreateTime(DateUtils.getNowDate());
+        centereventTEventcatalogueService.insertCentereventTEventcatalogue(centereventTEventcatalogue);
+        // 事件部门
+        listDept.forEach(item -> {
+            CentereventDeptEvent centereventTDeptEvent = new CentereventDeptEvent();
+            centereventTDeptEvent.setId(IdUtils.fastSimpleUUID());
+            centereventTDeptEvent.setEventCode(centereventTEventcatalogue.getEventCode());
+            centereventTDeptEvent.setDeptId(item.getDeptId());
+            centereventTDeptEvent.setDeptName(item.getDeptName());
+            centereventTDeptEvent.setIsUrged(SYS_ISURGE_2);
+            centereventTDeptEvent.setEventStatus("归档");
+            centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_6);
+            centereventTDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
+            centereventTDeptEvent.setCreateName(centereventTEventcatalogue.getCreateName());
+            centereventTDeptEvent.setCreateTime(centereventTEventcatalogue.getCreateTime());
+            centereventTDeptEventService.insertCentereventTDeptEvent(centereventTDeptEvent);
+        });
+        // 事件日志
+        this.insertEventLog(centereventTEventcatalogue);
+        return centereventTEventcatalogue.getEventCode() + "_" + eventtype.getEventTypeName();
     }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CenterEventViewServiceImpl.java

@@ -177,11 +177,11 @@ public class CenterEventViewServiceImpl extends BaseService implements ICenterEv
         resultMap.put("visuForestCloudYuAnBo", yuAnMap);
         resultMap.put("eventlog", logs);
         // 摄像头上报
-        if ("reporting_source_1".equals(catalogue.getReportSource())) {
+        if (REPORTING_SOURCE_1.equals(catalogue.getReportSource())) {
             resultMap.put("centermonitorTCamera", SpringUtils.getBean(RemoteMonitorService.class).selectByCameraId(catalogue.getCreateBy()).getData());
         }
         // 传感器上报
-        if ("reporting_source_4".equals(catalogue.getReportSource())) {
+        if (REPORTING_SOURCE_4.equals(catalogue.getReportSource())) {
             resultMap.put("centermonitorTCamera", new CenterdataTCamera(catalogue.getCreateBy(), catalogue.getCreateName()));
         }
         return resultMap;
@@ -281,7 +281,8 @@ public class CenterEventViewServiceImpl extends BaseService implements ICenterEv
         String token = RemoteApiUtil.getInstance().getToken();// 大华token
         List<String> eventCodes = result.stream().map(VisuForestCloudMapEventListBO::getEventCode).collect(Collectors.toList());
         visuForestCloudMapVO.setEventStatus(eventCodes);
-        List<VisuForestCloudMapEventListBO> attachs = centerEventViewMapper.getEventFileAll(visuForestCloudMapVO);
+        visuForestCloudMapVO.setTemplateType("true");
+        List<VisuForestCloudMapEventListBO> attachs = centerEventViewMapper.getEventFile(visuForestCloudMapVO);
         result.forEach(event -> {
             for (VisuForestCloudMapEventListBO attach : attachs) {
                 if (event.getEventCode().equals(attach.getEventCode())) {
@@ -295,4 +296,35 @@ public class CenterEventViewServiceImpl extends BaseService implements ICenterEv
         });
         return result;
     }
+
+    @Override
+    public Map<String, Object> getHousingConstructionEventCount(VisuForestCloudMapVO visuForestCloudMapVO) {
+        return centerEventViewMapper.getHousingConstructionEventCount(visuForestCloudMapVO);
+    }
+
+    @Override
+    public List<VisuForestCloudMapEventListBO> getHousingConstructionEventList(VisuForestCloudMapVO visuForestCloudMapVO) {
+        setSookaDataBase(visuForestCloudMapVO);
+        List<VisuForestCloudMapEventListBO> result = centerEventViewMapper.getHousingConstructionEventList(visuForestCloudMapVO);
+        if (StringUtils.isEmpty(result)) {
+            return result;
+        }
+        Map<String, String> keyMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
+        String token = RemoteApiUtil.getInstance().getToken();// 大华token
+        List<String> eventCodes = result.stream().map(VisuForestCloudMapEventListBO::getEventCode).collect(Collectors.toList());
+        visuForestCloudMapVO.setEventStatus(eventCodes);
+        List<VisuForestCloudMapEventListBO> attachs = centerEventViewMapper.getEventFile(visuForestCloudMapVO);
+        result.forEach(event -> {
+            for (VisuForestCloudMapEventListBO attach : attachs) {
+                if (event.getEventCode().equals(attach.getEventCode())) {
+                    if ("DH_1".equals(attach.getPictureSource())) {
+                        event.setPicturePath(FilePrefixUtils.getUrlPrefix(attach.getPictureSource(), keyMap) + attach.getPicturePath() + "?token=" + token);
+                    } else {
+                        event.setPicturePath(FilePrefixUtils.getUrlPrefix(attach.getPictureSource(), keyMap) + attach.getPicturePath());
+                    }
+                }
+            }
+        });
+        return result;
+    }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTDownloadsServiceImpl.java

@@ -1,16 +1,19 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTDownloadsMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Service业务层处理
@@ -21,8 +24,6 @@ import java.util.List;
 @Service
 public class CentereventTDownloadsServiceImpl extends BaseService implements ICentereventTDownloadsService {
 
-    final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     private CentereventTDownloadsMapper centereventTDownloadsMapper;
 
@@ -84,12 +85,26 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
     }
 
     @Override
-    public List<CentereventTDownloads> validDownloadIs() {
-        return centereventTDownloadsMapper.validDownloadIs();
-    }
+    public List<Map<String, Object>> downloadsCommon(Map<String, Object> params) {
+        List<CentereventTEventcatalogue> eventcatalogues = centereventTDownloadsMapper.getbeforedateDownload(params);
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        for (CentereventTEventcatalogue eventcatalogue : eventcatalogues) {
+            String uuid = IdUtils.simpleUUID();
+            CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
+            centereventTDownloads.setId(uuid);
+            centereventTDownloads.setEventCode(eventcatalogue.getEventCode());
+            centereventTDownloads.setEventName(eventcatalogue.getEventName());
+            centereventTDownloads.setLogId(eventcatalogue.getId());
+            this.insertCentereventTDownloads(centereventTDownloads);
 
-    @Override
-    public CentereventTDownloads validDownloadIsOne(String logId) {
-        return centereventTDownloadsMapper.validDownloadIsOne(logId);
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", uuid);
+            map.put("logId", eventcatalogue.getId());
+            map.put("cameraId", eventcatalogue.getCreateBy());
+            map.put("startTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), -2)));
+            map.put("endTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), 1)));
+            resultList.add(map);
+        }
+        return resultList;
     }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/CentereventTEventcatalogueServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service.impl;
 
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -16,7 +15,6 @@ import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.CentereventtDeptEventBO;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.LatLng;
@@ -37,14 +35,11 @@ import com.sooka.sponest.event.centereventtregionalflag.domain.RegionalFlag;
 import com.sooka.sponest.event.centereventtregionalflag.mapper.CentereventTRegionalFlagMapper;
 import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.sooka.sponest.event.urge.domain.EventDown;
 import com.sooka.sponest.event.urge.domain.EventReminder;
 import com.sooka.sponest.event.urge.domain.EventUrge;
-import com.sooka.sponest.event.urge.service.EventDownService;
 import com.sooka.sponest.event.urge.service.EventUrgeService;
 import com.sooka.sponest.event.utils.EventProducerUtil;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
-import com.sooka.sponest.monitor.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -78,8 +73,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     @Autowired
     private RemoteDataService remoteDataService;
     @Autowired
-    private RemoteMonitorService remoteMonitorService;
-    @Autowired
     private ICentereventDeptEventService centereventDeptEventService;
     @Autowired
     private ICentereventTEventtypemapdeptService centereventTEventtypemapdeptService;
@@ -94,8 +87,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     @Autowired
     private EventUrgeService eventUrgeService;
     @Autowired
-    private EventDownService eventDownService;
-    @Autowired
     private ICentereventTDownloadsService centereventTDownloadsService;
 
     @DataScopeMutiDept(deptAlias = "c")
@@ -510,14 +501,14 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 break;
             case "gd":
                 centereventTEventcatalogue.setEventStatus("归档");
-                centereventTEventcatalogue.setEventStatusValue("forest_event_status_6");
+                centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_6);
                 centereventTEventcatalogue.setGdTime(new Date());
                 // 填写火灾报告
                 centereventtDeptEventBO.setEventType(centereventTEventcatalogue.getEventTypeXl());
                 insertReportByEventtype(centereventtDeptEventBO);
 
                 centereventTDeptEvent.setEventStatus("归档");
-                centereventTDeptEvent.setEventStatusValue("forest_event_status_6");
+                centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_6);
                 break;
             default:
                 break;
@@ -639,105 +630,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     }
 
     @Override
-    public R eventhandleDownload(String id) {
-        CentereventTEventcatalogue eventcatalogue = centereventTEventcatalogueMapper.selectCentereventTEventcatalogueById(id);
-        String busIndex = "bus_indx_other";// 其他
-        if ("1".equals(eventcatalogue.getEventType())) {
-            busIndex = BUS_INDEX_1;// 火情
-        }
-        String uuid = IdUtils.simpleUUID();
-        R result = remoteMonitorService.getPlaybackByTime(uuid, busIndex, eventcatalogue.getCreateBy(),
-                DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), -2)),
-                DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), 1)));
-        if (200 == result.getCode()) {
-            CentereventTFireLog centereventTFireLog = new CentereventTFireLog();
-            centereventTFireLog.setId(uuid);
-            centereventTFireLog.setEventCode(eventcatalogue.getEventCode());
-            centereventTFireLog.setLogContent(SecurityUtils.getLoginUser().getSysUser().getNickName() + "下载该事件视频。");
-            centereventTFireLog.setOperation(BUS_OPER_TYPE_1);
-            centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
-            centereventTFireLogService.insertCentereventTFireLog(centereventTFireLog);
-            CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
-            centereventTDownloads.setId(IdUtils.simpleUUID());
-            centereventTDownloads.setEventCode(eventcatalogue.getEventCode());
-            centereventTDownloads.setEventName(eventcatalogue.getEventName());
-            centereventTDownloads.setLogId(uuid);
-            centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
-            Map<String, Object> maps = new HashMap<>();
-            maps.put("LogId", uuid);
-            applicationContext.publishEvent(new EventDown(eventDownService, maps));
-        } else {
-            //失败
-            CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
-            centereventTDownloads.setId(IdUtils.simpleUUID());
-            centereventTDownloads.setEventCode(eventcatalogue.getEventCode());
-            centereventTDownloads.setEventName(eventcatalogue.getEventName());
-            centereventTDownloads.setFlag("0");
-            centereventTDownloads.setReason(result.getMsg());//失败原因
-            centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
-        }
-        return result;
-    }
-
-    @Override
     public CentereventTEventcatalogue mqtest(String start, String end, int limit) {
         return centereventTEventcatalogueMapper.mqtest(start, end, limit);
     }
-
-    @Override
-    public void downloadsCommon(Map<String, Object> params) throws InterruptedException {
-        List<CentereventTEventcatalogue> eventcatalogues = centereventTEventcatalogueMapper.getbeforedateDownload(params);
-        for (CentereventTEventcatalogue eventcatalogue : eventcatalogues) {
-            String busIndex = "bus_indx_other";// 其他
-            if ("1".equals(eventcatalogue.getEventType())) {
-                busIndex = BUS_INDEX_1;// 火情
-            }
-            String uuid = IdUtils.simpleUUID();
-            R result = remoteMonitorService.getPlaybackByTime(uuid, busIndex, eventcatalogue.getCreateBy(),
-                    DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), -2)),
-                    DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, DateUtils.subtractTime(eventcatalogue.getReportTime(), 1)));
-            if (200 == result.getCode()) {
-                //成功
-                CentereventTFireLog centereventTFireLog = new CentereventTFireLog();
-                centereventTFireLog.setId(uuid);
-                centereventTFireLog.setEventCode(eventcatalogue.getEventCode());
-                centereventTFireLog.setLogContent("系统管理员下载该事件视频。");
-                centereventTFireLog.setOperation(BUS_OPER_TYPE_1);
-                centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
-                centereventTFireLog.setCreateName("系统管理员");
-                centereventTFireLogService.insertCentereventTFireLog(centereventTFireLog);
-                CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
-                centereventTDownloads.setId(IdUtils.simpleUUID());
-                centereventTDownloads.setEventCode(eventcatalogue.getEventCode());
-                centereventTDownloads.setEventName(eventcatalogue.getEventName());
-                centereventTDownloads.setLogId(uuid);
-                centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
-//                TimeUnit.MINUTES.sleep(5);//延时5分钟在调取
-                logger.info("定时任务等待下载=====>{}", DateUtils.dateTimeNow());
-            } else {
-                //失败
-                CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
-                centereventTDownloads.setId(IdUtils.simpleUUID());
-                centereventTDownloads.setEventCode(eventcatalogue.getEventCode());
-                centereventTDownloads.setEventName(eventcatalogue.getEventName());
-                centereventTDownloads.setFlag("0");
-                centereventTDownloads.setReason(result.getMsg());//失败原因
-                centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
-            }
-        }
-        Thread.sleep(300000);
-        logger.info("附件表查询回写=====>{}", DateUtils.dateTimeNow());
-        //视频下载日志表 视频下载成功  定时任务结束回调，检验是否真的成功
-        List<CentereventTDownloads> downloadsList = centereventTDownloadsService.validDownloadIs();
-        for (CentereventTDownloads down : downloadsList) {
-            if (StringUtils.isNotEmpty(down.getAttachPath())) {
-                down.setFlag("1");
-                down.setPath(down.getAttachPath());
-            } else {
-                down.setFlag("0");
-                down.setReason("视频在下载过程中失败!");
-            }
-            centereventTDownloadsService.updateCentereventTDownloads(down);
-        }
-    }
 }

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

@@ -7,13 +7,16 @@ import com.ruoyi.common.redis.service.RedisService;
 import com.sooka.sponest.event.index.domin.Index;
 import com.sooka.sponest.event.index.service.ICenterevenTEventIndexService;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Api(tags = "首页事件统计")
 @RestController
@@ -23,6 +26,15 @@ public class IndexController extends BaseController {
     @Autowired
     private ICenterevenTEventIndexService centerevenTEventIndexService;
 
+    static final String QR = "qr";
+    static final String QS = "qs";
+    static final String BJ = "bj";
+    static final String GD = "gd";
+    static final String BJ_GD = "bjgd";
+    static final String BJ_GD_RATE = "bjgdRate";
+    static final String TODAY_BJ_GD = "todaybjgd";
+    static final String TODAY_BJ_GD_RATE = "todaybjgdRate";
+
     /**
      * 县区统计
      */
@@ -47,6 +59,191 @@ public class IndexController extends BaseController {
      */
     @GetMapping("/eventReport")
     public R eventReport(@RequestParam(value = "timeArr", required = false) List<String> timeArr) {
-        return R.ok(centerevenTEventIndexService.selectStgz(timeArr));
+        Map<String, Object> resultMap = new HashMap<>();
+        Long countqr = 0L;
+        Long countcl = 0L;
+        Long countbj = 0L;
+        Long countgd = 0L;
+        // （一）
+        List<Map<String, Object>> list = centerevenTEventIndexService.selectdistrictAndCountyStatistics(timeArr);
+        for (Map<String, Object> map : list) {
+            Long qr = MapUtils.getLong(map, QR);
+            Long qs = MapUtils.getLong(map, QS);
+            Long bj = MapUtils.getLong(map, BJ);
+            Long gd = MapUtils.getLong(map, GD);
+            String bjgdRate = MapUtils.getString(map, BJ_GD_RATE);
+            Long todaybjgd = MapUtils.getLong(map, TODAY_BJ_GD);
+            String todaybjgdRate = MapUtils.getString(map, TODAY_BJ_GD_RATE);
+            countqr += qr;
+            countcl += qs;
+            countbj += bj;
+            countgd += gd;
+            if ("梨树县".equals(map.get("name"))) {
+                resultMap.put("count", qr + qs + bj + gd);
+                resultMap.put(QR, qr);
+                resultMap.put(QS, qs);
+                resultMap.put(BJ, bj);
+                resultMap.put(GD, gd);
+                resultMap.put("bjgd", bj + gd);
+                resultMap.put("bjgdRate", bjgdRate);
+                resultMap.put("today_bjgd", todaybjgd);
+                resultMap.put("today_bjgdRate", todaybjgdRate);
+            } else if ("伊通县".equals(map.get("name"))) {
+                resultMap.put("count1", qr + qs + bj + gd);
+                resultMap.put("qr1", qr);
+                resultMap.put("qs1", qs);
+                resultMap.put("bj1", bj);
+                resultMap.put("gd1", gd);
+                resultMap.put("bjgd1", bj + gd);
+                resultMap.put("bjgdRate1", bjgdRate);
+                resultMap.put("today_bjgd1", todaybjgd);
+                resultMap.put("today_bjgdRate1", todaybjgdRate);
+            } else if ("双辽市".equals(map.get("name"))) {
+                resultMap.put("count2", qr + qs + bj + gd);
+                resultMap.put("qr2", qr);
+                resultMap.put("qs2", qs);
+                resultMap.put("bj2", bj);
+                resultMap.put("gd2", gd);
+                resultMap.put("bjgd2", bj + gd);
+                resultMap.put("bjgdRate2", bjgdRate);
+                resultMap.put("today_bjgd2", todaybjgd);
+                resultMap.put("today_bjgdRate2", todaybjgdRate);
+            } else if ("铁东区".equals(map.get("name"))) {
+                resultMap.put("count3", qr + qs + bj + gd);
+                resultMap.put("qr3", qr);
+                resultMap.put("qs3", qs);
+                resultMap.put("bj3", bj);
+                resultMap.put("gd3", gd);
+                resultMap.put("bjgd3", bj + gd);
+                resultMap.put("bjgdRate3", bjgdRate);
+                resultMap.put("today_bjgd3", todaybjgd);
+                resultMap.put("today_bjgdRate3", todaybjgdRate);
+            } else if ("铁西区".equals(map.get("name"))) {
+                resultMap.put("count4", qr + qs + bj + gd);
+                resultMap.put("qr4", qr);
+                resultMap.put("qs4", qs);
+                resultMap.put("bj4", bj);
+                resultMap.put("gd4", gd);
+                resultMap.put("bjgd4", bj + gd);
+                resultMap.put("bjgdRate4", bjgdRate);
+                resultMap.put("today_bjgd4", todaybjgd);
+                resultMap.put("today_bjgdRate4", todaybjgdRate);
+            }
+        }
+        // 五
+        resultMap.put("num", countqr + countcl + countbj + countgd);
+        resultMap.put("countqr", countqr);
+        resultMap.put("countcl", countcl);
+        resultMap.put("countbj", countbj);
+        resultMap.put("countgd", countgd);
+        // （二）
+        list = centerevenTEventIndexService.selectCentereventTEventmapdeptList(timeArr);
+        for (Map<String, Object> map : list) {
+            Long total = MapUtils.getLong(map, "total");
+            switch (MapUtils.getString(map, "dept_id")) {
+                case "367":
+                    resultMap.put("ly", total);
+                    resultMap.put("lyqr", MapUtils.getLong(map, QR));
+                    resultMap.put("lyqs", MapUtils.getLong(map, QS));
+                    resultMap.put("lybjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("lybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_lybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_lybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3776":
+                    resultMap.put("ny", total);
+                    resultMap.put("nyqr", MapUtils.getLong(map, QR));
+                    resultMap.put("nyqs", MapUtils.getLong(map, QS));
+                    resultMap.put("nybjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("nybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_nybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_nybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3778":
+                    resultMap.put("sl", total);
+                    resultMap.put("slqr", MapUtils.getLong(map, QR));
+                    resultMap.put("slqs", MapUtils.getLong(map, QS));
+                    resultMap.put("slbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("slbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_slbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_slbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3773":
+                    resultMap.put("hb", total);
+                    resultMap.put("hbqr", MapUtils.getLong(map, QR));
+                    resultMap.put("hbqs", MapUtils.getLong(map, QS));
+                    resultMap.put("hbbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("hbbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_hbbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_hbbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3774":
+                    resultMap.put("yj", total);
+                    resultMap.put("yjqr", MapUtils.getLong(map, QR));
+                    resultMap.put("yjqs", MapUtils.getLong(map, QS));
+                    resultMap.put("yjbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("yjbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_yjbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_yjbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3775":
+                    resultMap.put("jt", total);
+                    resultMap.put("jtqr", MapUtils.getLong(map, QR));
+                    resultMap.put("jtqs", MapUtils.getLong(map, QS));
+                    resultMap.put("jtbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("jtbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_jtbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_jtbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3772":
+                    resultMap.put("zy", total);
+                    resultMap.put("zyqr", MapUtils.getLong(map, QR));
+                    resultMap.put("zyqs", MapUtils.getLong(map, QS));
+                    resultMap.put("zybjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("zybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_zybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_zybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "3777":
+                    resultMap.put("xf", total);
+                    resultMap.put("xfqr", MapUtils.getLong(map, QR));
+                    resultMap.put("xfqs", MapUtils.getLong(map, QS));
+                    resultMap.put("xfbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("xfbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_xfbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_xfbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "14449":
+                    resultMap.put("sz", total);
+                    resultMap.put("szqr", MapUtils.getLong(map, QR));
+                    resultMap.put("szqs", MapUtils.getLong(map, QS));
+                    resultMap.put("szbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("szbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_szbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_szbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "14450":
+                    resultMap.put("ga", total);
+                    resultMap.put("gaqr", MapUtils.getLong(map, QR));
+                    resultMap.put("gaqs", MapUtils.getLong(map, QS));
+                    resultMap.put("gabjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("gabjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_gabjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_gabjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                case "14451":
+                    resultMap.put("fg", total);
+                    resultMap.put("fgqr", MapUtils.getLong(map, QR));
+                    resultMap.put("fgqs", MapUtils.getLong(map, QS));
+                    resultMap.put("fgbjgd", MapUtils.getLong(map, BJ_GD));
+                    resultMap.put("fgbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
+                    resultMap.put("today_fgbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
+                    resultMap.put("today_fgbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return R.ok(resultMap);
     }
 }

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

@@ -21,11 +21,4 @@ public interface ICenterevenTEventIndexService {
      * @return
      */
     List<Map<String, Object>> selectCentereventTEventmapdeptList(List<String> timeArr);
-
-    /**
-     * 系统报告-事件统计
-     *
-     * @return
-     */
-    Map<String, Object> selectStgz(List<String> timeArr);
 }

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

@@ -2,12 +2,10 @@ package com.sooka.sponest.event.index.service.impl;
 
 import com.sooka.sponest.event.index.mapper.CenterenvenTEventIndexMapper;
 import com.sooka.sponest.event.index.service.ICenterevenTEventIndexService;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -17,15 +15,6 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
     @Autowired
     private CenterenvenTEventIndexMapper centerenvenTEventIndexMapper;
 
-    static final String QR = "qr";
-    static final String QS = "qs";
-    static final String BJ = "bj";
-    static final String GD = "gd";
-    static final String BJ_GD = "bjgd";
-    static final String BJ_GD_RATE = "bjgdRate";
-    static final String TODAY_BJ_GD = "todaybjgd";
-    static final String TODAY_BJ_GD_RATE = "todaybjgdRate";
-
     /**
      * 区县统计
      *
@@ -46,199 +35,4 @@ public class CenterevenTEventIndexServiceImpl implements ICenterevenTEventIndexS
     public List<Map<String, Object>> selectCentereventTEventmapdeptList(List<String> timeArr) {
         return centerenvenTEventIndexMapper.selectCentereventTEventmapdept(timeArr);
     }
-
-    /**
-     * 系统报告-事件统计
-     *
-     * @return
-     */
-    @Override
-    public Map<String, Object> selectStgz(List<String> timeArr) {
-        Map<String, Object> resultMap = new HashMap<>();
-        Long countqr = 0L;
-        Long countcl = 0L;
-        Long countbj = 0L;
-        Long countgd = 0L;
-        // （一）
-        List<Map<String, Object>> list = this.selectdistrictAndCountyStatistics(timeArr);
-        for (Map<String, Object> map : list) {
-            Long qr = MapUtils.getLong(map, QR);
-            Long qs = MapUtils.getLong(map, QS);
-            Long bj = MapUtils.getLong(map, BJ);
-            Long gd = MapUtils.getLong(map, GD);
-            String bjgdRate = MapUtils.getString(map, BJ_GD_RATE);
-            Long todaybjgd = MapUtils.getLong(map, TODAY_BJ_GD);
-            String todaybjgdRate = MapUtils.getString(map, TODAY_BJ_GD_RATE);
-            countqr += qr;
-            countcl += qs;
-            countbj += bj;
-            countgd += gd;
-            if ("梨树县".equals(map.get("name"))) {
-                resultMap.put("count", qr + qs + bj + gd);
-                resultMap.put(QR, qr);
-                resultMap.put(QS, qs);
-                resultMap.put(BJ, bj);
-                resultMap.put(GD, gd);
-                resultMap.put(BJ_GD, bj + gd);
-                resultMap.put(BJ_GD_RATE, bjgdRate);
-                resultMap.put("today_bjgd", todaybjgd);
-                resultMap.put("today_bjgdRate", todaybjgdRate);
-            } else if ("伊通县".equals(map.get("name"))) {
-                resultMap.put("count1", qr + qs + bj + gd);
-                resultMap.put("qr1", qr);
-                resultMap.put("qs1", qs);
-                resultMap.put("bj1", bj);
-                resultMap.put("gd1", gd);
-                resultMap.put("bjgd1", bj + gd);
-                resultMap.put("bjgdRate1", bjgdRate);
-                resultMap.put("today_bjgd1", todaybjgd);
-                resultMap.put("today_bjgdRate1", todaybjgdRate);
-            } else if ("双辽市".equals(map.get("name"))) {
-                resultMap.put("count2", qr + qs + bj + gd);
-                resultMap.put("qr2", qr);
-                resultMap.put("qs2", qs);
-                resultMap.put("bj2", bj);
-                resultMap.put("gd2", gd);
-                resultMap.put("bjgd2", bj + gd);
-                resultMap.put("bjgdRate2", bjgdRate);
-                resultMap.put("today_bjgd2", todaybjgd);
-                resultMap.put("today_bjgdRate2", todaybjgdRate);
-            } else if ("铁东区".equals(map.get("name"))) {
-                resultMap.put("count3", qr + qs + bj + gd);
-                resultMap.put("qr3", qr);
-                resultMap.put("qs3", qs);
-                resultMap.put("bj3", bj);
-                resultMap.put("gd3", gd);
-                resultMap.put("bjgd3", bj + gd);
-                resultMap.put("bjgdRate3", bjgdRate);
-                resultMap.put("today_bjgd3", todaybjgd);
-                resultMap.put("today_bjgdRate3", todaybjgdRate);
-            } else if ("铁西区".equals(map.get("name"))) {
-                resultMap.put("count4", qr + qs + bj + gd);
-                resultMap.put("qr4", qr);
-                resultMap.put("qs4", qs);
-                resultMap.put("bj4", bj);
-                resultMap.put("gd4", gd);
-                resultMap.put("bjgd4", bj + gd);
-                resultMap.put("bjgdRate4", bjgdRate);
-                resultMap.put("today_bjgd4", todaybjgd);
-                resultMap.put("today_bjgdRate4", todaybjgdRate);
-            }
-        }
-        // 五
-        resultMap.put("num", countqr + countcl + countbj + countgd);
-        resultMap.put("countqr", countqr);
-        resultMap.put("countcl", countcl);
-        resultMap.put("countbj", countbj);
-        resultMap.put("countgd", countgd);
-        // （二）
-        list = this.selectCentereventTEventmapdeptList(timeArr);
-        for (Map<String, Object> map : list) {
-            Long total = MapUtils.getLong(map, "total");
-            switch (MapUtils.getString(map, "dept_id")) {
-                case "367":
-                    resultMap.put("ly", total);
-                    resultMap.put("lyqr", MapUtils.getLong(map, QR));
-                    resultMap.put("lyqs", MapUtils.getLong(map, QS));
-                    resultMap.put("lybjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("lybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_lybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_lybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3776":
-                    resultMap.put("ny", total);
-                    resultMap.put("nyqr", MapUtils.getLong(map, QR));
-                    resultMap.put("nyqs", MapUtils.getLong(map, QS));
-                    resultMap.put("nybjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("nybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_nybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_nybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3778":
-                    resultMap.put("sl", total);
-                    resultMap.put("slqr", MapUtils.getLong(map, QR));
-                    resultMap.put("slqs", MapUtils.getLong(map, QS));
-                    resultMap.put("slbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("slbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_slbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_slbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3773":
-                    resultMap.put("hb", total);
-                    resultMap.put("hbqr", MapUtils.getLong(map, QR));
-                    resultMap.put("hbqs", MapUtils.getLong(map, QS));
-                    resultMap.put("hbbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("hbbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_hbbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_hbbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3774":
-                    resultMap.put("yj", total);
-                    resultMap.put("yjqr", MapUtils.getLong(map, QR));
-                    resultMap.put("yjqs", MapUtils.getLong(map, QS));
-                    resultMap.put("yjbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("yjbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_yjbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_yjbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3775":
-                    resultMap.put("jt", total);
-                    resultMap.put("jtqr", MapUtils.getLong(map, QR));
-                    resultMap.put("jtqs", MapUtils.getLong(map, QS));
-                    resultMap.put("jtbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("jtbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_jtbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_jtbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3772":
-                    resultMap.put("zy", total);
-                    resultMap.put("zyqr", MapUtils.getLong(map, QR));
-                    resultMap.put("zyqs", MapUtils.getLong(map, QS));
-                    resultMap.put("zybjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("zybjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_zybjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_zybjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "3777":
-                    resultMap.put("xf", total);
-                    resultMap.put("xfqr", MapUtils.getLong(map, QR));
-                    resultMap.put("xfqs", MapUtils.getLong(map, QS));
-                    resultMap.put("xfbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("xfbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_xfbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_xfbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "14449":
-                    resultMap.put("sz", total);
-                    resultMap.put("szqr", MapUtils.getLong(map, QR));
-                    resultMap.put("szqs", MapUtils.getLong(map, QS));
-                    resultMap.put("szbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("szbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_szbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_szbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "14450":
-                    resultMap.put("ga", total);
-                    resultMap.put("gaqr", MapUtils.getLong(map, QR));
-                    resultMap.put("gaqs", MapUtils.getLong(map, QS));
-                    resultMap.put("gabjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("gabjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_gabjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_gabjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                case "14451":
-                    resultMap.put("fg", total);
-                    resultMap.put("fgqr", MapUtils.getLong(map, QR));
-                    resultMap.put("fgqs", MapUtils.getLong(map, QS));
-                    resultMap.put("fgbjgd", MapUtils.getLong(map, BJ_GD));
-                    resultMap.put("fgbjgdRate", MapUtils.getString(map, BJ_GD_RATE));
-                    resultMap.put("today_fgbjgd", MapUtils.getLong(map, TODAY_BJ_GD));
-                    resultMap.put("today_fgbjgdRate", MapUtils.getString(map, TODAY_BJ_GD_RATE));
-                    break;
-                default:
-                    break;
-            }
-        }
-        return resultMap;
-    }
 }

src/main/java/com/sooka/sponest/event/urge/domain/EventDown.java

@@ -1,44 +0,0 @@
-package com.sooka.sponest.event.urge.domain;
-
-import com.sooka.sponest.event.urge.service.EventDownService;
-import lombok.Data;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Observable;
-
-/**
- * @Auther: mjq
- * @Date: 2023/9/13 - 09 - 13 - 14:11
- * @Description: com.sooka.sponest.event.urge.domain
- * @version: 1.0
- */
-@Data
-@Component
-public class EventDown extends ApplicationEvent {
-
-    public EventDown() {
-        super(new EventDownService() {
-            @Override
-            public void update(Observable o, Object arg) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public void toVoidDownLoad(Map<String, Object> map) {
-                throw new UnsupportedOperationException();
-            }
-        });
-    }
-
-    private EventDownService eventDownService;
-    private Map<String, Object> map = new HashMap();
-
-    public EventDown(EventDownService source, Map<String, Object> maps) {
-        super(source);
-        this.eventDownService = source;
-        this.map = maps;
-    }
-}

src/main/java/com/sooka/sponest/event/urge/listener/EventDownListener.java

@@ -1,33 +0,0 @@
-package com.sooka.sponest.event.urge.listener;
-
-import com.sooka.sponest.event.urge.domain.EventDown;
-import com.sooka.sponest.event.urge.service.EventDownService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-/**
- * @Auther: mjq
- * @Date: 2023/9/13 - 09 - 13 - 14:16
- * @Description: com.sooka.sponest.event.urge.listener
- * @version: 1.0
- */
-@Component
-public class EventDownListener implements ApplicationListener {
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    private EventDownService eventDownService;
-    @Async
-    @Override
-    public void onApplicationEvent(ApplicationEvent event) {
-        if (event.getSource() instanceof EventDownService) {
-            EventDown u = (EventDown) event;
-            eventDownService.toVoidDownLoad(u.getMap());
-        }
-    }
-}

src/main/java/com/sooka/sponest/event/urge/service/EventDownService.java

@@ -1,15 +0,0 @@
-package com.sooka.sponest.event.urge.service;
-
-import java.util.Map;
-import java.util.Observer;
-
-/**
- * @Auther: mjq
- * @Date: 2023/9/13 - 09 - 13 - 14:05
- * @Description: com.sooka.sponest.event.urge.service
- * @version: 1.0
- */
-public interface EventDownService extends Observer {
-
-    void toVoidDownLoad(Map<String, Object> maps);
-}

src/main/java/com/sooka/sponest/event/urge/service/impl/EventDownServiceImpl.java

@@ -1,56 +0,0 @@
-package com.sooka.sponest.event.urge.service.impl;
-
-
-import com.ruoyi.common.core.utils.StringUtils;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
-import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
-import com.sooka.sponest.event.urge.service.EventDownService;
-import org.apache.commons.collections4.MapUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.Observable;
-
-/**
- * @Auther: mjq
- * @Date: 2023/9/13 - 09 - 13 - 14:06
- * @Description: com.sooka.sponest.event.urge.service.impl
- * @version: 1.0
- */
-@Service
-@EnableAsync
-public class EventDownServiceImpl implements EventDownService {
-
-    private final Logger logger = LoggerFactory.getLogger(EventDownServiceImpl.class);
-
-    @Autowired
-    private ICentereventTDownloadsService centereventTDownloadsService;
-
-    @Override
-    public void toVoidDownLoad(Map<String, Object> maps) {
-        try {
-            Thread.sleep(300000);
-        } catch (Exception e) {
-            logger.info("Exception!", e);
-        }
-        // 视频下载日志表 视频下载成功  定时任务结束回调，检验是否真的成功
-        CentereventTDownloads down = centereventTDownloadsService.validDownloadIsOne(MapUtils.getString(maps, "LogId"));
-        if (StringUtils.isNotEmpty(down.getAttachPath())) {
-            down.setFlag("1");
-            down.setPath(down.getAttachPath());
-        } else {
-            down.setFlag("0");
-            down.setReason("视频在下载过程中失败!");
-        }
-        centereventTDownloadsService.updateCentereventTDownloads(down);
-    }
-
-    @Override
-    public void update(Observable o, Object arg) {
-        throw new UnsupportedOperationException();
-    }
-}

src/main/java/com/sooka/sponest/event/utils/EventConstants.java

@@ -13,12 +13,13 @@ public class EventConstants {
     public static final String FOREST_EVENT_STATUS_1 = "forest_event_status_1";// 上报
     public static final String FOREST_EVENT_STATUS_2 = "forest_event_status_2";// 签收
     public static final String FOREST_EVENT_STATUS_5 = "forest_event_status_5";// 办结
+    public static final String FOREST_EVENT_STATUS_6 = "forest_event_status_6";// 归档
     public static final String FOREST_EVENT_STATUS_7 = "forest_event_status_7";// 确认
 
     // 事件来源
     public static final String REPORTING_SOURCE_1 = "reporting_source_1";// AI
     public static final String REPORTING_SOURCE_4 = "reporting_source_4";// 传感器
-    public static final String REPORTING_SOURCE_5 = "reporting_source_5";// 第三方协查
+    public static final String REPORTING_SOURCE_5 = "reporting_source_5";// 数字住建
 
     // 是否催办
     public static final String SYS_ISURGE_2 = "sys_isurge_2";// 否

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

@@ -173,7 +173,9 @@
         </where>
         group by event_code) l
         left join ${database_data}.centerdata_t_attach f on f.bus_id = l.id
-        group by bus_id
+        <if test="templateType != 'true'">
+            group by bus_id
+        </if>
     </select>
 
     <select id="selectEventByCalendar" parameterType="VisuForestCloudMapVO" resultType="map">
@@ -439,19 +441,58 @@
         order by create_time desc
     </select>
 
-    <select id="getEventFileAll" resultType="VisuForestCloudMapEventListBO">
-        select event_code eventCode,attach_path picturePath,bus_source pictureSource,file_type pictureType from (
-        select SUBSTRING_INDEX(GROUP_CONCAT(id order by create_time),',',1) id,event_code
-        from centerevent_t_fire_log
+    <select id="getHousingConstructionEventCount" parameterType="VisuForestCloudMapVO" resultType="map">
+        select label_1,IFNULL(label_2,0) label_2, IFNULL(label_3,0) label_3,IFNULL(label_4,0) label_4 from (
+        select count(*) label_1 from centerevent_t_eventcatalogue
+        where event_status_value in ('forest_event_status_7','forest_event_status_2','forest_event_status_5','forest_event_status_6' )
+        <if test="day != null and day != ''">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
+        </if>
+        <if test="createBy != null and createBy != ''">
+            and create_by in ( ${createBy} )
+        </if> and event_type = 1
+        ) a, (
+        select sum(event_type_xl in ( '1201','1202','1203','1204','1205' )) label_2, sum(event_type_xl = '1208' ) label_3, sum(event_type_xl in ( '1206','1207' )) label_4
+        from (
+        select event_type_xl from centerevent_t_eventcatalogue
+        where 1=1
+        <if test="day != null and day != ''">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            and create_by = #{deptId}
+        </if>
+        and event_type = 12) t
+        ) b
+    </select>
+
+    <select id="getHousingConstructionEventList" parameterType="VisuForestCloudMapVO"
+            resultType="VisuForestCloudMapEventListBO">
+        select event_code eventCode,event_name eventName,longitude,latitude,reportor,event_status
+        eventStatus,event_status_value eventStatusValue,create_time createTime,urge_count urgeCount,event_type_xl
+        eventType,report_source reportSource
+        from centerevent_t_eventcatalogue
         <where>
-            <if test="eventStatus != null and eventStatus.size > 0">
-                and event_code in
-                <foreach item="item" collection="eventStatus" open="(" separator="," close=")">
-                    #{item}
+            <if test="day != null and day != ''">
+                and DATE_FORMAT(create_time,'%Y-%m-%d') = #{day}
+            </if>
+            <if test="createBy != null and createBy != ''">
+                and create_by in ( ${createBy} )
+            </if>
+            <if test="eventTypeIdDl != null and eventTypeIdDl.length > 0">
+                and event_status_value in (
+                'forest_event_status_7','forest_event_status_2','forest_event_status_5','forest_event_status_6' )
+                and event_type in
+                <foreach item="eventTypeIdDl" collection="eventTypeIdDl" open="(" separator="," close=")">
+                    #{eventTypeIdDl}
+                </foreach>
+            </if>
+            <if test="eventTypeId != null and eventTypeId.length > 0">
+                and event_type_xl in
+                <foreach item="eventTypeId" collection="eventTypeId" open="(" separator="," close=")">
+                    #{eventTypeId}
                 </foreach>
             </if>
         </where>
-        group by event_code) l
-        left join ${database_data}.centerdata_t_attach f on f.bus_id = l.id
     </select>
 </mapper>

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

@@ -305,76 +305,4 @@
         where a.create_time between #{start} and #{end}
         limit #{limit}, 1
     </select>
-    <select id="getbeforedateDownload" parameterType="map" resultMap="CentereventTEventcatalogueResult">
-
-        SELECT
-            a.id,
-            a.event_code,
-            a.event_type,
-            a.event_type_xl,
-            a.event_name,
-            a.event_description,
-            a.report_source,
-            a.longitude,
-            a.latitude,
-            a.reportor,
-            a.report_time,
-            a.is_urged,
-            a.event_status,
-            a.event_status_value,
-            a.create_by,
-            a.create_name,
-            a.create_time,
-            a.update_by,
-            a.update_name,
-            a.update_time,
-            a.data_status,
-            a.dept_id,
-            a.dept_name,
-            IFNULL( a.version, 0 ) version,
-            a.urge_count,
-            a.address,
-            a.escalation,
-            a.is_examine
-        FROM
-            centerevent_t_eventcatalogue a
-        WHERE
-             event_status_value NOT IN ( 'forest_event_status_3', 'forest_event_status_4' )
-             AND
-						report_source = 'reporting_source_1'
-            AND event_code IN (
-            SELECT
-                l.event_code
-            FROM
-                centerevent_t_fire_log l
-            WHERE
-                l.log_content LIKE '%确认该事件%'
-
-        <if test="taskValue != null and taskValue != ''">
-            AND DATEDIFF( l.create_time, now( ) ) = - 1
-        </if>
-        <if test="monthValueStart != null and monthValueStart != ''">
-            AND DATE_FORMAT(l.create_time,'%Y-%m-%d') &gt;= #{monthValueStart}
-        </if>
-        <if test="monthValueEnd != null and monthValueEnd != ''">
-            AND DATE_FORMAT(l.create_time,'%Y-%m-%d') &lt;= #{monthValueEnd}
-        </if>
-            AND l.event_code not IN  (
-            select  d.event_code from centerevent_t_downloads d where d.flag='1'
-            <if test="taskValue != null and taskValue != ''">
-                AND DATEDIFF( d.create_time, now( ) ) = - 1
-            </if>
-            <if test="monthValueStart != null and monthValueStart != ''">
-                AND DATE_FORMAT(d.create_time,'%Y-%m-%d') &gt;= #{monthValueStart}
-            </if>
-            <if test="monthValueEnd != null and monthValueEnd != ''">
-                AND DATE_FORMAT(d.create_time,'%Y-%m-%d') &lt;= #{monthValueEnd}
-            </if>
-
-
-						)
-
-
-            )
-    </select>
 </mapper>

src/main/resources/mapper/download/CentereventTDownloadsMapper.xml

@@ -20,6 +20,14 @@
         <result property="attachPath" column="attachPath"/>
     </resultMap>
 
+    <resultMap type="CentereventTEventcatalogue" id="CentereventTEventcatalogueResult">
+        <result property="id" column="id"/>
+        <result property="eventCode" column="event_code"/>
+        <result property="eventName" column="event_name"/>
+        <result property="reportTime" column="report_time"/>
+        <result property="createBy" column="create_by"/>
+    </resultMap>
+
     <sql id="selectCentereventTDownloadsVo">
         select id, event_code, event_name, path, flag, reason, create_by, create_name, create_time, update_by, update_name, update_time from centerevent_t_downloads
     </sql>
@@ -105,35 +113,39 @@
         </foreach>
     </delete>
 
-    <select id="validDownloadIs" resultMap="CentereventTDownloadsResult">
-        SELECT
-            id,
-            event_code,
-            event_name,
-            path,
-            flag,
-            reason,
-            ch.attach_path AS attachPath
-        FROM
-            centerevent_t_downloads a
-            LEFT JOIN onest_data.centerdata_t_attach ch ON log_id = ch.bus_id
-        WHERE
-            flag IS NULL AND DATEDIFF( a.create_time, now( ) ) = 0
-    </select>
-
-    <select id="validDownloadIsOne" parameterType="string" resultMap="CentereventTDownloadsResult">
-        SELECT
-            id,
-            event_code,
-            event_name,
-            path,
-            flag,
-            reason,
-            ch.attach_path AS attachPath
-        FROM
-            centerevent_t_downloads
-            LEFT JOIN onest_data.centerdata_t_attach ch ON log_id = ch.bus_id
-        WHERE
-            log_id = #{logId}
+    <select id="getbeforedateDownload" parameterType="map" resultMap="CentereventTEventcatalogueResult">
+        SELECT l.id, l.event_code, a.event_name, a.report_time, a.create_by
+        FROM centerevent_t_fire_log l
+        LEFT JOIN centerevent_t_eventcatalogue a ON a.event_code = l.event_code
+        <where>
+            <if test="id != null and id != ''">
+                AND a.id = #{id}
+            </if>
+            <if test="taskValue != null and taskValue != ''">
+                AND DATEDIFF( l.create_time, now( ) ) = -1
+            </if>
+            <if test="monthValueStart != null and monthValueStart != ''">
+                AND DATE_FORMAT(l.create_time,'%Y-%m-%d') = #{monthValueStart}
+            </if>
+            AND l.log_content LIKE '%确认该事件%' AND l.event_code NOT IN (
+            SELECT event_code FROM centerevent_t_downloads
+            <where>
+                flag IN ( 200, 202 )
+                <if test="id != null and id != ''">
+                    AND event_code = #{id}
+                </if>
+                <if test="taskValue != null and taskValue != ''">
+                    AND DATEDIFF( create_time, now( ) ) = 0
+                </if>
+                <if test="monthValueStart != null and monthValueStart != ''">
+                    AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{monthValueStart}
+                </if>
+                <if test="monthValueEnd != null and monthValueEnd != ''">
+                    AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{monthValueEnd}
+                </if>
+            </where>
+            ) AND report_source = 'reporting_source_1'
+            AND a.event_status_value NOT IN ( 'forest_event_status_3', 'forest_event_status_4' )
+        </where>
     </select>
 </mapper>