报警推送修改

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

@@ -63,11 +63,6 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
      */
     private Integer alarmMile;
 
-    /**
-     * 报警里程位置alarm_mile
-     */
-    private String alarmMiles;
-
     /**
      * 报警内容
      */

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

@@ -178,9 +178,8 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             lw.eq(BaseCameraManagement::getRailwayCode, msgAlarmVo.getRailwayCode());
         }
         if (!StringUtils.isEmptySunhh(msgAlarmVo.getAlarmMile())) {
-            int mile = AppendUtils.stringSplit(msgAlarmVo.getAlarmMiles());
-            lw.le(BaseCameraManagement::getBeginMile, mile);
-            lw.gt(BaseCameraManagement::getEndMile, mile);
+            lw.le(BaseCameraManagement::getBeginMile, msgAlarmVo.getAlarmMile());
+            lw.gt(BaseCameraManagement::getEndMile, msgAlarmVo.getAlarmMile());
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
         BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
@@ -204,6 +203,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         msgAlarmVo1.setRailwayCode(msgAlarm.getRailwayCode());
         msgAlarmVo1.setRailwayCodeName(baseRailwayManagement.getRailwayName());
         msgAlarmVo1.setAlarmMiles(AppendUtils.stringAppend(msgAlarmVo.getAlarmMile()));
+        msgAlarmVo1.setAlarmMile(msgAlarmVo.getAlarmMile());
         msgAlarmVo1.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
         msgAlarmVo1.setCameraCode(baseCameraManagement.getCameraCode());
         msgAlarmVo1.setElectricity(baseDeviceDynamicManagement.getElectricity());

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

@@ -428,10 +428,6 @@ public class MsgAlarmController extends BaseController {
         wrapper.eq("alarm_id", alarmId);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarmFrequency> list = msgAlarmFrequencyService.list(wrapper);
-        for (MsgAlarmFrequency msgAlarmFrequency : list) {
-            String mils = AppendUtils.stringAppend(msgAlarmFrequency.getAlarmMile());
-            msgAlarmFrequency.setAlarmMiles(mils);
-        }
         if (list.size() > 0) {
             if (one.getIsRelease() == 1) {
                 for (int i = 0; i < list.size(); i++) {