1

src/main/java/com/fdkankan/manage/controller/MqQueueConfigController.java

@@ -33,8 +33,8 @@ public class MqQueueConfigController {
     IMqQueueConfigService queueConfigService;
 
     @PostMapping("/allList")
-    public ResultData allList(){
-        return ResultData.ok(queueConfigService.getNormalConfig());
+    public ResultData allList(@RequestBody ModelingLevelParam param){
+        return ResultData.ok(queueConfigService.getNormalConfig(param.getType()));
     }
 
 
@@ -49,7 +49,7 @@ public class MqQueueConfigController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         if(StringUtils.isNotBlank(param.getNum())){
-            MqNumLevel byNum = mqNumLevelService.getByNum(param.getNum());
+            MqNumLevel byNum = mqNumLevelService.getByNum(param.getNum(),param.getType());
             if(byNum != null){
                 return ResultData.ok(queueConfigService.getById(byNum.getQueueConfigId()));
             }
@@ -60,7 +60,7 @@ public class MqQueueConfigController {
                 return ResultData.ok(queueConfigService.getById(byCameraId.getQueueConfigId()));
             }
         }
-        return ResultData.ok(queueConfigService.getDefaultConfig());
+        return ResultData.ok(queueConfigService.getDefaultConfig(param.getType()));
     }
 
     /**
@@ -83,9 +83,9 @@ public class MqQueueConfigController {
             }
         }
         if(StringUtils.isNotBlank(param.getNum())){
-            MqNumLevel mqNumLevel = mqNumLevelService.getByNum(param.getNum());
+            MqNumLevel mqNumLevel = mqNumLevelService.getByNum(param.getNum(),param.getType());
             if(mqNumLevel == null){
-                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId());
+                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId(),param.getType());
             }else {
                 mqNumLevelService.updateLevelById(mqNumLevel.getId(),param.getConfigId());
             }

src/main/java/com/fdkankan/manage/entity/MqCameraLevel.java

@@ -53,5 +53,6 @@ public class MqCameraLevel implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("type")
+    private String type;
 }

src/main/java/com/fdkankan/manage/entity/MqNumLevel.java

@@ -53,5 +53,6 @@ public class MqNumLevel implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-
+    @TableField("type")
+    private String type;
 }

src/main/java/com/fdkankan/manage/entity/MqQueueConfig.java

@@ -98,5 +98,6 @@ public class MqQueueConfig implements Serializable {
     @TableField("is_special")
     private Integer isSpecial;
 
-
+    @TableField("type")
+    private String type;
 }

src/main/java/com/fdkankan/manage/service/IMqNumLevelService.java

@@ -13,9 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMqNumLevelService extends IService<MqNumLevel> {
 
-    MqNumLevel getByNum(String num);
+    MqNumLevel getByNum(String num,String type);
 
-    void saveEntity(String num, Integer configId);
+    void saveEntity(String num, Integer configId,String type);
 
     void updateLevelById(Integer id, Integer configId);
 }

src/main/java/com/fdkankan/manage/service/IMqQueueConfigService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.MqQueueConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.ModelingLevelParam;
 
 import java.util.List;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface IMqQueueConfigService extends IService<MqQueueConfig> {
 
-    List<MqQueueConfig> getNormalConfig();
+    List<MqQueueConfig> getNormalConfig(String type);
 
-    MqQueueConfig getDefaultConfig();
+    MqQueueConfig getDefaultConfig(String type);
 }

src/main/java/com/fdkankan/manage/service/impl/MqNumLevelServiceImpl.java

@@ -21,17 +21,19 @@ import org.springframework.stereotype.Service;
 public class MqNumLevelServiceImpl extends ServiceImpl<IMqNumLevelMapper, MqNumLevel> implements IMqNumLevelService {
 
     @Override
-    public MqNumLevel getByNum(String num) {
+    public MqNumLevel getByNum(String num,String type) {
         LambdaQueryWrapper<MqNumLevel> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MqNumLevel::getNum,num);
+        wrapper.eq(MqNumLevel::getType,type);
         return this.getOne(wrapper);
     }
 
     @Override
-    public void saveEntity(String num, Integer configId) {
+    public void saveEntity(String num, Integer configId,String type) {
         MqNumLevel mqNumLevel = new MqNumLevel();
         mqNumLevel.setNum(num);
         mqNumLevel.setQueueConfigId(configId);
+        mqNumLevel.setType(type);
         this.save(mqNumLevel);
     }
 

src/main/java/com/fdkankan/manage/service/impl/MqQueueConfigServiceImpl.java

@@ -5,6 +5,7 @@ import com.fdkankan.manage.entity.MqQueueConfig;
 import com.fdkankan.manage.mapper.IMqQueueConfigMapper;
 import com.fdkankan.manage.service.IMqQueueConfigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.request.ModelingLevelParam;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,16 +22,18 @@ import java.util.List;
 public class MqQueueConfigServiceImpl extends ServiceImpl<IMqQueueConfigMapper, MqQueueConfig> implements IMqQueueConfigService {
 
     @Override
-    public List<MqQueueConfig> getNormalConfig() {
+    public List<MqQueueConfig> getNormalConfig(String type) {
         LambdaQueryWrapper<MqQueueConfig> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MqQueueConfig::getIsSpecial,0);
+        wrapper.eq(MqQueueConfig::getType,type);
         return this.list(wrapper);
     }
 
     @Override
-    public MqQueueConfig getDefaultConfig() {
+    public MqQueueConfig getDefaultConfig(String type) {
         LambdaQueryWrapper<MqQueueConfig> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MqQueueConfig::getIsDefault,1);
+        wrapper.eq(MqQueueConfig::getType,type);
         return this.getOne(wrapper);
     }
 }

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -242,9 +242,9 @@ public class TestController {
             }
         }
         if(StringUtils.isNotBlank(param.getNum())){
-            MqNumLevel mqNumLevel = mqNumLevelService.getByNum(param.getNum());
+            MqNumLevel mqNumLevel = mqNumLevelService.getByNum(param.getNum(),param.getType());
             if(mqNumLevel == null){
-                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId());
+                mqNumLevelService.saveEntity(param.getNum(),param.getConfigId(),param.getType());
             }else {
                 mqNumLevelService.updateLevelById(mqNumLevel.getId(),param.getConfigId());
             }

src/main/java/com/fdkankan/manage/vo/request/ModelingLevelParam.java

@@ -7,4 +7,5 @@ public class ModelingLevelParam {
     private Long cameraId;
     private String num;
     private Integer configId;
+    private String type ="4dkk";
 }