HTTP流转RTSP流修改

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

@@ -2,8 +2,13 @@ package com.ozs.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.entity.VehiclePosition;
+import com.ozs.entity.vo.MsgAlarmVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface MsgHeartbeatAlarmMessageMapper extends BaseMapper<MsgHeartbeatAlarmMessage> {
+    List<MsgHeartbeatAlarmMessage> selectBaseLineManagement(String alarmId);
 }

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

@@ -1,7 +1,15 @@
 package com.ozs.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.entity.VehiclePosition;
+import com.ozs.entity.vo.MsgAlarmVo;
+
+import java.util.List;
 
 public interface MsgHeartbeatAlarmMessageService extends IService<MsgHeartbeatAlarmMessage> {
+    IPage<MsgHeartbeatAlarmMessage> listToPage(List<MsgHeartbeatAlarmMessage> list, Integer pageNum, Integer pageSize);
+
+    List<MsgHeartbeatAlarmMessage> selectBaseLineManagement(String alarmId);
 }

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

@@ -1,12 +1,36 @@
 package com.ozs.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.entity.VehiclePosition;
+import com.ozs.entity.vo.MsgAlarmVo;
 import com.ozs.mapper.MsgHeartbeatAlarmMessageMapper;
 import com.ozs.service.MsgHeartbeatAlarmMessageService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 @Service
 public class MsgHeartbeatAlarmMessageServiceImpl extends ServiceImpl<MsgHeartbeatAlarmMessageMapper, MsgHeartbeatAlarmMessage> implements MsgHeartbeatAlarmMessageService {
+    @Override
+    public IPage listToPage(List<MsgHeartbeatAlarmMessage> list, Integer pageNum, Integer pageSize) {
+        List pageList = new ArrayList<>();
+        int curIdx = pageNum > 1 ? (pageNum - 1) * pageSize : 0;
+        for (int i = 0; i < pageSize && curIdx + i < list.size(); i++) {
+            pageList.add(list.get(curIdx + i));
+        }
+        IPage page = new Page<>(pageNum, pageSize);
+        page.setRecords(pageList);
+        page.setTotal(list.size());
+        return page;
+    }
+
+    @Override
+    public List<MsgHeartbeatAlarmMessage> selectBaseLineManagement(String alarmId) {
+        return baseMapper.selectBaseLineManagement(alarmId);
+    }
 }

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

@@ -1,4 +1,14 @@
 <?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.MsgHeartbeatAlarmMessageMapper">
+    <select id="selectBaseLineManagement" resultType="com.ozs.entity.MsgHeartbeatAlarmMessage" parameterType="java.lang.String">
+        SELECT /*+ GROUP_OPT_FLAG(1)*/ id, alarm_id, terminal_code, train_num, create_time FROM
+      msg_heartbeat_alarm_message
+        <where>
+            <if test="alarmId != null and alarmId != ''">
+                and alarm_id = #{alarmId}
+            </if>
+        </where>
+        GROUP BY alarm_id, terminal_code, train_num order by create_time asc
+    </select>
 </mapper>

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

@@ -13,6 +13,7 @@ import com.ozs.entity.BaseTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.entity.VehiclePosition;
 import com.ozs.entity.vo.MsgAlarmVo;
 import com.ozs.service.BaseTerminalService;
 import com.ozs.service.BaseVehicleService;
@@ -52,12 +53,10 @@ public class MsgHeartbeatAlarmMessageController extends BaseController {
     @PostMapping("/list")
     @Log(title = "报警和心跳交互信息表", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseLineManagement(@RequestBody MsgAlarmVo msgAlarmVo) {
-        LambdaQueryWrapper<MsgHeartbeatAlarmMessage> lw = new LambdaQueryWrapper<>();
-        if (!StringUtils.isBlank(msgAlarmVo.getAlarmId())) {
-            lw.eq(MsgHeartbeatAlarmMessage::getAlarmId, msgAlarmVo.getAlarmId());
-        }
-        lw.groupBy(MsgHeartbeatAlarmMessage::getAlarmId,MsgHeartbeatAlarmMessage::getTerminalCode,MsgHeartbeatAlarmMessage::getTrainNum);
-        IPage<MsgHeartbeatAlarmMessage> page = msgHeartbeatAlarmMessageService.page(new Page<>(msgAlarmVo.getPageNum(), msgAlarmVo.getPageSize()), lw);
+        Integer pageNum = msgAlarmVo.getPageNum().intValue();
+        Integer pageSize = msgAlarmVo.getPageSize().intValue();
+        List<MsgHeartbeatAlarmMessage> list = msgHeartbeatAlarmMessageService.selectBaseLineManagement(msgAlarmVo.getAlarmId());
+        IPage<MsgHeartbeatAlarmMessage> page = msgHeartbeatAlarmMessageService.listToPage(list, pageNum, pageSize);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<MsgHeartbeatAlarmMessage> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseTerminal> wrapper5 = new LambdaQueryWrapper<>();