优化场景列表查询

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

@@ -235,13 +235,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getCompanyId() != null){
             List<CameraDetail> details = cameraDetailService.getListByCompanyId(param.getCompanyId());
             List<Long> cameraIds = details.stream().map(CameraDetail::getCameraId).collect(Collectors.toList());
-            if(param.getCameraIds() == null || param.getCameraIds().size() <=0 ){
+            if(param.getCameraIds() == null || param.getCameraIds().isEmpty()){
                 param.setCameraIds(cameraIds);
             }else {
                 List<Long> intersection = cameraIds.stream().filter(param.getCameraIds()::contains).collect(Collectors.toList());
                 param.setCameraIds(intersection);
             }
         }
+        if(param.getCameraIds() != null || param.getUserIds() != null){
+            param.setNum("empty");
+        }
 
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<SceneVo> records = page.getRecords();

src/main/resources/bootstrap-dev.yml

@@ -32,10 +32,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: sa-token-config.yaml
             group: DEFAULT_GROUP
             refresh: true
@@ -43,14 +39,6 @@ spring:
           - data-id: elasticsearch-config.yaml
             group: DEFAULT_GROUP
             refresh: true
-
-          - data-id: common-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: elasticsearch-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}