代码优化

src/main/java/com/shcd/boat/service/impl/ShorePowerServiceImpl.java

@@ -124,7 +124,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                 List<AisShoreLine> aisShoreLineList = analysisAisPoint();
                 if (CollectionUtils.isEmpty(aisShoreLineList)){
                     log.info("无ais点位与岸线坐标数据");
-                    return;
                 }
 //                List<String> shoreLineIds = aisShoreLineList.stream().map(AisShoreLine::getShoreLineId).collect(Collectors.toList());
                 log.info("一秒前靠泊的船舶与对应岸线：{}", aisShoreLineList);
@@ -133,7 +132,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                 //获得视频id，通过id获得视频点位code
                 if (CollectionUtils.isEmpty(hkShoreLineList)) {
                     log.info("无海康视频与岸线坐标数据");
-                    return;
                 }
                 Date startTime = new Date();
                 Thread.sleep(1000);
@@ -142,7 +140,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                 List<AisShoreLine> aisShoreLineListNew = analysisAisPoint();
                 if (CollectionUtils.isEmpty(aisShoreLineListNew) ){
                     log.info("无一秒后中远ais点位信息");
-                    return;
                 }
                 log.info("一秒后靠泊的船舶与对应岸线：{}", aisShoreLineListNew);
                 aisShoreLineListNew.forEach(i -> {
@@ -217,7 +214,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                             List<ShorePowerFile> shorePowerFileList = haiKangService.doInPicture(cameraIndexCodes);
                             if (CollectionUtils.isEmpty(shorePowerFileList)){
                                 log.info("进港无截图");
-                                return;
                             }
                             LambdaQueryWrapper<ShorePowerFile> cargoDeclareLambdaQueryWrapper = new LambdaQueryWrapper<>();
                             cargoDeclareLambdaQueryWrapper.eq(ShorePowerFile::getCameraIndexCode, cameraIndexCodes.get(0));
@@ -283,10 +279,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                 }
                 if (CollectionUtils.isEmpty(declareList)){
                     log.info("无ais的船与货物装卸申报的船未匹配");
-                    return;
-                }
-                if (CollectionUtils.isEmpty(declareIds)){
-                    return;
                 }
                 //无ais获取货物装卸申报的开工时间和完工提交时间
                 List<String> finalDeclareIds = declareIds;
@@ -308,7 +300,6 @@ public class ShorePowerServiceImpl implements ShorePowerService {
             }
         } catch (Exception e) {
             log.info(e.getMessage());
-            return;
         }
     }