告警存储方式修改

cpp-admin/src/main/java/com/cpp/web/controller/alarm/AbnormalAlarmController.java

@@ -1,11 +1,11 @@
 package com.cpp.web.controller.alarm;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cpp.common.core.domain.R;
 
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import com.cpp.web.domain.enums.AlarmEnum;
-import com.cpp.web.domain.station.ElectricField;
 import com.cpp.web.service.alarm.AbnormalAlarmService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;

cpp-admin/src/main/java/com/cpp/web/domain/AbnormalAlarm.java → cpp-admin/src/main/java/com/cpp/web/domain/Alarm/AbnormalAlarm.java

@@ -1,6 +1,7 @@
-package com.cpp.web.domain;
+package com.cpp.web.domain.Alarm;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.enums.AlarmEnum;
 import com.cpp.web.domain.enums.DataSourcesEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

cpp-admin/src/main/java/com/cpp/web/mapper/AbnormalAlarmMapper.java → cpp-admin/src/main/java/com/cpp/web/mapper/alarm/AbnormalAlarmMapper.java

@@ -1,8 +1,8 @@
-package com.cpp.web.mapper;
+package com.cpp.web.mapper.alarm;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

cpp-admin/src/main/java/com/cpp/web/service/alarm/AbnormalAlarmService.java

@@ -2,7 +2,7 @@ package com.cpp.web.service.alarm;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import com.cpp.web.domain.enums.AlarmEnum;
 
 import java.util.Date;

cpp-admin/src/main/java/com/cpp/web/service/alarm/AlarmLog.java

@@ -3,7 +3,7 @@ package com.cpp.web.service.alarm;
 import ch.qos.logback.classic.Logger;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cpp.common.utils.spring.SpringUtils;
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import com.cpp.web.domain.enums.AlarmEnum;
 import com.cpp.web.domain.enums.DataSourcesEnum;
 import com.cpp.web.utils.LogUtil;

cpp-admin/src/main/java/com/cpp/web/service/alarm/impl/AbnormalAlarmServiceImpl.java

@@ -2,18 +2,16 @@ package com.cpp.web.service.alarm.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import com.cpp.web.domain.enums.AlarmEnum;
-import com.cpp.web.mapper.AbnormalAlarmMapper;
+import com.cpp.web.mapper.alarm.AbnormalAlarmMapper;
 import com.cpp.web.service.alarm.AbnormalAlarmService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 告警信息层实现类
