Browse Source

web更多消息接口修改

gao.qiang 1 year ago
parent
commit
f83c3bdb3f

+ 7 - 10
business-service/src/main/java/com/ozs/service/impl/MsgWebPushServiceImpl.java

@@ -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());