|
@@ -143,17 +143,14 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
|
|
|
BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
|
|
|
if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
|
|
|
baseCameraManagement = baseCameraManagementList.get(0);
|
|
|
+ o.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
+ String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
|
|
|
+ o.setAlarmMiles(mils);
|
|
|
+ String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
|
|
|
+ o.setEndMile(end);
|
|
|
+ String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
|
|
|
+ o.setBeginMile(begin);
|
|
|
}
|
|
|
- if (StringUtils.isEmptySunhh(baseCameraManagement)) {
|
|
|
-// return AjaxResult.error("里程位置:" + o.getAlarmMile() + ",不存在关联相机!");
|
|
|
- }
|
|
|
- o.setRailwayName(baseRailwayManagement.getRailwayName());
|
|
|
- String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
|
|
|
- o.setAlarmMiles(mils);
|
|
|
- String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
|
|
|
- o.setEndMile(end);
|
|
|
- String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
|
|
|
- o.setBeginMile(begin);
|
|
|
// o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
|
|
|
return o;
|
|
|
}).collect(Collectors.toList());
|