소스 검색

报警推送假数据修改

gao.qiang 1 년 전
부모
커밋
87438be1dc

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

@@ -356,10 +356,10 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setAlarmMile(mile);
             if (StringUtils.isNotEmpty(msgAlarm.getAlarmAttr())) {
                 String[] split1 = msgAlarm.getAlarmAttr().split(",");
-                String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
-                        "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
-                        "大小" + split1[4] + "×" + split1[5];
-                msgAlarmResp.setAlarmAttrName(stringBuilder);
+//                String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+//                        "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+//                        "大小" + split1[4] + "×" + split1[5];
+                msgAlarmResp.setAlarmAttrName(msgAlarm.getAlarmAttr());
             }
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
             msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵线" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));

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

@@ -283,7 +283,7 @@ public class MsgAlarmTemporaryController extends BaseController {
             msgAlarm.setUpdateBy(admin.getUserId());
             msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
             msgAlarm.setRailwayCode(reqMsgAlarmVo.getAlarmRailway());
-            msgAlarm.setSource("09061114");
+            msgAlarm.setSource(msgAlarmTemporary.getSource());
             msgAlarmService.save(msgAlarm);
             Files[] files1 = reqMsgAlarmVo.getFiles();
             if (files1.length > 0) {