第三方接口开发

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

@@ -0,0 +1,66 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 机车车载终端关联表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseTerminal implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 机车编码
+     */
+    private String vehicleCode;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,66 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 机车信息表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseVehicle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 机车编码
+     */
+    private String vehicleCode;
+
+    /**
+     * 机车名称
+     */
+    private String vehicleName;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,71 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 机车车载终端信息表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseVehicleTerminal implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 终端名称
+     */
+    private String terminalName;
+
+    /**
+     * 状态 1在线2离线
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,71 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TerminalIgnoreAlarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 报警唯一标识UUID
+     */
+    private String alarmId;
+
+    /**
+     * 忽略时间
+     */
+    private LocalDateTime ignoreTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,71 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 机车行驶表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class VehiclePosition implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 机车编码
+     */
+    private String vehicleCode;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 车辆行驶位置
+     */
+    private Integer travelMile;
+
+    /**
+     * 行别
+     */
+    private Integer lineDir;
+
+    /**
+     * 线路编码
+     */
+    private String railwayCode;
+
+    /**
+     * 当前时间
+     */
+    private LocalDateTime currentTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.ozs.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class HeartbeatVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 车载终端编码
+     */
+    private String terminalCode;
+    /**
+     * 当前里程位置，单位m
+     */
+    private Integer currentMile;
+    /**
+     * 线路编码
+     */
+    private String railwayCode;
+    /**
+     * 1上行2下行
+     */
+    private Integer lineDir;
+    /**
+     * 司机目视距离，单位m
+     */
+    private Integer visualDistance;
+    /**
+     * 信号强度（1全码率 2低码率）
+     */
+    private Integer signalStrength;
+}

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

@@ -0,0 +1,29 @@
+package com.ozs.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class ReleaseAlarmVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 报警的唯一标识
+     */
+    private String alarmId;
+    /**
+     * 解除报警时间
+     */
+    private Long releaseTime;
+    /**
+     * 解除原因（内容）
+     */
+    private String releaseContent;
+    /**
+     * 解除人
+     */
+    private String operator;
+}

business-service/src/main/java/com/ozs/mapper/BaseTerminalMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.mapper;
+
+import com.ozs.entity.BaseTerminal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 机车车载终端关联表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseTerminalMapper extends BaseMapper<BaseTerminal> {
+
+}

business-service/src/main/java/com/ozs/mapper/BaseVehicleMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.mapper;
+
+import com.ozs.entity.BaseVehicle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 机车信息表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
+
+}

business-service/src/main/java/com/ozs/mapper/BaseVehicleTerminalMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.mapper;
+
+import com.ozs.entity.BaseVehicleTerminal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 机车车载终端信息表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseVehicleTerminalMapper extends BaseMapper<BaseVehicleTerminal> {
+
+}

business-service/src/main/java/com/ozs/mapper/TerminalIgnoreAlarmMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.mapper;
+
+import com.ozs.entity.TerminalIgnoreAlarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface TerminalIgnoreAlarmMapper extends BaseMapper<TerminalIgnoreAlarm> {
+
+}

business-service/src/main/java/com/ozs/mapper/VehiclePositionMapper.java

@@ -0,0 +1,16 @@
+package com.ozs.mapper;
+
+import com.ozs.entity.VehiclePosition;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 机车行驶表 Mapper 接口
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface VehiclePositionMapper extends BaseMapper<VehiclePosition> {
+
+}

business-service/src/main/java/com/ozs/service/BaseTerminalService.java

@@ -0,0 +1,16 @@
+package com.ozs.service;
+
+import com.ozs.entity.BaseTerminal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 机车车载终端关联表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseTerminalService extends IService<BaseTerminal> {
+
+}

business-service/src/main/java/com/ozs/service/BaseVehicleService.java

@@ -0,0 +1,16 @@
+package com.ozs.service;
+
+import com.ozs.entity.BaseVehicle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 机车信息表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseVehicleService extends IService<BaseVehicle> {
+
+}

business-service/src/main/java/com/ozs/service/BaseVehicleTerminalService.java

@@ -0,0 +1,16 @@
+package com.ozs.service;
+
+import com.ozs.entity.BaseVehicleTerminal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 机车车载终端信息表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface BaseVehicleTerminalService extends IService<BaseVehicleTerminal> {
+
+}

business-service/src/main/java/com/ozs/service/TerminalIgnoreAlarmService.java

