相机版本升级 条件修改

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

@@ -57,6 +57,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseRailwayManagementService baseRailwayManagementService;
     @Autowired
     private CameraLogDetailMapper cameraLogDetailMapper;
+    @Autowired
+    private CameraUpdateLogMapper cameraUpdateLogMapper;
 
     /**
      * 相机台账管理表导入
@@ -345,16 +347,24 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagement> baseCameraManagementList = new ArrayList<>();
         for (BaseCameraManagement baseCameraManagement1 : baseCameraManagements) {
             if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getVersionId())) {
-                LambdaQueryWrapper<CameraLogDetail> wrapperCameraLogDetail = new LambdaQueryWrapper<>();
-                if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getCameraCode())) {
-                    wrapperCameraLogDetail.eq(CameraLogDetail::getCameraCode, baseCameraManagement.getCameraCode());
-                }
-                wrapperCameraLogDetail.orderByDesc(CameraLogDetail::getUpdateTime);
-                List<CameraLogDetail> cameraLogDetails = cameraLogDetailMapper.selectList(wrapperCameraLogDetail);
-                CameraLogDetail cameraLogDetail = cameraLogDetails.get(0);
-                if (!StringUtils.isEmptySunhh(cameraLogDetail) && !StringUtils.isEmptySunhh(cameraLogDetail.getStatus())) {
-                    if ("3".equals(cameraLogDetail.getStatus())) {
-                        baseCameraManagementList.add(baseCameraManagement1);
+                LambdaQueryWrapper<CameraUpdateLog> wrapperCameraUpdateLog = new LambdaQueryWrapper<>();
+                wrapperCameraUpdateLog.eq(CameraUpdateLog::getVersionId, baseCameraManagement1.getVersionId());
+                CameraUpdateLog cameraUpdateLog = cameraUpdateLogMapper.selectOne(wrapperCameraUpdateLog);
+                if (!StringUtils.isEmptySunhh(cameraUpdateLog) && !StringUtils.isEmptySunhh(cameraUpdateLog.getId())) {
+                    LambdaQueryWrapper<CameraLogDetail> wrapperCameraLogDetail = new LambdaQueryWrapper<>();
+                    wrapperCameraLogDetail.eq(CameraLogDetail::getLogId, cameraUpdateLog.getId());
+                    if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getCameraCode())) {
+                        wrapperCameraLogDetail.eq(CameraLogDetail::getCameraCode, baseCameraManagement.getCameraCode());
+                    }
+                    wrapperCameraLogDetail.orderByDesc(CameraLogDetail::getUpdateTime);
+                    List<CameraLogDetail> cameraLogDetails = cameraLogDetailMapper.selectList(wrapperCameraLogDetail);
+                    if (!StringUtils.isEmptySunhh(cameraLogDetails) && cameraLogDetails.size() > 0) {
+                        CameraLogDetail cameraLogDetail = cameraLogDetails.get(0);
+                        if (!StringUtils.isEmptySunhh(cameraLogDetail) && !StringUtils.isEmptySunhh(cameraLogDetail.getStatus())) {
+                            if ("3".equals(cameraLogDetail.getStatus())) {
+                                baseCameraManagementList.add(baseCameraManagement1);
+                            }
+                        }
                     }
                 }
             } else {