1

src/main/java/com/fdkankan/agent/httpClient/service/LaserService.java

@@ -45,6 +45,12 @@ public class LaserService {
 
     public PageInfo pageList(SceneParam param) {
         LaserSceneParam laserSceneParam = getLaserSceneParam(param);
+        if(laserSceneParam.getSceneCodes() == null || laserSceneParam.getSceneCodes().size() <=0){
+            Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+            voPage.setRecords(new ArrayList<>());
+            voPage.setTotal(0);
+            return PageInfo.PageInfo(voPage);
+        }
         FdkkResponse response = laserClient.sceneList(laserSceneParam);
         JSONObject jsonObject =response.getData();
         if(jsonObject == null){
@@ -86,15 +92,22 @@ public class LaserService {
     }
 
     private LaserSceneParam getLaserSceneParam(SceneParam param) {
-        if(StringUtils.isNotBlank(param.getUserName())){
-            List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getAgentId(),param.getUserName());
-            param.setSnCodes(this.setSnCodes(cameraDetails));
+        LaserSceneParam newParam = new LaserSceneParam();
+        List<CameraDetail> cameraDetails = cameraDetailService.getByAgentId(param.getAgentId());
+        List<String> snCodeList = this.setSnCodes(cameraDetails);
+        param.setSnCodes(snCodeList);
+        if(param.getSnCodes() == null || param.getSnCodes().size() <=0){
+            return newParam;
         }
-        if(StringUtils.isNotBlank(param.getUserName()) && StringUtils.isBlank(param.getSnCode()) &&
-                (param.getSnCodes() == null || param.getSnCodes().size() <=0)){
-            param.setSnCode("phoneEmptySelect");
+
+        if(StringUtils.isNotBlank(param.getUserName())){
+            List<CameraDetail> cameraDetails2 = cameraDetailService.getByUserName(param.getAgentId(),param.getUserName());
+            List<String> strings = this.setSnCodes(cameraDetails2);
+            if(strings == null || strings.size() <=0) {
+                return newParam;
+            }
+            param.getSnCodes().retainAll(strings);
         }
-        LaserSceneParam newParam = new LaserSceneParam();
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());
         return newParam;

src/main/java/com/fdkankan/agent/service/ICameraDetailService.java

@@ -18,4 +18,6 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     List<CameraDetail> getByUserName(Integer agentId,String userName);
 
     CameraDetail getByCameraId(Long cameraId);
+
+    List<CameraDetail> getByAgentId(Integer agentId);
 }

src/main/java/com/fdkankan/agent/service/impl/CameraDetailServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -55,4 +56,11 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         }
         return list.get(0);
     }
+
+    @Override
+    public List<CameraDetail> getByAgentId(Integer agentId) {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CameraDetail::getAgentId,agentId);
+        return this.list(wrapper);
+    }
 }