Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticDto.java

@@ -27,7 +27,7 @@ public class AlarmStatisticDto {
      * 报警时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "报警时间")
+    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date alarmTime;
 
     /**
@@ -61,12 +61,10 @@ public class AlarmStatisticDto {
     /**
      * 监控范围开始里程位置
      */
-    @Excel(name = "里程起始范围km")
     private Integer beginMile;
 
     /**
      * 监控范围结束里程位置
      */
-    @Excel(name = "里程结束范围km")
     private Integer endMile;
 }

business-service/src/main/java/com/ozs/service/entity/vo/AlarmStatisticVo.java

@@ -1,5 +1,6 @@
 package com.ozs.service.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.service.entity.BaseCameraManagement;
 import lombok.Data;
 
@@ -28,6 +29,9 @@ public class AlarmStatisticVo {
     /**
      * 报警时间
      */
+    @JsonFormat(
+            pattern = "yyyy-MM-dd HH:mm:ss"
+    )
     private Date alarmTime;
 
     /**

business-service/src/main/java/com/ozs/service/service/impl/MsgAlarmServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.AlarmStatisticDto;
 import com.ozs.service.entity.vo.AlarmStatisticMonthDto;
@@ -16,6 +17,8 @@ import com.ozs.service.service.MsgAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
 
@@ -50,6 +53,11 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     @Override
     public IPage<AlarmStatisticVo> list(String railwayCode, Integer startMonth, Integer endMonth, String alarmType, Integer pageNum, Integer pageSize, String userId) {
         List<AlarmStatisticVo> list = msgAlarmMapper.list(railwayCode, startMonth, endMonth, alarmType, userId);
+        if (!ObjectUtils.isEmpty(list)) {
+            list.forEach(l -> {
+                l.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
+            });
+        }
         IPage listPage = listToPage(list, pageNum, pageSize);
         return listPage;
     }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -428,7 +428,7 @@ public class MsgAlarmController extends BaseController {
                     String lineDir = l.getLineDir();
                     String lineDirValue = dictDataService.selectDictLabel("sys_line_dir", lineDir);
                     l.setLineDirValue(lineDirValue);
-
+                    l.setAlarmMile(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
                 });
             }
 

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -384,6 +384,7 @@ public class CameraUtil {
     public void deleteFlvExceed() throws IOException, InterruptedException {
         //字典中设置的值
         List<SysDictData> sysCameraRecordTime = dictDataMapper.selectDictDataByType("sys_camera_record_time");
+        log.info("sysCameraRecordTime======================================" + sysCameraRecordTime.get(0).getDictValue());
         //开启流
         List<String> rspList = new ArrayList<String>();
         Process proc = Runtime.getRuntime().exec(transcribeFilePath, null, null);
@@ -405,6 +406,8 @@ public class CameraUtil {
         date = calendar.getTime();
         //时间格式化为字符串
         String formatD = sdf.format(date);
+        log.info("formatD======================================" + formatD);
+
         //遍历每个进行视频录制的摄像头
         File file = new File(transcribeFilePath);
         if (file.exists()) {
@@ -417,6 +420,7 @@ public class CameraUtil {
                 List<String> commands = new ArrayList<>();
                 for (Map<String, Object> map : maps) {
                     Object path = map.get("Path");
+                    log.info("path======================================" + path.toString());
                     //查出符合条件的视频文件，删掉
                     if (!ObjectUtils.isEmpty(path)) {
                         String commit = " rm -rf  " + transcribeFilePath + "/" + path.toString() + "/" + formatD + "*";
@@ -426,6 +430,7 @@ public class CameraUtil {
                 // 删除
                 for (String line : commands) {
                     out.println(line);
+                    log.info("line======================================" + line);
                 }
             }
         }

hazard-admin/src/main/resources/application.yml

@@ -114,7 +114,7 @@ apptoken:
   header: Authorization
   # 令牌密钥
   secret: qwertyuiopasdfghjklzxcvbnm
-  # 令牌有效期（默认15天）
+  # 令牌有效期（默认15天）21600
   expireTime: 21600
 
 # MyBatis配置