监测系统监控分页修改

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

@@ -1,6 +1,7 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author Administrator
@@ -19,7 +21,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @Builder
 @ApiModel("心跳报警信息记录表")
-public class MsgHearbeatAlarmMessage extends BaseEntity implements Serializable {
+public class MsgHeartbeatAlarmMessage implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -37,11 +39,26 @@ public class MsgHearbeatAlarmMessage extends BaseEntity implements Serializable
     /**
      * 机车编码
      */
-    private String vehicleCode;
+    private String terminalCode;
 
 
     /**
      * 车次
      */
     private  String trainNum;
+
+
+    /**
+     * 机车名称
+     */
+    @TableField(exist = false)
+    private String vehicleName;
+
+    /**
+     * 终端名称
+     */
+    @TableField(exist = false)
+    private String terminalName;
+
+    private Date createTime;
 }

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

@@ -23,6 +23,11 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      */
     private Long id;
 
+    /**
+     * 标识UUID
+     */
+    private String alarmId;
+
     /**
      * 相机编码
      */

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

@@ -1,9 +0,0 @@
-package com.ozs.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.entity.MsgHearbeatAlarmMessage;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface MsgHearbeatAlarmMessageMapper extends BaseMapper<MsgHearbeatAlarmMessage> {
-}

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

@@ -0,0 +1,9 @@
+package com.ozs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MsgHeartbeatAlarmMessageMapper extends BaseMapper<MsgHeartbeatAlarmMessage> {
+}

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

@@ -1,7 +0,0 @@
-package com.ozs.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.entity.MsgHearbeatAlarmMessage;
-
-public interface MsgHearbeatAlarmMessageService extends IService<MsgHearbeatAlarmMessage> {
-}

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

@@ -0,0 +1,7 @@
+package com.ozs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.entity.MsgHeartbeatAlarmMessage;
+
+public interface MsgHeartbeatAlarmMessageService extends IService<MsgHeartbeatAlarmMessage> {
+}

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

@@ -1,12 +0,0 @@
-package com.ozs.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.entity.MsgHearbeatAlarmMessage;
-import com.ozs.mapper.MsgHearbeatAlarmMessageMapper;
-import com.ozs.service.MsgHearbeatAlarmMessageService;
-import org.springframework.stereotype.Service;
-
-
-@Service
-public class MsgHearbeatAlarmMessageServiceImpl extends ServiceImpl<MsgHearbeatAlarmMessageMapper, MsgHearbeatAlarmMessage> implements MsgHearbeatAlarmMessageService {
-}

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

@@ -0,0 +1,12 @@
+package com.ozs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.mapper.MsgHeartbeatAlarmMessageMapper;
+import com.ozs.service.MsgHeartbeatAlarmMessageService;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class MsgHeartbeatAlarmMessageServiceImpl extends ServiceImpl<MsgHeartbeatAlarmMessageMapper, MsgHeartbeatAlarmMessage> implements MsgHeartbeatAlarmMessageService {
+}

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

@@ -90,7 +90,7 @@
 (select CLIENT_ID,status,MONITOR_SYSTEM_NAME from monitor_system) mon  on log.CLIENT_ID=mon.CLIENT_ID
         <where>
             <if test="monitorSystemName != null and monitorSystemName != ''">
