代码修改

business-service/src/main/java/com/ozs/entity/BaseRouteMassage.java

@@ -3,12 +3,14 @@ package com.ozs.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -20,7 +22,7 @@ import java.io.Serializable;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class BaseRouteMassage extends BaseEntity implements Serializable {
+public class BaseRouteMassage  implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -60,4 +62,8 @@ public class BaseRouteMassage extends BaseEntity implements Serializable {
      */
     @Excel(name = "进路股道")
     private Integer routeStationTrack;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 }

business-service/src/main/java/com/ozs/entity/BaseTerminal.java

@@ -98,6 +98,13 @@ public class BaseTerminal implements Serializable {
     @Excel(name = "关联机车号")
     private String vehicleCode;
 
+    /**
+     * 关联机车号
+     */
+    @TableField(exist = false)
+    @Excel(name = "AB端")
+    private String end;
+
 //    /**
 //     * 是否在线 0.离线 1.在线
 //     */

business-service/src/main/java/com/ozs/entity/BaseVehicle.java

@@ -42,6 +42,20 @@ public class BaseVehicle implements Serializable {
     @Excel(name = "机车号")
     private String vehicleCode;
 
+    /**
+     * 车型
+     */
+    @Excel(name = "车型")
+    private String vehicleType;
+
+
+    /**
+     * AB端
+     */
+    @Excel(name = "AB端")
+    private String ends;
+    
+    
     /**
      * 机车名称
      */

business-service/src/main/java/com/ozs/entity/PreAlarm.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class PreAlarm extends BaseEntity implements Serializable {
+public class PreAlarm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -50,4 +50,8 @@ public class PreAlarm extends BaseEntity implements Serializable {
      * 预警目标数据组
      */
     private String preAlarmList;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
 }

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

@@ -82,6 +82,7 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
                     BaseVehicle baseVehicle = baseVehicleMapper.selectOne(wrapper2);
                     if (!ObjectUtils.isEmpty(baseVehicle)) {
                         o.setVehicleCode(baseVehicle.getVehicleCode());
+                        o.setEnd(baseVehicle.getEnds());
                     }
                 }
                 return o;

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -114,6 +114,7 @@ import java.util.stream.Collectors;
 public class GeoHazardMonitorTokenController {
     public static final String PATTERN = "^([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)$";
     public static final String PATTERNS = "^[0-9]*$";
+    public static final String REGEX = "^\\d{13}$";
 
     public static final String KEY = "58792429c08c43e9";
     @Resource
@@ -1230,7 +1231,6 @@ public class GeoHazardMonitorTokenController {
                 AjaxResults1 = new AjaxResults(0, "视频加载中", respHeartbeatVo);
                 if (StringUtils.isNotEmpty(respHeartbeatVo.getCameraList())) {
                     AjaxResults1 = new AjaxResults(1, "ok", respHeartbeatVo);
-                } else {
                 }
                 long end = System.currentTimeMillis();
                 log.info("结束心跳时间: " + sdf.format(new Date(end)));
@@ -1800,33 +1800,35 @@ public class GeoHazardMonitorTokenController {
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
             if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmNum())) {
-                AjaxResults1 = new AjaxResults(0, "预警目标个数不难为空");
+                AjaxResults1 = new AjaxResults(0, "预警目标个数不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
             if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmTime())) {
-                AjaxResults1 = new AjaxResults(0, "预警时间不难为空");
+                AjaxResults1 = new AjaxResults(0, "预警时间不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            if (ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmList())) {
-                AjaxResults1 = new AjaxResults(0, "预警目标集合不难为空");
+            if (!preAlarmResponse.getPreAlarmTime().toString().matches(REGEX)) {
+                AjaxResults1 = new AjaxResults(0, "预警时间参数不对，正确格式为:单位毫秒（13位）");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
             }
-            for (PreAlarmResponse.PreAlarmList preAlarmList : preAlarmResponse.getPreAlarmList()) {
-                if (ObjectUtils.isEmpty(preAlarmList.getContent())) {
-                    AjaxResults1 = new AjaxResults(0, "预警内容不难为空");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
-                }
-                if (ObjectUtils.isEmpty(preAlarmList.getDistance())) {
-                    AjaxResults1 = new AjaxResults(0, "目标点离机车的距离不难为空");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
-                }
-                if (ObjectUtils.isEmpty(preAlarmList.getLevel())) {
-                    AjaxResults1 = new AjaxResults(0, "预警级别不难为空");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
-                }
-                if (ObjectUtils.isEmpty(preAlarmList.getTargetType())) {
-                    AjaxResults1 = new AjaxResults(0, "预警目标点类型不难为空");
-                    return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
+            if (!ObjectUtils.isEmpty(preAlarmResponse.getPreAlarmList())) {
+                for (PreAlarmResponse.PreAlarmList preAlarmList : preAlarmResponse.getPreAlarmList()) {
+                    if (ObjectUtils.isEmpty(preAlarmList.getContent())) {
+                        AjaxResults1 = new AjaxResults(0, "预警内容不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
+                    }
+                    if (ObjectUtils.isEmpty(preAlarmList.getDistance())) {
+                        AjaxResults1 = new AjaxResults(0, "目标点离机车的距离不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
+                    }
+                    if (ObjectUtils.isEmpty(preAlarmList.getLevel())) {
+                        AjaxResults1 = new AjaxResults(0, "预警级别不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
+                    }
+                    if (ObjectUtils.isEmpty(preAlarmList.getTargetType())) {
+                        AjaxResults1 = new AjaxResults(0, "预警目标点类型不能为空");
+                        return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);
+                    }
                 }
             }
             PreAlarm preAlarm = new PreAlarm();
@@ -1835,6 +1837,7 @@ public class GeoHazardMonitorTokenController {
             preAlarm.setPreAlarmTime(new Date(preAlarmResponse.getPreAlarmTime()));
             preAlarm.setPreAlarmType(preAlarmResponse.getPreAlarmType());
             preAlarm.setPreAlarmList(JSON.toJSONString(preAlarmResponse.getPreAlarmList()));
+            preAlarm.setCreatedTime(new Date());
             if (preAlarmService.save(preAlarm)) {
                 AjaxResults1 = new AjaxResults(1, "ok");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(AjaxResults1), key);