瀏覽代碼

场景分配队里

lyhzzz 1 年之前
父節點
當前提交
6c2c3671b4
共有 24 個文件被更改,包括 576 次插入12 次删除
  1. 21 0
      src/main/java/com/fdkankan/mqcontroller/controller/ScenePlusController.java
  2. 57 0
      src/main/java/com/fdkankan/mqcontroller/entity/MqCameraLevel.java
  3. 57 0
      src/main/java/com/fdkankan/mqcontroller/entity/MqNumLevel.java
  4. 3 0
      src/main/java/com/fdkankan/mqcontroller/entity/MqQueueConfig.java
  5. 7 0
      src/main/java/com/fdkankan/mqcontroller/entity/MqSendLog.java
  6. 123 0
      src/main/java/com/fdkankan/mqcontroller/entity/ScenePlus.java
  7. 1 1
      src/main/java/com/fdkankan/mqcontroller/generate/AutoGenerate.java
  8. 18 0
      src/main/java/com/fdkankan/mqcontroller/mapper/IMqCameraLevelMapper.java
  9. 18 0
      src/main/java/com/fdkankan/mqcontroller/mapper/IMqNumLevelMapper.java
  10. 18 0
      src/main/java/com/fdkankan/mqcontroller/mapper/IScenePlusMapper.java
  11. 17 0
      src/main/java/com/fdkankan/mqcontroller/service/IMqCameraLevelService.java
  12. 17 0
      src/main/java/com/fdkankan/mqcontroller/service/IMqNumLevelService.java
  13. 4 0
      src/main/java/com/fdkankan/mqcontroller/service/IMqQueueConfigService.java
  14. 2 0
      src/main/java/com/fdkankan/mqcontroller/service/IMqSendLogService.java
  15. 20 0
      src/main/java/com/fdkankan/mqcontroller/service/IScenePlusService.java
  16. 27 0
      src/main/java/com/fdkankan/mqcontroller/service/impl/MqCameraLevelServiceImpl.java
  17. 27 0
      src/main/java/com/fdkankan/mqcontroller/service/impl/MqNumLevelServiceImpl.java
  18. 15 0
      src/main/java/com/fdkankan/mqcontroller/service/impl/MqQueueConfigServiceImpl.java
  19. 14 0
      src/main/java/com/fdkankan/mqcontroller/service/impl/MqSendLogServiceImpl.java
  20. 69 0
      src/main/java/com/fdkankan/mqcontroller/service/impl/ScenePlusServiceImpl.java
  21. 26 11
      src/main/java/com/fdkankan/mqcontroller/task/TaskService.java
  22. 5 0
      src/main/resources/mapper/mqcontroller/MqCameraLevelMapper.xml
  23. 5 0
      src/main/resources/mapper/mqcontroller/MqNumLevelMapper.xml
  24. 5 0
      src/main/resources/mapper/mqcontroller/ScenePlusMapper.xml

+ 21 - 0
src/main/java/com/fdkankan/mqcontroller/controller/ScenePlusController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.mqcontroller.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 场景主表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@RestController
+@RequestMapping("/mqcontroller/scenePlus")
+public class ScenePlusController {
+
+}
+

+ 57 - 0
src/main/java/com/fdkankan/mqcontroller/entity/MqCameraLevel.java

@@ -0,0 +1,57 @@
+package com.fdkankan.mqcontroller.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+@TableName("mq_camera_level")
+public class MqCameraLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计算优先级设置
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 相机id
+     */
+    @TableField("camera_id")
+    private Integer cameraId;
+
+    /**
+     * 计算优先级队列id
+     */
+    @TableField("queue_config_id")
+    private Integer queueConfigId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 57 - 0
src/main/java/com/fdkankan/mqcontroller/entity/MqNumLevel.java

@@ -0,0 +1,57 @@
+package com.fdkankan.mqcontroller.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+@TableName("mq_num_level")
+public class MqNumLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计算优先级设置
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 计算优先级队列id
+     */
+    @TableField("queue_config_id")
+    private Integer queueConfigId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 3 - 0
src/main/java/com/fdkankan/mqcontroller/entity/MqQueueConfig.java

@@ -75,5 +75,8 @@ public class MqQueueConfig implements Serializable {
     @TableField("update_time")
     @TableField("update_time")
     private Date updateTime;
     private Date updateTime;
 
 
+    @TableField("level")
+    private String level;
+
 
 
 }
 }

+ 7 - 0
src/main/java/com/fdkankan/mqcontroller/entity/MqSendLog.java

