添加筛选条件

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

@@ -0,0 +1,47 @@
+package com.ozs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("心跳报警信息记录表")
+public class MsgHearbeatAlarmMessage extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 报警唯一标识
+     */
+    private String alarmId;
+
+    /**
+     * 机车编码
+     */
+    private String vehicleCode;
+
+
+    /**
+     * 车次
+     */
+    private  String trainNum;
+}

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

@@ -18,6 +18,10 @@ public class HeartbeatVo implements Serializable {
      * 机车编码
      */
     private String vehicleCode;
+    /**
+     * 车次
+     */
+    private  String trainNum;
     /**
      * 机车名称
      */

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

@@ -1,5 +1,6 @@
 package com.ozs.entity.vo;
 
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
@@ -23,4 +24,14 @@ public class VehiclePositionResp extends PageVo implements Serializable {
 
     //车载状态
     private Integer status;
+
+    /**
+     * 终端编码
+     */
+    private String terminalCode;
+
+    /**
+     * 终端名称
+     */
+    private String terminalName;
 }

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

@@ -3,6 +3,7 @@ package com.ozs.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.entity.MonitorSystem;
 import com.ozs.entity.vo.AlarmHeartbeatLog;
+import com.ozs.entity.vo.MonitorSystemVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -60,6 +61,6 @@ public interface MonitorSystemMapper extends BaseMapper<MonitorSystem> {
 
     AlarmHeartbeatLog selectAlarmHeartbeatLogByClientId(@Param("clientId") String clientId);
 
-    List<MonitorSystem> monitorSystemPage();
+    List<MonitorSystem> monitorSystemPage(MonitorSystemVo monitorSystemVo);
 }
 

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

@@ -235,7 +235,7 @@ public class MonitorSystemServiceImpl extends ServiceImpl<MonitorSystemMapper, M
 
     @Override
     public List<MonitorSystem> monitorSystemPage(MonitorSystemVo monitorSystemVo) {
-        List<MonitorSystem> monitorSystemList = monitorSystemMapper.monitorSystemPage();
+        List<MonitorSystem> monitorSystemList = monitorSystemMapper.monitorSystemPage(monitorSystemVo);
         for (MonitorSystem monitorSystem : monitorSystemList) {
             if (!ObjectUtils.isEmpty(monitorSystem.getStatus())) {
                 monitorSystem.setStatusName(monitorSystem.getStatus() == 1 ? "已联通" : "未联通");

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

@@ -63,7 +63,17 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
     @Override
     public List<VehiclePosition> vehiclePositionPage(VehiclePositionResp vehiclePositionResp) {
         boolean state = true;
-        List<BaseTerminal> baseTerminals = baseTerminalMapper.selectList(null);
+        LambdaQueryWrapper<BaseTerminal> wrapper3=new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(vehiclePositionResp.getTerminalCode())){
+            wrapper3.eq(BaseTerminal::getTerminalCode,vehiclePositionResp.getTerminalCode());
+        }
+        if (StringUtils.isNotEmpty(vehiclePositionResp.getTerminalName())){
+            wrapper3.like(BaseTerminal::getTerminalName,vehiclePositionResp.getTerminalName());
+        }
+        if (!ObjectUtils.isEmpty(vehiclePositionResp.getStatus())){
+            wrapper3.eq(BaseTerminal::getStatus,vehiclePositionResp.getStatus());
+        }
+        List<BaseTerminal> baseTerminals = baseTerminalMapper.selectList(wrapper3);
         QueryWrapper<VehiclePosition> wrapper = new QueryWrapper<>();
         wrapper.orderByDesc("create_time");
         List<VehiclePosition> vehiclePositions = baseMapper.selectList(wrapper);
@@ -103,6 +113,7 @@ public class VehiclePositionServiceImpl extends ServiceImpl<VehiclePositionMappe
                 VehiclePosition vehiclePosition = new VehiclePosition();
                 vehiclePosition.setStatus(baseTerminal.getStatus() == 1 ? "在线" : "离线");
                 vehiclePosition.setTerminalCode(baseTerminal.getTerminalCode());
+                vehiclePosition.setTerminalName(baseTerminal.getTerminalName());
                 vehiclePositionArrayList.add(vehiclePosition);
             }
         }

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

@@ -85,8 +85,17 @@
             parameterType="java.lang.String">
         select /*+ GROUP_OPT_FLAG(1)*/ id, client_id, max(create_time) as createTime from alarm_heartbeat_log where client_id = #{clientId}
     </select>
-    <select id="monitorSystemPage" resultType="com.ozs.entity.MonitorSystem">
+    <select id="monitorSystemPage" resultType="com.ozs.entity.MonitorSystem" parameterType="com.ozs.entity.vo.MonitorSystemVo">
         select mon.CLIENT_ID,max(create_time) as turnOnTime from  alarm_heartbeat_log  log right join 
-(select CLIENT_ID from monitor_system) mon  on log.CLIENT_ID=mon.CLIENT_ID   GROUP BY mon.CLIENT_ID
+(select CLIENT_ID from monitor_system) mon  on log.CLIENT_ID=mon.CLIENT_ID
+        <where>
+            <if test="clientId != null and clientId != ''">
+                and CLIENT_ID = #{clientId}
+            </if>
+            <if test="status != null and status != 0">
+                and status = #{status}
+            </if>
+        </where>
+  GROUP BY mon.CLIENT_ID
     </select>
 </mapper>