@@ -32,7 +30,11 @@ public class AbnormalAlarmServiceImpl extends ServiceImpl<AbnormalAlarmMapper, A
 
         QueryWrapper<AbnormalAlarm> wrapper = new QueryWrapper<>();
         if (startTime != null && !endTime.equals("")&& endTime != null && !endTime.equals("")) {
-            wrapper.and(w->w.between("start_time",startTime,endTime).or().between("end_time",startTime,endTime));
+            wrapper.and(a->a.or(w->w.isNull("end_time").le("start_time",endTime))
+                    .or(w->w.isNotNull("end_time").le("start_time",endTime).gt("end_time",startTime))
+                    .or(w->w.isNotNull("end_time").le("start_time",endTime).gt("start_time",startTime))
+                    .or(w->w.isNotNull("end_time").le("end_time",endTime).gt("start_time",endTime))
+                    .or(w->w.isNotNull("end_time").le("start_time",startTime).gt("end_time",endTime)));
         }
         if (alarmType != null && !alarmType.equals("")) {
             wrapper.eq("alarm_type", alarmType);

cpp-admin/src/main/java/com/cpp/web/service/cloud/CloudFileParsing.java

@@ -1,7 +1,6 @@
 package com.cpp.web.service.cloud;
 
 import com.cpp.common.utils.StringUtils;
-import com.cpp.web.domain.AbnormalAlarm;
 import com.cpp.web.domain.cloud.ForecastPowerShortTermCloud;
 import com.cpp.web.domain.cloud.NwpCloud;
 import com.cpp.web.domain.datafactory.ParsingLog;
@@ -62,8 +61,6 @@ public class CloudFileParsing {
      * @param
      * @return
      */
-//    @Scheduled(fixedRate = 300000L)
-    @Scheduled(fixedRate = 60000L)
     public void parsingFile() {
 
         log.info("-----------------开始执行预测文件解析任务----------------------");

cpp-admin/src/main/java/com/cpp/web/service/datafactory/impl/ParsingStatusServiceImpl.java

@@ -1,7 +1,7 @@
 package com.cpp.web.service.datafactory.impl;
 
 import cn.hutool.json.JSONUtil;
-import com.cpp.web.domain.AbnormalAlarm;
+import com.cpp.web.domain.Alarm.AbnormalAlarm;
 import com.cpp.web.domain.datafactory.BaseParsing;
 import com.cpp.web.domain.datafactory.dto.ParsingResultDto;
 import com.cpp.web.domain.datafactory.enums.FileTypeEnum;

cpp-admin/src/main/java/com/cpp/web/utils/LogUtil.java

@@ -1,12 +1,9 @@
 package com.cpp.web.utils;
 
-import com.cpp.web.domain.AbnormalAlarm;
 import com.cpp.web.domain.enums.AlarmEnum;
 import com.cpp.web.domain.enums.DataSourcesEnum;
 import com.cpp.web.service.alarm.AlarmLog;
 
-import java.math.BigDecimal;
-
 /**
  * 信息拼装工具类
  *

cpp-ui/src/views/abnormalAlarm/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="app-container">
     <div class="dark-el-input dark-el-button">
-      <div style="position:absolute;text-align: right;width: 95%">
-        <span  v-loading="loading"><svg-icon slot="prefix" icon-class="alarm1" class="el-input__icon input-icon"/> {{this.alarm1}} <svg-icon slot="prefix" icon-class="alarm2" class="el-input__icon input-icon"/> {{this.alarm2}}</span>
-      </div>
       <el-form ref="queryForm" size="small" :inline="true" popper-class="cpp-popper">
         <el-form-item label="时间">
           <el-date-picker
@@ -44,15 +41,16 @@
           <el-button type="primary" style="margin-left: 5px" icon="el-icon-search" @click="beforeQuery">导出
           </el-button>
         </el-form-item>
-
-        <br/>
         <el-form-item>
-          <el-button type="primary" style="margin-left: 5px" @click="acknowledgeByStationCode">全部确认
+          <el-button type="primary" style="margin-left: 500px" @click="acknowledgeByStationCode">全部确认
+            <span v-loading="loading"><svg-icon slot="prefix" icon-class="alarm2"
+                                                class="el-input__icon input-icon"/> {{ this.alarmNum }}</span>
           </el-button>
         </el-form-item>
       </el-form>
 
     </div>
+
     <div style="padding-top: 10px">
       <vxe-table
         ref="xTable"
@@ -75,8 +73,9 @@
         <vxe-table-column field="voltage" title="操作人"></vxe-table-column>
         <vxe-table-column field="" title="操作">
           <template v-slot="{ row }">
-            <svg-icon v-if="row.status !== 0" slot="prefix" icon-class="alarm1" class="el-input__icon input-icon"/>
-            <svg-icon v-if="row.status === 0" slot="prefix" icon-class="alarm2" class="el-input__icon input-icon"  @click="acknowledge(row)"/>
+            <svg-icon v-if="row.status !== 0" slot="prefix" h icon-class="alarm1" class="el-input__icon input-icon"/>
+            <svg-icon v-if="row.status === 0" slot="prefix" viewBox="0 0 5 5" icon-class="alarm2" class="el-input__icon input-icon"
+                      @click="acknowledge(row)"/>
           </template>
         </vxe-table-column>
       </vxe-table>
@@ -131,8 +130,7 @@ export default {
       searchForm: {},
       tableData: [],
       loading: false,
-      alarm1: 0,
-      alarm2: 0
+      alarmNum: 0
     }
   },
   created() {
@@ -153,7 +151,7 @@ export default {
       const item = this.stationList.find(item => item.value === cellValue)
       return item ? item.label : ''
     },
-    alarmTypeFormat({cellValue, row, column}){
+    alarmTypeFormat({cellValue, row, column}) {
       const item = this.alarmTypes.find(item => item.value === cellValue)
       return item ? item.label : ''
     },
@@ -176,20 +174,21 @@ export default {
         "pageSize": this.pageSize,
         "stationCode": this.stationCode,
         "alarmType": this.alarmType,
-        "startTime":startTime,
-        "endTime":endTime
+        "startTime": startTime,
+        "endTime": endTime
       }
 
       this.$axios.get('/abnormalAlarm/getByTimeBetweenAndAlarmTypeAndStationCode', {params: queryParams}).then(response => {
         this.tableData = response.data.records
         this.total = response.data.total
 
-        this.$axios.get('/abnormalAlarm/getCountByStatusAndStationCode', {params: {
+        this.$axios.get('/abnormalAlarm/getCountByStatusAndStationCode', {
+          params: {
             "status": 0,
             "stationCode": this.stationCode,
-          }}).then(response => {
-            this.alarm2 = response.data
-            this.alarm1 = this.total - this.alarm2
+          }
+        }).then(response => {
+          this.alarmNum = response.data
           this.loading = false
         })
       }).catch(() => {
@@ -205,15 +204,17 @@ export default {
         }
       })
     },
-    acknowledgeByStationCode(){
+    acknowledgeByStationCode() {
       this.$confirm('是否确认执行当前场站全部确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$axios.get('/abnormalAlarm/acknowledgeByStationCode', {params: {
+        this.$axios.get('/abnormalAlarm/acknowledgeByStationCode', {
+          params: {
             "stationCode": this.stationCode,
-          }}).then(response => {
+          }
+        }).then(response => {
           this.beforeQuery()
           this.$message.info("确认成功！")
 
@@ -222,15 +223,15 @@ export default {
         })
       })
     },
-    acknowledge(row){
-      this.$confirm('是否确认执行【'+row.msg+'】确认操作？', '提示', {
+    acknowledge(row) {
+      this.$confirm('是否确认执行【' + row.msg + '】确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         row.status = 1
-        this.$axios.post('/abnormalAlarm/save',row).then(response => {
-          this.$message.info("【"+row.msg+"】 已确认！")
+        this.$axios.post('/abnormalAlarm/save', row).then(response => {
+          this.$message.info("【" + row.msg + "】 已确认！")
           this.beforeQuery()
         }).catch(() => {
           this.loading = false