lyhzzz 4 ماه پیش
والد
کامیت
80a69885e8

+ 1 - 1
src/main/java/com/fdkankan/mqcontroller/service/IMqCameraLevelService.java

@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMqCameraLevelService extends IService<MqCameraLevel> {
 
-    MqCameraLevel getByCameraId(Long cameraId);
+    MqCameraLevel getByCameraId(Long cameraId,String type);
 }

+ 2 - 1
src/main/java/com/fdkankan/mqcontroller/service/impl/MqCameraLevelServiceImpl.java

@@ -19,9 +19,10 @@ import org.springframework.stereotype.Service;
 public class MqCameraLevelServiceImpl extends ServiceImpl<IMqCameraLevelMapper, MqCameraLevel> implements IMqCameraLevelService {
 
     @Override
-    public MqCameraLevel getByCameraId(Long cameraId) {
+    public MqCameraLevel getByCameraId(Long cameraId,String type) {
         LambdaQueryWrapper<MqCameraLevel> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MqCameraLevel::getCameraId,cameraId);
+        wrapper.eq(MqCameraLevel::getType,type);
         return this.getOne(wrapper);
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/mqcontroller/service/impl/ScenePlusServiceImpl.java

@@ -48,7 +48,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         if(mqNumLevel != null){
             return mqNumLevel.getQueueConfigId();
         }
-        MqCameraLevel mqCameraLevel = mqCameraLevelService.getByCameraId(scenePlus.getCameraId());
+        MqCameraLevel mqCameraLevel = mqCameraLevelService.getByCameraId(scenePlus.getCameraId(),mqSendLog.getType());
         if(mqCameraLevel != null){
             return mqCameraLevel.getQueueConfigId();
         }