-                and mon.MONITOR_SYSTEM_NAME= #{monitorSystemName}
+                and mon.MONITOR_SYSTEM_NAME like concat("%",#{monitorSystemName},"%")
             </if>
             <if test="status != null and status != 0">
                 and mon.status = #{status}

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

@@ -1,4 +1,4 @@
 <?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.MsgHearbeatAlarmMessageMapper">
+<mapper namespace="com.ozs.mapper.MsgHeartbeatAlarmMessageMapper">
 </mapper>

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

@@ -1,71 +0,0 @@
-package com.ozs.web.controller.accountmanagment;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ozs.common.annotation.Log;
-import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.enums.BusinessType;
-import com.ozs.common.utils.AppendUtils;
-import com.ozs.common.utils.StringUtils;
-import com.ozs.entity.BaseRailwayManagement;
-import com.ozs.entity.vo.BaseRailwayManagementVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/service/msgHearbeatAlarmMessage")
-public class MsgHearbeatAlarmMessageController {
-
-
-    /**
-     * 线路管理表分页
-     *
-     * @param baseRailwayManagementVo
-     * @return
-     */
-    @ApiOperation(value = "线路管理表分页")
-    @PostMapping("/list")
-    @Log(title = "线路台账管理", businessType = BusinessType.SELECT)
-    public AjaxResult selectBaseLineManagement(@RequestBody BaseRailwayManagementVo baseRailwayManagementVo) {
-//        LambdaQueryWrapper<BaseRailwayManagement> lw = new LambdaQueryWrapper<>();
-//        if (!StringUtils.isBlank(baseRailwayManagementVo.getRailwayCode())) {
-//            lw.like(BaseRailwayManagement::getRailwayCode, "%" + baseRailwayManagementVo.getRailwayCode() + "%");
-//        }
-//        if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType()) && baseRailwayManagementVo.getRailwayType() != 0) {
-//            lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
-//        }
-//        IPage<BaseRailwayManagement> page = baseRailwayManagementService.page(new Page<>(baseRailwayManagementVo.getPageNum(), baseRailwayManagementVo.getPageSize()), lw);
-//        List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
-//        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
-//            List<BaseRailwayManagement> dto1 = page.getRecords().stream().map(o -> {
-//                for (SysDictData datum : data) {
-//                    if (datum.getDictValue().equals(o.getRailwayType().toString())) {
-//                        o.setRailwayTypeName(datum.getDictLabel());
-//                    }
-//                }
-//                String end = "";
-//                if (!StringUtils.isEmptySunhh(o.getInitialMileage())) {
-//                    end = AppendUtils.stringAppend(o.getInitialMileage());
-//                }
-//                String begin = "";
-//                if (!StringUtils.isEmptySunhh(o.getEndMileage())) {
-//                    begin = AppendUtils.stringAppend(o.getEndMileage());
-//                }
-//                o.setMilesRange(begin + "-" + end);
-//                return o;
-//            }).collect(Collectors.toList());
-//            page.setRecords(dto1);
-//        }
-        return AjaxResult.success();
-    }
-}

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

@@ -0,0 +1,84 @@
+package com.ozs.web.controller.accountmanagment;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.common.utils.StringUtils;
+import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.BaseVehicle;
+import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.entity.MsgHeartbeatAlarmMessage;
+import com.ozs.entity.vo.MsgAlarmVo;
+import com.ozs.service.BaseTerminalService;
+import com.ozs.service.BaseVehicleService;
+import com.ozs.service.BaseVehicleTerminalService;
+import com.ozs.service.MsgHeartbeatAlarmMessageService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/service/msgHeartbeatAlarmMessage")
+public class MsgHeartbeatAlarmMessageController {
+
+    @Autowired
+    private MsgHeartbeatAlarmMessageService msgHeartbeatAlarmMessageService;
+    @Autowired
+    private BaseVehicleTerminalService baseVehicleTerminalService;
+    @Autowired
+    private BaseVehicleService baseVehicleService;
+    @Autowired
+    private BaseTerminalService baseTerminalService;
+
+    /**
+     * 心跳报警信息记录表分页
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "心跳报警信息记录表分页")
+    @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());
+        }
+        IPage<MsgHeartbeatAlarmMessage> page = msgHeartbeatAlarmMessageService.page(new Page<>(msgAlarmVo.getPageNum(), msgAlarmVo.getPageSize()), lw);
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+            List<MsgHeartbeatAlarmMessage> dto1 = page.getRecords().stream().map(o -> {
+                LambdaQueryWrapper<BaseTerminal> wrapper5 = new LambdaQueryWrapper<>();
+                wrapper5.eq(BaseTerminal::getTerminalCode, o.getTerminalCode());
+                BaseTerminal  baseTerminal= baseTerminalService.getOne(wrapper5);
+                if (!ObjectUtils.isEmpty(baseTerminal)){
+                    o.setTerminalName(baseTerminal.getTerminalName());
+                }
+                LambdaQueryWrapper<BaseVehicleTerminal> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(BaseVehicleTerminal::getTerminalCode, o.getTerminalCode());
+                BaseVehicleTerminal baseVehicleTerminal = baseVehicleTerminalService.getOne(wrapper1);
+                if (!ObjectUtils.isEmpty(baseVehicleTerminal)) {
+                    LambdaQueryWrapper<BaseVehicle> wrapper2 = new LambdaQueryWrapper<>();
+                    wrapper2.eq(BaseVehicle::getVehicleCode, baseVehicleTerminal.getVehicleCode());
+                    BaseVehicle baseVehicle = baseVehicleService.getOne(wrapper2);
+                    if (!ObjectUtils.isEmpty(baseVehicle)) {
+                        o.setVehicleName(baseVehicle.getVehicleName());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto1);
+        }
+        return AjaxResult.success(page);
+    }
+}

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

@@ -19,7 +19,7 @@ import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.MsgAlarmExt;
 import com.ozs.entity.MsgAlarmFrequency;
-import com.ozs.entity.MsgHearbeatAlarmMessage;
+import com.ozs.entity.MsgHeartbeatAlarmMessage;
 import com.ozs.entity.SvcAddress;
 import com.ozs.entity.SkynetHeartbeatLog;
 import com.ozs.entity.TerminalIgnoreAlarm;
@@ -44,7 +44,7 @@ import com.ozs.entity.vo.SkynetHeartbeatVo;
 import com.ozs.entity.vo.TerminalIgnoreVo;
 import com.ozs.framework.config.ServerConfig;
 import com.ozs.mapper.AlarmHeartbeatLogMapper;
-import com.ozs.mapper.MsgHearbeatAlarmMessageMapper;
+import com.ozs.mapper.MsgHeartbeatAlarmMessageMapper;
 import com.ozs.mapper.SkynetHeartbeatLogMapper;
 import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseRailwayManagementService;
@@ -143,7 +143,7 @@ public class GeoHazardMonitorTokenController {
     @Resource
     private AlarmHeartbeatLogMapper alarmHeartbeatLogMapper;
     @Resource
-    private MsgHearbeatAlarmMessageMapper msgHearbeatAlarmMessageMapper;
+    private MsgHeartbeatAlarmMessageMapper msgHearbeatAlarmMessageMapper;
     @Value("${base.env}")
     private String env;
 
@@ -680,9 +680,9 @@ public class GeoHazardMonitorTokenController {
                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                     }
                     for (int i = 0; i < list.size(); i++) {
-                        MsgHearbeatAlarmMessage msgHearbeatAlarmMessage = new MsgHearbeatAlarmMessage();
+                        MsgHeartbeatAlarmMessage msgHearbeatAlarmMessage = new MsgHeartbeatAlarmMessage();
                         msgHearbeatAlarmMessage.setAlarmId(list.get(i).getAlarmId());
-                        msgHearbeatAlarmMessage.setVehicleCode(heartbeatVo.getVehicleCode());
+                        msgHearbeatAlarmMessage.setTerminalCode(heartbeatVo.getTerminalCode());
                         msgHearbeatAlarmMessage.setTrainNum(heartbeatVo.getTrainNum());
                         msgHearbeatAlarmMessageMapper.insert(msgHearbeatAlarmMessage);
                         //获取剩余的报警信息