@@ -55,5 +55,12 @@ public class MqSendLog implements Serializable {
     @TableField("update_time")
     @TableField("update_time")
     private Date updateTime;
     private Date updateTime;
 
 
+    /**
+     * 计算顺序
+     */
+    @TableField("sort")
+    private Integer sort;
 
 
+    @TableField(exist = false)
+    private Integer configId;
 }
 }

+ 123 - 0
src/main/java/com/fdkankan/mqcontroller/entity/ScenePlus.java

@@ -0,0 +1,123 @@
+package com.fdkankan.mqcontroller.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景主表
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Getter
+@Setter
+@TableName("t_scene_plus")
+public class ScenePlus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 相机id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 手机id
+     */
+    @TableField("phone_id")
+    private String phoneId;
+
+    /**
+     * 场景名称
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 场景描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 场景状态:0-未建好,1--已建好,-1-计算出错,-2--不在官网显示
+     */
+    @TableField("scene_status")
+    private Integer sceneStatus;
+
+    /**
+     * 场景来源:相机拍摄10以内表示,1表示八目,2双目,3转台,4 激光  其他来源10以上,11:一键换装,12:123看房,13文通虚拟场景
+     */
+    @TableField("scene_source")
+    private Integer sceneSource;
+
+    /**
+     * 支付状态:0表示未付款,1表示付款了,-1表示欠费,-2表示容量不足
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 场景类型  0-其他,1-文博,2-地产,3-电商,4-餐饮,5-家居,99-一件换装虚拟房源
+     */
+    @TableField("scene_type")
+    private Integer sceneType;
+
+    /**
+     * 是否推荐:0-否,1-是
+     */
+    @TableField("recommend")
+    private Integer recommend;
+
+    /**
+     * 是否有housetype文件(0-否,1-是)
+     */
+    @TableField("house_type")
+    private Integer houseType;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * A-有效,I-无效
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

+ 1 - 1
src/main/java/com/fdkankan/mqcontroller/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
         String path =System.getProperty("user.dir");
 
 
         generate(path,"mqcontroller", getTables(new String[]{
         generate(path,"mqcontroller", getTables(new String[]{
-                "mq_ecs"
+                "t_scene_plus",
         }));
         }));
 
 
 //        generate(path,"goods", getTables(new String[]{
 //        generate(path,"goods", getTables(new String[]{

+ 18 - 0
src/main/java/com/fdkankan/mqcontroller/mapper/IMqCameraLevelMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.mqcontroller.mapper;
+
+import com.fdkankan.mqcontroller.entity.MqCameraLevel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Mapper
+public interface IMqCameraLevelMapper extends BaseMapper<MqCameraLevel> {
+
+}

+ 18 - 0
src/main/java/com/fdkankan/mqcontroller/mapper/IMqNumLevelMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.mqcontroller.mapper;
+
+import com.fdkankan.mqcontroller.entity.MqNumLevel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Mapper
+public interface IMqNumLevelMapper extends BaseMapper<MqNumLevel> {
+
+}

+ 18 - 0
src/main/java/com/fdkankan/mqcontroller/mapper/IScenePlusMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.mqcontroller.mapper;
+
+import com.fdkankan.mqcontroller.entity.ScenePlus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景主表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Mapper
+public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fdkankan.mqcontroller.service;
+
+import com.fdkankan.mqcontroller.entity.MqCameraLevel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+public interface IMqCameraLevelService extends IService<MqCameraLevel> {
+
+    MqCameraLevel getByCameraId(Long cameraId);
+}

+ 17 - 0
src/main/java/com/fdkankan/mqcontroller/service/IMqNumLevelService.java

@@ -0,0 +1,17 @@
+package com.fdkankan.mqcontroller.service;
+
+import com.fdkankan.mqcontroller.entity.MqNumLevel;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+public interface IMqNumLevelService extends IService<MqNumLevel> {
+
+    MqNumLevel getByNum(String num);
+}

+ 4 - 0
src/main/java/com/fdkankan/mqcontroller/service/IMqQueueConfigService.java

@@ -16,4 +16,8 @@ import java.util.HashMap;
 public interface IMqQueueConfigService extends IService<MqQueueConfig> {
 public interface IMqQueueConfigService extends IService<MqQueueConfig> {
 
 
     HashMap<String, MqQueueConfig> getQueueMap();
     HashMap<String, MqQueueConfig> getQueueMap();
+
+    MqQueueConfig getDfConfig();
+
+    MqQueueConfig getDfConfig128();
 }
 }

+ 2 - 0
src/main/java/com/fdkankan/mqcontroller/service/IMqSendLogService.java