@@ -0,0 +1,16 @@
+package com.ozs.service;
+
+import com.ozs.entity.TerminalIgnoreAlarm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface TerminalIgnoreAlarmService extends IService<TerminalIgnoreAlarm> {
+
+}

business-service/src/main/java/com/ozs/service/VehiclePositionService.java

@@ -0,0 +1,16 @@
+package com.ozs.service;
+
+import com.ozs.entity.VehiclePosition;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 机车行驶表 服务类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+public interface VehiclePositionService extends IService<VehiclePosition> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ozs.service.impl;
+
+import com.ozs.entity.BaseTerminal;
+import com.ozs.mapper.BaseTerminalMapper;
+import com.ozs.service.BaseTerminalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 机车车载终端关联表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Service
+public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, BaseTerminal> implements BaseTerminalService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ozs.service.impl;
+
+import com.ozs.entity.BaseVehicle;
+import com.ozs.mapper.BaseVehicleMapper;
+import com.ozs.service.BaseVehicleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 机车信息表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Service
+public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseVehicle> implements BaseVehicleService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ozs.service.impl;
+
+import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.mapper.BaseVehicleTerminalMapper;
+import com.ozs.service.BaseVehicleTerminalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 机车车载终端信息表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Service
+public class BaseVehicleTerminalServiceImpl extends ServiceImpl<BaseVehicleTerminalMapper, BaseVehicleTerminal> implements BaseVehicleTerminalService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ozs.service.impl;
+
+import com.ozs.entity.TerminalIgnoreAlarm;
+import com.ozs.mapper.TerminalIgnoreAlarmMapper;
+import com.ozs.service.TerminalIgnoreAlarmService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Service
+public class TerminalIgnoreAlarmServiceImpl extends ServiceImpl<TerminalIgnoreAlarmMapper, TerminalIgnoreAlarm> implements TerminalIgnoreAlarmService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.ozs.service.impl;
+
+import com.ozs.entity.VehiclePosition;
+import com.ozs.mapper.VehiclePositionMapper;
+import com.ozs.service.VehiclePositionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 机车行驶表 服务实现类
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@Service
+public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMapper, VehiclePosition> implements VehiclePositionService {
+
+}

business-service/src/main/java/com/ozs/utils/CodeGet.java

@@ -48,7 +48,7 @@ public class CodeGet {
         // 5、策略配置
         StrategyConfig strategy = new StrategyConfig();
 
-        strategy.setInclude("msg_alarm_ext");
+        strategy.setInclude("terminal_ignore_alarm");
 
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
 

business-service/src/main/resources/mapper/BaseTerminalMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.mapper.BaseTerminalMapper">
+
+</mapper>

business-service/src/main/resources/mapper/BaseVehicleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.mapper.BaseVehicleMapper">
+
+</mapper>

business-service/src/main/resources/mapper/BaseVehicleTerminalMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.mapper.BaseVehicleTerminalMapper">
+
+</mapper>

business-service/src/main/resources/mapper/TerminalIgnoreAlarmMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.mapper.TerminalIgnoreAlarmMapper">
+
+</mapper>

business-service/src/main/resources/mapper/VehiclePositionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ozs.mapper.VehiclePositionMapper">
+
+</mapper>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleController.java

@@ -0,0 +1,20 @@
+package com.ozs.web.controller.accountmanagment;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 机车信息表 前端控制器
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/base-vehicle")
+public class BaseVehicleController {
+
+}
+

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseVehicleTerminalController.java

@@ -0,0 +1,20 @@
+package com.ozs.web.controller.accountmanagment;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 机车车载终端信息表 前端控制器
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/base-vehicle-terminal")
+public class BaseVehicleTerminalController {
+
+}
+

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/TerminalIgnoreAlarmController.java

@@ -0,0 +1,20 @@
+package com.ozs.web.controller.accountmanagment;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/terminal-ignore-alarm")
+public class TerminalIgnoreAlarmController {
+
+}
+

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/VehiclePositionController.java

@@ -0,0 +1,20 @@
+package com.ozs.web.controller.accountmanagment;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 机车行驶表 前端控制器
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/vehicle-position")
+public class VehiclePositionController {
+
+}
+

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

@@ -15,6 +15,8 @@ import com.ozs.entity.MsgAlarmExt;
 import com.ozs.entity.MsgAlarmFrequency;
 import com.ozs.entity.SvcAddress;
 import com.ozs.entity.vo.Files;
+import com.ozs.entity.vo.HeartbeatVo;
+import com.ozs.entity.vo.ReleaseAlarmVo;
 import com.ozs.entity.vo.ReqMsgAlarmVo;
 import com.ozs.entity.vo.RespGeoHazardMonitorVo;
 import com.ozs.entity.vo.RespMsgAlarmVo;
@@ -41,7 +43,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 1. 获取身份认证控制层
@@ -245,25 +249,93 @@ public class GeoHazardMonitorTokenController {
         }
     }
 
