Merge branch 'release-辅助拍摄计算' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/controller/InnerController.java
#	src/main/java/com/fdkankan/contro/service/IInnerService.java
#	src/main/java/com/fdkankan/contro/service/impl/InnerServiceImpl.java

src/main/java/com/fdkankan/contro/controller/InnerController.java

@@ -1,14 +1,19 @@
 package com.fdkankan.contro.controller;
 
 import com.fdkankan.contro.annotation.SignVerification;
+import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.contro.service.IInnerService;
+import com.fdkankan.contro.service.IScenePlusService;
 import com.fdkankan.web.response.ResultData;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 场景文件上传模块
  */
@@ -19,6 +24,8 @@ public class InnerController {
 
     @Autowired
     private IInnerService innerService;
+    @Autowired
+    private IScenePlusService scenePlusService;
 
     @SignVerification
     @GetMapping("uploadArtificialResult")
@@ -38,5 +45,12 @@ public class InnerController {
         innerService.updateSceneFail(num);
         return ResultData.ok();
     }
+    @GetMapping("listNewCameraScene")
+    public ResultData listNewCameraScene(@RequestParam("title") String title){
+        List<ScenePlus> ScenePlusList = innerService.listNewCameraScene(title);
+        return ResultData.ok(ScenePlusList);
+    }
+
+
 
 }

src/main/java/com/fdkankan/contro/service/IInnerService.java

@@ -1,9 +1,14 @@
 package com.fdkankan.contro.service;
 
+import com.fdkankan.contro.entity.ScenePlus;
+
+import java.util.List;
+
 public interface IInnerService {
 
     void uploadArtificialResult(String num) throws Exception;
 
     void updateSceneFail(String num);
 
+    List<ScenePlus> listNewCameraScene(String title);
 }

src/main/java/com/fdkankan/contro/service/IScenePlusService.java

@@ -3,7 +3,6 @@ package com.fdkankan.contro.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.contro.entity.ScenePlus;
 import com.fdkankan.web.response.ResultData;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>

src/main/java/com/fdkankan/contro/service/impl/InnerServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.http.ContentType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.*;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
@@ -32,6 +33,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class InnerServiceImpl implements IInnerService {
@@ -353,4 +355,15 @@ public class InnerServiceImpl implements IInnerService {
 
 
 
+
+    @Override
+    public List<ScenePlus> listNewCameraScene(String title) {
+        List<CameraDetail> list = cameraDetailService.list(new LambdaQueryWrapper<CameraDetail>().eq(CameraDetail::getType, 20));
+        Set<Long> cameraIds = list.stream().map(v -> v.getCameraId()).collect(Collectors.toSet());
+        return scenePlusService.list(
+                new LambdaQueryWrapper<ScenePlus>()
+                .like(ScenePlus::getTitle, title)
+                .in(ScenePlus::getCameraId, cameraIds)
+                .orderByDesc(ScenePlus::getId).last("limit 5"));
+    }
 }