@@ -18,4 +18,6 @@ public interface IMqSendLogService extends IService<MqSendLog> {
     List<MqSendLog> getNoSendMsg();
     List<MqSendLog> getNoSendMsg();
 
 
     List<MqSendLog> getNoSendMsgByQueueName(String key);
     List<MqSendLog> getNoSendMsgByQueueName(String key);
+
+    void updateStatus(Integer id, Integer status,String queueName);
 }
 }

+ 20 - 0
src/main/java/com/fdkankan/mqcontroller/service/IScenePlusService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.mqcontroller.service;
+
+import com.fdkankan.mqcontroller.entity.MqSendLog;
+import com.fdkankan.mqcontroller.entity.ScenePlus;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景主表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+public interface IScenePlusService extends IService<ScenePlus> {
+
+    Integer getQueueConfig(MqSendLog mqSendLog);
+
+    ScenePlus getByNum(String num);
+}

+ 27 - 0
src/main/java/com/fdkankan/mqcontroller/service/impl/MqCameraLevelServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.mqcontroller.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.mqcontroller.entity.MqCameraLevel;
+import com.fdkankan.mqcontroller.mapper.IMqCameraLevelMapper;
+import com.fdkankan.mqcontroller.service.IMqCameraLevelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Service
+public class MqCameraLevelServiceImpl extends ServiceImpl<IMqCameraLevelMapper, MqCameraLevel> implements IMqCameraLevelService {
+
+    @Override
+    public MqCameraLevel getByCameraId(Long cameraId) {
+        LambdaQueryWrapper<MqCameraLevel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqCameraLevel::getCameraId,cameraId);
+        return this.getOne(wrapper);
+    }
+}

+ 27 - 0
src/main/java/com/fdkankan/mqcontroller/service/impl/MqNumLevelServiceImpl.java

@@ -0,0 +1,27 @@
+package com.fdkankan.mqcontroller.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.mqcontroller.entity.MqNumLevel;
+import com.fdkankan.mqcontroller.mapper.IMqNumLevelMapper;
+import com.fdkankan.mqcontroller.service.IMqNumLevelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Service
+public class MqNumLevelServiceImpl extends ServiceImpl<IMqNumLevelMapper, MqNumLevel> implements IMqNumLevelService {
+
+    @Override
+    public MqNumLevel getByNum(String num) {
+        LambdaQueryWrapper<MqNumLevel> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqNumLevel::getNum,num);
+        return this.getOne(wrapper);
+    }
+}

+ 15 - 0
src/main/java/com/fdkankan/mqcontroller/service/impl/MqQueueConfigServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.mqcontroller.service.impl;
 package com.fdkankan.mqcontroller.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.mqcontroller.entity.MqQueueConfig;
 import com.fdkankan.mqcontroller.entity.MqQueueConfig;
 import com.fdkankan.mqcontroller.mapper.IMqQueueConfigMapper;
 import com.fdkankan.mqcontroller.mapper.IMqQueueConfigMapper;
 import com.fdkankan.mqcontroller.service.IMqQueueConfigService;
 import com.fdkankan.mqcontroller.service.IMqQueueConfigService;
@@ -27,4 +28,18 @@ public class MqQueueConfigServiceImpl extends ServiceImpl<IMqQueueConfigMapper,
         queueConfigList.forEach(e -> map.put(e.getQueueName(),e));
         queueConfigList.forEach(e -> map.put(e.getQueueName(),e));
         return map;
         return map;
     }
     }
+
+    @Override
+    public MqQueueConfig getDfConfig() {
+        LambdaQueryWrapper<MqQueueConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqQueueConfig::getLevel,"A");
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public MqQueueConfig getDfConfig128() {
+        LambdaQueryWrapper<MqQueueConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(MqQueueConfig::getLevel,"D");
+        return this.getOne(wrapper);
+    }
 }
 }

+ 14 - 0
src/main/java/com/fdkankan/mqcontroller/service/impl/MqSendLogServiceImpl.java

@@ -1,10 +1,12 @@
 package com.fdkankan.mqcontroller.service.impl;
 package com.fdkankan.mqcontroller.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.mqcontroller.entity.MqSendLog;
 import com.fdkankan.mqcontroller.entity.MqSendLog;
 import com.fdkankan.mqcontroller.mapper.IMqSendLogMapper;
 import com.fdkankan.mqcontroller.mapper.IMqSendLogMapper;
 import com.fdkankan.mqcontroller.service.IMqSendLogService;
 import com.fdkankan.mqcontroller.service.IMqSendLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