+    /**
+     * 报警解除接口
+     *
+     * @param parameter
+     * @param request
+     * @return
+     */
+    @PostMapping("/api/releaseAlarm")
+    public String releaseAlarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
+        log.info("token:{}", token);
+        log.info("parameter:{}", parameter);
+        JSONObject jsonObject = new JSONObject();
+        if (StringUtils.isNotEmpty(token)) {
+            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            ReleaseAlarmVo releaseAlarmVo = JSON.parseObject(s, ReleaseAlarmVo.class);
+            LambdaQueryWrapper<MsgAlarm> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(MsgAlarm::getAlarmId, releaseAlarmVo.getAlarmId());
+            MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(msgAlarm)) {
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "不存在该报警的唯一标识的数据");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
+            if (releaseAlarmVo.getReleaseTime().toString().length() == 10) {
+                releaseAlarmVo.setReleaseTime(releaseAlarmVo.getReleaseTime() * 1000);
+            }
+            msgAlarm.setReleasedTime(new Date(releaseAlarmVo.getReleaseTime()));
+            msgAlarm.setReleaseContent(releaseAlarmVo.getReleaseContent());
+            msgAlarm.setReleasedBy(releaseAlarmVo.getOperator());
+            msgAlarm.setUpdateBy(releaseAlarmVo.getOperator());
+            boolean count = msgAlarmService.updateById(msgAlarm);
+            Map<String, Object> map = new HashMap<>();
+            map.put("alarmId", msgAlarm.getAlarmId());
+            if (count) {
+                map.put("releaseState", 1);
+                jsonObject.put("resultCode", 1);
+                jsonObject.put("message", "成功");
+                jsonObject.put("data", map);
+            } else {
+                map.put("releaseState", 2);
+                jsonObject.put("resultCode", 0);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", map);
+            }
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        } else {
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        }
+    }
+
+
+    @PostMapping("/api/terminal/heartbeat")
+    public String heartbeat(@RequestParam("parameter") String parameter, HttpServletRequest request) {
+        String token = apiTokenUtils.getGeoHazardMonitorToken(request);
+        log.info("token:{}", token);
+        log.info("parameter:{}", parameter);
+        JSONObject jsonObject = new JSONObject();
+        if (StringUtils.isNotEmpty(token)) {
+            String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
+            HeartbeatVo heartbeatVo = JSON.parseObject(s, HeartbeatVo.class);
+//            BeanUtils.copyProperties(heartbeatVo, msgAlarm);
+
+            jsonObject.put("resultCode", 1);
+            jsonObject.put("message", "成功");
+            jsonObject.put("data", null);
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        } else {
+            jsonObject.put("resultCode", 2);
+            jsonObject.put("message", "失败");
+            jsonObject.put("data", "token验证失败");
+            return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+        }
+
+    }
+
     public static void main(String[] args) {
         JSONObject res = new JSONObject();
-        Files[] files = new Files[1];
-        files[0] = new Files();
-        files[0].fileUrl = "/1244/1/25/2023-03-03/63a1fe3084f24928915dafcf8a47a925.png";
-        files[0].fileType = 1;
-        res.put("alarmMile", 14000);
-        res.put("lineDir", 1);
-        res.put("alarmRailway", "G502");
         res.put("alarmId", "42010001541320001115");
-        res.put("alarmTime", 1681183564L);
-        res.put("content", "报警内容");
-        res.put("alarmType", 1);
-        res.put("alarmLevel", 2);
-        res.put("alarmConfidence", 1);
-        res.put("alarmAttr", "1280,1280,80,0,738,660");
-        res.put("files", files);
+        res.put("releaseTime", 1681200512L);
+        res.put("releaseContent", "已处理");
+        res.put("operator", 1);
         String s = SM4Utils.encryptData_ECB(JSONObject.toJSONString(res), "4370780c9a8c43e5");
         System.out.println(s);
-
     }
 }