报警信息页面修改

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

@@ -249,4 +249,24 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private Integer failureToAlarm;
+
+    /**
+     *所属工务段名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 版本号
+     */
+    @Excel(name = "版本号")
+    @TableField(exist = false)
+    private String versionNum;
+
+    /**
+     * 版本名称
+     */
+    @Excel(name = "版本名称")
+    @TableField(exist = false)
+    private String versionName;
 }

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

@@ -94,5 +94,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      */
     private Integer releasedType;
 
+    private Integer railwayType;
+
     private List<Long> ids;
 }

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

@@ -430,6 +430,9 @@
             <if test="alarmType != null and alarmType != 0">
                 and a.alarm_type=#{alarmType}
             </if>
+            <if test="railwayType != null and railwayType != 0">
+                and l.railway_type=#{railwayType}
+            </if>
             <if test="alarmMile != null and alarmMile != 0">
                 and a.alarm_mile=#{alarmMile}
             </if>

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

@@ -250,12 +250,16 @@ public class MsgAlarmController extends BaseController {
                     cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
                 }
                 BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
+                o.setVersionNum(cameraManagement.getVersionNum());
+                o.setVersionName(cameraManagement.getVersionName());
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                 if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
                     queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                SysDept sysDept = deptService.selectDeptById(cameraManagement.getDeptId());
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
+                o.setDeptName(sysDept.getDeptName());
                 if (StringUtils.isNotEmpty(o.getReleasedBy())) {
                     BaseUser user = baseUserService.getUser(o.getReleasedBy());
                     o.setReleasedByName(user.getNickName());