@@ -24,6 +26,7 @@ public class MqSendLogServiceImpl extends ServiceImpl<IMqSendLogMapper, MqSendLo
     public List<MqSendLog> getNoSendMsg() {
     public List<MqSendLog> getNoSendMsg() {
         LambdaQueryWrapper<MqSendLog> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MqSendLog> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MqSendLog::getStatus,0);
         wrapper.eq(MqSendLog::getStatus,0);
+        wrapper.orderByAsc(MqSendLog::getSort);
         wrapper.orderByAsc(MqSendLog::getId);
         wrapper.orderByAsc(MqSendLog::getId);
         return this.list(wrapper);
         return this.list(wrapper);
     }
     }
@@ -36,4 +39,15 @@ public class MqSendLogServiceImpl extends ServiceImpl<IMqSendLogMapper, MqSendLo
         wrapper.orderByAsc(MqSendLog::getId);
         wrapper.orderByAsc(MqSendLog::getId);
         return this.list(wrapper);
         return this.list(wrapper);
     }
     }
+
+    @Override
+    public void updateStatus(Integer id, Integer status,String queueName) {
+        LambdaUpdateWrapper<MqSendLog> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(MqSendLog::getId,id);
+        wrapper.set(MqSendLog::getStatus,status);
+        if(StringUtils.isNotBlank(queueName)){
+            wrapper.set(MqSendLog::getQueue,queueName);
+        }
+        this.update(wrapper);
+    }
 }
 }

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

@@ -0,0 +1,69 @@
+package com.fdkankan.mqcontroller.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.mqcontroller.entity.*;
+import com.fdkankan.mqcontroller.mapper.IScenePlusMapper;
+import com.fdkankan.mqcontroller.service.IMqCameraLevelService;
+import com.fdkankan.mqcontroller.service.IMqNumLevelService;
+import com.fdkankan.mqcontroller.service.IMqQueueConfigService;
+import com.fdkankan.mqcontroller.service.IScenePlusService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景主表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-04-08
+ */
+@Service
+public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlus> implements IScenePlusService {
+
+    @Autowired
+    IMqCameraLevelService mqCameraLevelService;
+    @Autowired
+    IMqNumLevelService mqNumLevelService;
+    @Autowired
+    IMqQueueConfigService queueConfigService;
+    @Override
+    public Integer getQueueConfig(MqSendLog mqSendLog) {
+        String num = mqSendLog.getNum();
+        ScenePlus scenePlus = this.getByNum(num);
+        if(scenePlus == null){
+            return null;
+        }
+        JSONObject jsonObject = JSONObject.parseObject(mqSendLog.getContent());
+        JSONObject jsonObject2  = jsonObject.getJSONObject("ext");
+        if(jsonObject2.containsKey("128G") && jsonObject2.getInteger("128G") == 1){
+            MqQueueConfig dfConfig = queueConfigService.getDfConfig128();
+            if(dfConfig != null){
+                return dfConfig.getId();
+            }
+        }
+
+        MqNumLevel mqNumLevel = mqNumLevelService.getByNum(num);
+        if(mqNumLevel != null){
+            return mqNumLevel.getQueueConfigId();
+        }
+        MqCameraLevel mqCameraLevel = mqCameraLevelService.getByCameraId(scenePlus.getCameraId());
+        if(mqCameraLevel != null){
+            return mqCameraLevel.getQueueConfigId();
+        }
+        MqQueueConfig dfConfig = queueConfigService.getDfConfig();
+        if(dfConfig != null){
+            return dfConfig.getId();
+        }
+        return null;
+    }
+
+    @Override
+    public ScenePlus getByNum(String num) {
+        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ScenePlus::getNum,num);
+        return this.getOne(wrapper);
+    }
+}

+ 26 - 11
src/main/java/com/fdkankan/mqcontroller/task/TaskService.java

@@ -3,11 +3,9 @@ package com.fdkankan.mqcontroller.task;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.log.Log;
 import cn.hutool.log.Log;
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.mqcontroller.entity.*;
 import com.fdkankan.mqcontroller.entity.*;
-import com.fdkankan.mqcontroller.service.IMqEcsService;
-import com.fdkankan.mqcontroller.service.IMqQueueConfigService;
-import com.fdkankan.mqcontroller.service.IMqScalingConfigService;
-import com.fdkankan.mqcontroller.service.IMqSendLogService;
+import com.fdkankan.mqcontroller.service.*;
 import com.fdkankan.mqcontroller.utils.ECSUtils;
 import com.fdkankan.mqcontroller.utils.ECSUtils;
 import com.fdkankan.mqcontroller.utils.RabbitMqUtils;
 import com.fdkankan.mqcontroller.utils.RabbitMqUtils;
 import com.fdkankan.mqcontroller.utils.RedisKey;
 import com.fdkankan.mqcontroller.utils.RedisKey;
