Merge branch 'fusion-v1.4.0' into test

src/main/java/com/fdkankan/ucenter/controller/ArticleController.java

@@ -29,15 +29,17 @@ public class ArticleController extends BaseController {
 
     @Autowired
     ICaseService caseService;
+    @Autowired
+    IArticleService articleService;
     /**
      * 行业解决方案-案例展示
      */
     @PostMapping("/detail")
-    public Result detail(@RequestBody Case caseEntity) throws Exception {
+    public Result detail(@RequestBody Article caseEntity) throws Exception {
         if(ObjectUtils.isEmpty(caseEntity.getId())){
             return Result.success();
         }
-        return Result.success(caseService.getById(caseEntity.getId()));
+        return Result.success(articleService.getById(caseEntity.getId()));
     }
 
     @PostMapping("/allList")

src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -51,4 +51,6 @@ public interface ICameraService extends IService<Camera> {
     List<Camera> getAllList(String childName,String token);
 
     List<Camera> findLikeChildName(String searchKey);
+
+    List<Camera> getBySnCodes(List<String> snCodes);
 }

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -469,4 +469,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         wrapper.like(Camera::getSnCode,searchKey);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<Camera> getBySnCodes(List<String> snCodes) {
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        if(snCodes == null || snCodes.size()<=0){
+            return new ArrayList<>();
+        }
+        wrapper.in(Camera::getSnCode,snCodes);
+        return this.list(wrapper);
+    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/FusionService.java

@@ -56,7 +56,15 @@ public class FusionService implements IFusionService {
     @Override
     public PageInfo scenePageList(SceneParam param, String token) {
         LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
-
+        if(param.getSnCodes() != null && param.getSnCodes().size() >0){
+            List<Camera> cameras = cameraService.getBySnCodes(param.getSnCodes());
+            if(cameras.size() >0){
+                List<Long> cameraIds = cameras.stream().map(Camera::getId).collect(Collectors.toList());
+                wrapper.in(ScenePlus::getCameraId,cameraIds);
+            }else {
+                return PageInfo.PageInfo(new Page<>(param.getPageNum(),param.getPageSize()));
+            }
+        }
         if(StringUtils.isNotBlank(token)){
             User user = userService.getByToken(token);
             if(user == null){

src/main/java/com/fdkankan/ucenter/vo/request/SceneParam.java

@@ -17,6 +17,8 @@ public class SceneParam extends RequestBase {
 
     private String sceneName;       //场景名称
     private String snCode;          //相机snCode
+    private List<String> snCodes;
+
     private String userName;        //协作者名称
 
     private String sceneNum;