监测系统监控分页修改

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

@@ -0,0 +1,9 @@
+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/service/MsgHearbeatAlarmMessageService.java

@@ -0,0 +1,7 @@
+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/impl/MsgHearbeatAlarmMessageServiceImpl.java

@@ -0,0 +1,12 @@
+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/resources/mapper/MonitorSystemMapper.xml

@@ -87,13 +87,13 @@
     </select>
     <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
+(select CLIENT_ID,status,MONITOR_SYSTEM_NAME from monitor_system) mon  on log.CLIENT_ID=mon.CLIENT_ID
         <where>
-            <if test="clientId != null and clientId != ''">
-                and CLIENT_ID = #{clientId}
+            <if test="monitorSystemName != null and monitorSystemName != ''">
+                and mon.MONITOR_SYSTEM_NAME= #{monitorSystemName}
             </if>
             <if test="status != null and status != 0">
-                and status = #{status}
+                and mon.status = #{status}
             </if>
         </where>
   GROUP BY mon.CLIENT_ID

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

@@ -0,0 +1,71 @@
+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/sdk/GeoHazardMonitorTokenController.java

@@ -19,6 +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.SvcAddress;
 import com.ozs.entity.SkynetHeartbeatLog;
 import com.ozs.entity.TerminalIgnoreAlarm;
@@ -43,6 +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.SkynetHeartbeatLogMapper;
 import com.ozs.service.BaseCameraManagementService;
 import com.ozs.service.BaseRailwayManagementService;
