报警列表修改

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

@@ -231,4 +231,15 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      * 解除视频URL
      */
     private String releasedUrl;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 来源名称
+     */
+    @TableField(exist = false)
+    private String sourceName;
 }

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

@@ -1,5 +1,6 @@
 package com.ozs.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -128,4 +129,14 @@ public class MsgAlarmResp implements Serializable {
      * 报警类型 字符串
      */
     private String alarmTypeName;
+
+    /**
+     * 来源
+     */
+    private String source;
+
+    /**
+     * 来源名称
+     */
+    private String sourceName;
 }

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

@@ -111,4 +111,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
+
+    /**
+     * 来源
+     */
+    private String source;
 }

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

@@ -51,7 +51,21 @@ public interface MonitorSystemService extends IService<MonitorSystem> {
      */
     public String checkSystemOnline(MonitorSystem monitorSystem);
 
+    /**
+     * 根据id查询
+     *
+     * @param id 监测系统id
+     * @return 结果
+     */
     MonitorSystem getMonitorSystem(Long id);
 
+    /**
+     * 分页
+     *
+     * @param monitorSystemVo 监测系统vo
+     * @return 结果
+     */
     IPage<MonitorSystemVo> pageList(MonitorSystemVo monitorSystemVo);
+
+    MonitorSystem selectByClientId(String clientId);
 }

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

@@ -165,4 +165,12 @@ public class MonitorSystemServiceImpl extends ServiceImpl<MonitorSystemMapper, M
         }
         return pageR;
     }
+
+    @Override
+    public MonitorSystem selectByClientId(String clientId) {
+        LambdaQueryWrapper<MonitorSystem> wrapper = new LambdaQueryWrapper<MonitorSystem>();
+        wrapper.eq(MonitorSystem::getClientId,clientId);
+        MonitorSystem monitorSystem = monitorSystemMapper.selectOne(wrapper);
+        return monitorSystem;
+    }
 }

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

@@ -239,6 +239,9 @@
             <if test="endAlarmTime != null and endAlarmTime != ''">
                 and TO_CHAR(alarm_time, 'YYYY-MM-DD HH24:MI:SS') &lt;= TO_CHAR(#{endAlarmTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="source != null and source != ''">
+                and source = #{source}
+            </if>
         </where>
         order by  alarm_time desc
     </select>

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

@@ -67,6 +67,8 @@ public class MsgAlarmController extends BaseController {
     private ISysDeptService deptService;
     @Autowired
     private ISysDictTypeService dictTypeService;
+    @Autowired
+    private MonitorSystemService monitorSystemService;
 
     /**
      * web更多消息-总数，已读数
@@ -173,6 +175,10 @@ public class MsgAlarmController extends BaseController {
 //                    }
                     o.setReleasedByName(o.getReleasedBy());
                 }
+                if(!ObjectUtils.isEmpty(o.getSource())){
+                    MonitorSystem monitorSystem = monitorSystemService.selectByClientId(o.getSource());
+                    o.setSourceName(monitorSystem.getMonitorSystemName());
+                }
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
                 o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");
@@ -303,6 +309,10 @@ public class MsgAlarmController extends BaseController {
                 if (sysDictData.getDictValue().equals(msgAlarm.getAlarmType().toString())) {
                     msgAlarmResp.setAlarmTypeName(sysDictData.getDictLabel());
                 }
+                if(!ObjectUtils.isEmpty(msgAlarm.getSource())){
+                    MonitorSystem monitorSystem = monitorSystemService.selectByClientId(msgAlarm.getSource());
+                    msgAlarmResp.setSourceName(monitorSystem.getMonitorSystemName());
+                }
             });
             return AjaxResult.success(msgAlarmResp);
         } else {

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

@@ -311,6 +311,8 @@ public class GeoHazardMonitorTokenController {
                 msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 log.info("时间++++get" + msgAlarm.getAlarmTime());
                 msgAlarm.setRailwayCode(reqMsgAlarmVo.getAlarmRailway());
+                String source = split[split.length - 2];
+                msgAlarm.setSource(source);
                 msgAlarmService.save(msgAlarm);
                 Files[] files1 = reqMsgAlarmVo.getFiles();
                 if (files1.length > 0) {