修改报警信息里程位置显示

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

@@ -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

@@ -412,7 +412,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/resources/application.yml

@@ -107,15 +107,15 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 3
 # app:token配置
 apptoken:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
   secret: qwertyuiopasdfghjklzxcvbnm
-  # 令牌有效期（默认15天）
-  expireTime: 21600
+  # 令牌有效期（默认15天）21600
+  expireTime: 3
 
 # MyBatis配置
 mybatis: