bug

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

@@ -181,7 +181,12 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             lw.le(BaseCameraManagement::getBeginMile, msgAlarmVo.getAlarmMile());
             lw.gt(BaseCameraManagement::getEndMile, msgAlarmVo.getAlarmMile());
         }
-        BaseCameraManagement baseCameraManagement = baseCameraManagementMapper.selectOne(lw);
+        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
+        BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
+        if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+            baseCameraManagement = baseCameraManagementList.get(0);
+        }
+//        BaseCameraManagement baseCameraManagement = baseCameraManagementMapper.selectOne(lw);
         if (StringUtils.isEmptySunhh(baseCameraManagement)) {
             return AjaxResult.error("线路编码：" + msgAlarmVo.getRailwayCode() + "不存在对应里程范围为："+ msgAlarmVo.getAlarmMile() +"的相机！");
         }

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

@@ -56,12 +56,7 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         List<MsgAlarm> webAlarm = msgWebPushMapper.webAlarm(userId);
         if (!StringUtils.isEmpty(webAlarm) && webAlarm.size() > 0) {
             for (MsgAlarm msgAlarm : webAlarm) {
-//                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-//                if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
-//                    lw.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
-//                }
-//                BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
-                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<>();
                 if (!ObjectUtils.isEmpty(msgAlarm.getRailwayCode())) {
                     wrapper.eq(BaseRailwayManagement::getRailwayCode, msgAlarm.getRailwayCode());
                 }
@@ -121,25 +116,39 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
 //                String[] split = o.getImageUrl().split(";");
 //                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
 //                o.setImageUrls(objects);
-//                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-//                if (!ObjectUtils.isEmpty(o.getCameraCode())) {
-//                    cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
-//                }
-//                BaseCameraManagement cameraManagement = baseCameraManagementService.getOne(cameraManagementLambdaQueryWrapper);
-//                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
-//                if (!ObjectUtils.isEmpty(cameraManagement.getRailwayCode())) {
-//                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, cameraManagement.getRailwayCode());
-//                }
-//                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
-//
-//                o.setRailwayName(baseRailwayManagement.getRailwayName());
-//                String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
-//                o.setAlarmMiles(mils);
-//                String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
-//                o.setEndMile(end);
-//                String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
-//                o.setBeginMile(begin);
-//                // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
+                LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<>();
+                if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
+                    wrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
+                if (StringUtils.isEmptySunhh(baseRailwayManagement)) {
+//                    return AjaxResult.error("线路编码：" + o.getRailwayCode() + "不存在！");
+                }
+                // 查询里程位置最近的相机
+                LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<>();
+                if (!StringUtils.isEmptySunhh(o.getRailwayCode())) {
+                    lw.eq(BaseCameraManagement::getRailwayCode, o.getRailwayCode());
+                }
+                if (!StringUtils.isEmptySunhh(o.getAlarmMile())) {
+                    lw.le(BaseCameraManagement::getBeginMile, o.getAlarmMile());
+                    lw.gt(BaseCameraManagement::getEndMile, o.getAlarmMile());
+                }
+                List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.list(lw);
+                BaseCameraManagement baseCameraManagement = new BaseCameraManagement();
+                if (!StringUtils.isEmptySunhh(baseCameraManagementList) && baseCameraManagementList.size() > 0) {
+                    baseCameraManagement = baseCameraManagementList.get(0);
+                }
+                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());
             pageR.setRecords(dto1);