@@ -140,6 +142,8 @@ public class GeoHazardMonitorTokenController {
     private SkynetHeartbeatLogMapper synetHeartbeatLogMapper;
     @Resource
     private AlarmHeartbeatLogMapper alarmHeartbeatLogMapper;
+    @Resource
+    private MsgHearbeatAlarmMessageMapper msgHearbeatAlarmMessageMapper;
     @Value("${base.env}")
     private String env;
 
@@ -155,7 +159,7 @@ public class GeoHazardMonitorTokenController {
         LambdaQueryWrapper<SvcAddress> lw = new LambdaQueryWrapper<SvcAddress>();
         if (!ObjectUtils.isEmpty(svcAddress.getClientId())) {
             lw.eq(SvcAddress::getClientId, svcAddress.getClientId());
-            lw.eq(SvcAddress::getEnv,env);
+            lw.eq(SvcAddress::getEnv, env);
         } else {
             jsonObject.put("resultCode", 0);
             jsonObject.put("message", "失败");
@@ -290,7 +294,7 @@ public class GeoHazardMonitorTokenController {
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmMile())) {
                 wrapper.le(BaseCameraManagement::getBeginMile, reqMsgAlarmVo.getAlarmMile());
                 wrapper.ge(BaseCameraManagement::getEndMile, reqMsgAlarmVo.getAlarmMile());
-                wrapper.eq(BaseCameraManagement::getRailwayCode,reqMsgAlarmVo.getAlarmRailway());
+                wrapper.eq(BaseCameraManagement::getRailwayCode, reqMsgAlarmVo.getAlarmRailway());
                 wrapper.eq(BaseCameraManagement::getLineDir, reqMsgAlarmVo.getLineDir());
             }
             List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(wrapper);
@@ -625,7 +629,7 @@ public class GeoHazardMonitorTokenController {
                 queryWrapper.ge(MsgAlarm::getAlarmMile, heartbeatVo.getCurrentMile());
                 queryWrapper.le(MsgAlarm::getAlarmMile, (heartbeatVo.getCurrentMile() + 10000));
                 queryWrapper.eq(MsgAlarm::getLineDir, heartbeatVo.getLineDir());
-                queryWrapper.eq(MsgAlarm::getRailwayCode,heartbeatVo.getRailwayCode());
+                queryWrapper.eq(MsgAlarm::getRailwayCode, heartbeatVo.getRailwayCode());
                 queryWrapper.orderByAsc(MsgAlarm::getAlarmMile);
                 List<MsgAlarm> list = msgAlarmService.list(queryWrapper);
                 //有报警信息的时候
@@ -676,6 +680,11 @@ public class GeoHazardMonitorTokenController {
                         return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
                     }
                     for (int i = 0; i < list.size(); i++) {
+                        MsgHearbeatAlarmMessage msgHearbeatAlarmMessage = new MsgHearbeatAlarmMessage();
+                        msgHearbeatAlarmMessage.setAlarmId(list.get(i).getAlarmId());
+                        msgHearbeatAlarmMessage.setVehicleCode(heartbeatVo.getVehicleCode());
+                        msgHearbeatAlarmMessage.setTrainNum(heartbeatVo.getTrainNum());
+                        msgHearbeatAlarmMessageMapper.insert(msgHearbeatAlarmMessage);
                         //获取剩余的报警信息
                         LambdaQueryWrapper<BaseCameraManagement> ment = new LambdaQueryWrapper<BaseCameraManagement>();
                         ment.ge(BaseCameraManagement::getEndMile, list.get(i).getAlarmMile());
@@ -733,11 +742,11 @@ public class GeoHazardMonitorTokenController {
                         base.lt(BaseCameraManagement::getInstallMile, distance);
                     }
                     base.eq(BaseCameraManagement::getLineDir, heartbeatVo.getLineDir());
-                    base.eq(BaseCameraManagement::getRailwayCode,heartbeatVo.getRailwayCode());
+                    base.eq(BaseCameraManagement::getRailwayCode, heartbeatVo.getRailwayCode());
                     base.orderByAsc(BaseCameraManagement::getInstallMile);
                     base.last("limit 4");
                     List<BaseCameraManagement> list1 = baseCameraManagementService.list(base);
-                    if (list1.size()<=0){
+                    if (list1.size() <= 0) {
                         jsonObject.put("resultCode", 0);
                         jsonObject.put("message", "失败");
                         jsonObject.put("data", "没有监控里程的相机");
@@ -1160,7 +1169,6 @@ public class GeoHazardMonitorTokenController {
     }
 
 
-
     /**
      * 天网相机心跳监测接口定义
      */
@@ -1211,19 +1219,19 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "相机编码不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
-            SkynetHeartbeatLog skynetHeartbeatLog =new SkynetHeartbeatLog();
+            SkynetHeartbeatLog skynetHeartbeatLog = new SkynetHeartbeatLog();
             skynetHeartbeatLog.setCameraCode(skynetHeartbeatVo.getCameraCode());
             skynetHeartbeatLog.setInstallMile(skynetHeartbeatVo.getInstallMile());
             skynetHeartbeatLog.setRailwayCode(skynetHeartbeatVo.getRailwayCode());
             skynetHeartbeatLog.setLineDir(skynetHeartbeatVo.getLineDir());
-            if (synetHeartbeatLogMapper.insert(skynetHeartbeatLog)>0){
+            if (synetHeartbeatLogMapper.insert(skynetHeartbeatLog) > 0) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("cameraCode", skynetHeartbeatVo.getCameraCode());
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "ok");
                 jsonObject.put("data", map);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-            }else {
+            } else {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "新增失败");
@@ -1263,17 +1271,17 @@ public class GeoHazardMonitorTokenController {
                 jsonObject.put("data", "客户端编号不能为空");
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
             }
-            AlarmHeartbeatLog alarmHeartbeatLog =new AlarmHeartbeatLog();
+            AlarmHeartbeatLog alarmHeartbeatLog = new AlarmHeartbeatLog();
             alarmHeartbeatLog.setClientId(svcAddress.getClientId());
             alarmHeartbeatLog.setGrantType(svcAddress.getGrantType());
-            if (alarmHeartbeatLogMapper.insert(alarmHeartbeatLog)>0){
+            if (alarmHeartbeatLogMapper.insert(alarmHeartbeatLog) > 0) {
                 Map<String, Object> map = new HashMap<>();
                 map.put("cameraCode", svcAddress.getClientId());
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "ok");
                 jsonObject.put("data", map);
                 return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), key);
-            }else {
+            } else {
                 jsonObject.put("resultCode", 0);
                 jsonObject.put("message", "失败");
                 jsonObject.put("data", "新增失败");