mq测试

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,17 +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<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())) {
+                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);

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

@@ -176,7 +176,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             }
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
-        new SubscribeClient("update", "update_34020000001320000188").start();
+        new SubscribeClient("update", "update").start();
         return AjaxResult.success("已经为您提交升级申请，请您到“日志管理>相机升级日志”页面查看升级结果。");
     }
 }