相机版本升级 条件修改

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

@@ -347,25 +347,37 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagement> baseCameraManagementList = new ArrayList<>();
         for (BaseCameraManagement baseCameraManagement1 : baseCameraManagements) {
             if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getVersionId())) {
-                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())) {
+                if (baseCameraManagement1.getVersionId().equals(baseCameraManagement.getVersionId())) {
+                    LambdaQueryWrapper<CameraUpdateLog> wrapperCameraUpdateLog = new LambdaQueryWrapper<>();
+                    wrapperCameraUpdateLog.eq(CameraUpdateLog::getVersionId, baseCameraManagement1.getVersionId());
+                    wrapperCameraUpdateLog.orderByDesc(CameraUpdateLog::getCreateTime);
+                    List<CameraUpdateLog> cameraUpdateLogs = cameraUpdateLogMapper.selectList(wrapperCameraUpdateLog);
+                    if (!StringUtils.isEmptySunhh(cameraUpdateLogs) && cameraUpdateLogs.size() > 0) {
+                        CameraUpdateLog cameraUpdateLog = cameraUpdateLogs.get(0);
+                        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, baseCameraManagement1.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 == cameraLogDetail.getStatus()) {
+                                        baseCameraManagementList.add(baseCameraManagement1);
+                                    }
+                                }
+                            } else {
                                 baseCameraManagementList.add(baseCameraManagement1);
                             }
                         }
+                    } else {
+                        baseCameraManagementList.add(baseCameraManagement1);
                     }
+                } else {
+                    baseCameraManagementList.add(baseCameraManagement1);
                 }
             } else {
                 baseCameraManagementList.add(baseCameraManagement1);