mq测试

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

@@ -14,12 +14,8 @@ import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVos;
-import com.ozs.service.mapper.BaseCameraManagementMapper;
+import com.ozs.service.mapper.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.service.mapper.BaseDeptMapper;
-import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
-import com.ozs.service.mapper.BaseUserMapper;
-import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.BaseUserService;
@@ -59,6 +55,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseDeptMapper baseDeptMapper;
     @Autowired
     private BaseRailwayManagementService baseRailwayManagementService;
+    @Autowired
+    private CameraLogDetailMapper cameraLogDetailMapper;
 
     /**
      * 相机台账管理表导入
@@ -336,13 +334,33 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
-        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
-//            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-            wrapper.and((wp) -> {
-                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-            });
-        }
+//        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+////            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+//            // 判断
+//            wrapper.and((wp) -> {
+//                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+//            });
+//        }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
-        return baseCameraManagements;
+        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);
+                    }
+                }
+            } else {
+                baseCameraManagementList.add(baseCameraManagement1);
+            }
+        }
+        return baseCameraManagementList;
     }
 }

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").start();
+        new SubscribeClient("update", "update_34020000001320000188").start();
         return AjaxResult.success("已经为您提交升级申请，请您到“日志管理>相机升级日志”页面查看升级结果。");
     }
 }