报警推送假数据修改

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

@@ -55,7 +55,7 @@ public class MsgAlarmTemporary  implements Serializable {
     /**
      * 报警线路
      */
-    private String railwayCode;
+    private String alarmRailway;
 
     /**
      * 报警里程位置

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

@@ -108,8 +108,8 @@ public class MsgAlarmTemporaryController extends BaseController {
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<MsgAlarmTemporary> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-                if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
-                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+                if (!ObjectUtils.isEmpty(o.getAlarmRailway())) {
+                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getAlarmRailway());
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                 if (!StringUtils.isEmptySunhh(baseRailwayManagement) && !StringUtils.isEmptySunhh(baseRailwayManagement.getRailwayName())) {
@@ -166,7 +166,6 @@ public class MsgAlarmTemporaryController extends BaseController {
         MsgAlarmTemporary msgAlarmTemporary = msgAlarmTemporaryService.getById(id);
         ReqMsgAlarmVo reqMsgAlarmVo = new ReqMsgAlarmVo();
         com.ozs.common.utils.bean.BeanUtils.copyProperties(msgAlarmTemporary, reqMsgAlarmVo);
-        reqMsgAlarmVo.setAlarmRailway(msgAlarmTemporary.getRailwayCode());
         reqMsgAlarmVo.setAlarmTime(msgAlarmTemporary.getAlarmTime().getTime());
         Files files=new Files();
         files.setFileType(1);