@@ -43,6 +41,8 @@ public class TaskService {
     IMqEcsService mqEcsService;
     IMqEcsService mqEcsService;
     @Autowired
     @Autowired
     RedisUtil redisUtil;
     RedisUtil redisUtil;
+    @Autowired
+    IScenePlusService scenePlusService;
 
 
     public static Integer checkOpenCount = 0;
     public static Integer checkOpenCount = 0;
 
 
@@ -58,9 +58,26 @@ public class TaskService {
             return;
             return;
         }
         }
         log.info("未分配的mq队列数:{}",mqSendLogs.size());
         log.info("未分配的mq队列数:{}",mqSendLogs.size());
+
+        //设置分配队列
+        HashSet<String> numList  = new HashSet<>();
+        for (MqSendLog mqSendLog : mqSendLogs) {
+            Integer configId = scenePlusService.getQueueConfig(mqSendLog);
+            if(numList.contains(mqSendLog.getNum())){
+                mqSendLogService.updateStatus(mqSendLog.getId(),2,null);
+                continue;
+            }
+            if(configId == null ){
+                mqSendLogService.updateStatus(mqSendLog.getId(),3,null);
+                continue;
+            }
+            mqSendLog.setConfigId(configId);
+            numList.add(mqSendLog.getNum());
+        }
+
         List<MqQueueConfig> queueConfigList = queueConfigService.list();
         List<MqQueueConfig> queueConfigList = queueConfigService.list();
         for (MqQueueConfig mqQueueConfig : queueConfigList) {
         for (MqQueueConfig mqQueueConfig : queueConfigList) {
-            List<MqSendLog> msgList = mqSendLogs.stream().filter(e -> e.getQueue().equals(mqQueueConfig.getQueueName())).collect(Collectors.toList());
+            List<MqSendLog> msgList = mqSendLogs.stream().filter(e -> e.getConfigId().equals(mqQueueConfig.getId())).collect(Collectors.toList());
             if(msgList.isEmpty()){
             if(msgList.isEmpty()){
                 continue;
                 continue;
             }
             }
@@ -77,7 +94,7 @@ public class TaskService {
             if(mqQueueConfig.getOpenScaling() == 1){    //开启弹性伸缩
             if(mqQueueConfig.getOpenScaling() == 1){    //开启弹性伸缩
                 checkOpenEcs(mqQueueConfig,msgList.size(),mqMsg.getMessages_ready());
                 checkOpenEcs(mqQueueConfig,msgList.size(),mqMsg.getMessages_ready());
             }
             }
-            sendRabbitMq(msgList,mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged() - mqMsg.getMessages_ready());
+            sendRabbitMq(msgList,mqMsg.getConsumers() - mqMsg.getMessages_unacknowledged() - mqMsg.getMessages_ready(),mqQueueConfig.getQueueName());
         }
         }
 
 
     }
     }
@@ -89,16 +106,14 @@ public class TaskService {
         checkOpenCount ++;
         checkOpenCount ++;
     }
     }
 
 
-    private void sendRabbitMq(List<MqSendLog> msgList, Integer msgCount) {
+    private void sendRabbitMq(List<MqSendLog> msgList, Integer msgCount,String queueName) {
         for (int i = 0;i < msgCount ;i++){
         for (int i = 0;i < msgCount ;i++){
             if(i > msgList.size() -1){
             if(i > msgList.size() -1){
                 continue;
                 continue;
             }
             }
             MqSendLog mqSendLog = msgList.get(i);
             MqSendLog mqSendLog = msgList.get(i);
-            mqSendLog.setStatus(1);
-            mqSendLog.setUpdateTime(null);
-            mqSendLogService.updateById(mqSendLog);
-            rabbitMqProducer.sendByWorkQueue(mqSendLog.getQueue(),mqSendLog.getContent());
+            mqSendLogService.updateStatus(mqSendLog.getId(),1,queueName);
+            rabbitMqProducer.sendByWorkQueue(queueName,mqSendLog.getContent());
         }
         }
     }
     }
 
 

+ 5 - 0
src/main/resources/mapper/mqcontroller/MqCameraLevelMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.mqcontroller.mapper.IMqCameraLevelMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/mqcontroller/MqNumLevelMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.mqcontroller.mapper.IMqNumLevelMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/mqcontroller/ScenePlusMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.mqcontroller.mapper.IScenePlusMapper">
+
+</mapper>