心跳接口修改

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

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.entity.TerminalHeartbeatLog;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 心跳接口相机记录表 Mapper 接口
  */
 @Mapper
 public interface TerminalHeartbeatLogMapper extends BaseMapper<TerminalHeartbeatLog> {
+    List<TerminalHeartbeatLog> terminalHeartbeatLogList();
 }

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

@@ -3,6 +3,8 @@ package com.ozs.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.entity.TerminalHeartbeatLog;
 
+import java.util.List;
+
 /**
  * 心跳接口相机记录表 服务类
  * @author Administrator
@@ -10,4 +12,6 @@ import com.ozs.entity.TerminalHeartbeatLog;
 public interface TerminalHeartbeatLogService extends IService<TerminalHeartbeatLog> {
 
      int add(String code,String channel);
+
+     List<TerminalHeartbeatLog> terminalHeartbeatLogList();
 }

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 心跳接口相机记录表 服务类实现类
@@ -26,4 +27,9 @@ public class TerminalHeartbeatLogServiceImpl extends ServiceImpl<TerminalHeartbe
         terminalHeartbeatLog.setCreateTime(new Date());
         return baseMapper.insert(terminalHeartbeatLog);
     }
+
+    @Override
+    public List<TerminalHeartbeatLog> terminalHeartbeatLogList() {
+        return baseMapper.terminalHeartbeatLogList();
+    }
 }

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

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.mapper.TerminalHeartbeatLogMapper">
 
+    <select id="terminalHeartbeatLogList" resultType="com.ozs.entity.TerminalHeartbeatLog">
+        SELECT camera_code
+FROM (
+    SELECT DISTINCT camera_code
+    FROM terminal_heartbeat_log
+    LIMIT 4
+) AS subquery
+ORDER BY camera_code DESC;
+    </select>
 </mapper>

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

@@ -576,10 +576,7 @@ public class GeoHazardMonitorTokenController {
             terminal.eq(BaseTerminal::getTerminalCode, vehiclePosition.getTerminalCode());
             boolean update = baseTerminalService.update(baseTerminal1, terminal);
             //获取心跳接口相机记录表信息
-            List<TerminalHeartbeatLog> heartbeatLogList = terminalHeartbeatLogService.list(new QueryWrapper<TerminalHeartbeatLog>()
-                    .select("DISTINCT camera_code,create_time") // 替换your_distinct_field1, your_distinct_field2为实际需要去重的字段名
-                    .orderByDesc("create_time")
-                    .last("limit 4"));
+            List<TerminalHeartbeatLog> heartbeatLogList = terminalHeartbeatLogService.terminalHeartbeatLogList();
             List<String> codeList = new ArrayList<>();
             log.info("-----heartbeatLogList----->" + heartbeatLogList);
             if (!ObjectUtils.isEmpty(heartbeatLogList)) {