1

src/main/java/com/fdkankan/ucenter/httpClient/client/LaserClient.java

@@ -7,6 +7,7 @@ import com.fdkankan.ucenter.httpClient.address.LaserAddressSource;
 import com.fdkankan.ucenter.httpClient.param.SSDownSceneParam;
 import com.fdkankan.ucenter.httpClient.param.SsBindParam;
 import com.fdkankan.ucenter.httpClient.vo.LaserSceneParam;
+import org.apache.poi.ss.formula.functions.Intercept;
 
 import java.util.List;
 import java.util.Map;
@@ -20,8 +21,8 @@ public interface LaserClient {
     /**
      * 根据用户获取激光相机数量
      */
-    @Post("/laser/4dage/getSceneNum")
-    Result getSceneNum(@Header("fdToken") String token,@JSONBody Map<String, Object> param);
+    @Post(value = "/laser/4dage/getSceneNum",interceptor = SignInterceptor.class)
+    Result getSceneNum(@Header("fdToken") String token, @JSONBody Map<String, Object> param);
     /**
      * 获取相机场景数
      * @param param
@@ -32,64 +33,64 @@ public interface LaserClient {
      * 取消相机协作
      * @param param
      */
-    @Post("/laser/4dage/scene/cooperation/disable")
+    @Post(value = "/laser/4dage/scene/cooperation/disable",interceptor = SignInterceptor.class)
     Result cooperationDisable(@JSONBody List<Map<String, String> >param);
     /**
      * 添加相机协作
      * @param param
      */
-    @Post("/laser/4dage/scene/cooperation/cameraSave")
+    @Post(value = "/laser/4dage/scene/cooperation/cameraSave",interceptor = SignInterceptor.class)
     Result cooperationCameraSave(@JSONBody List<Map<String, String> >param);
 
-    @Get("/laser/init/${0}")
+    @Get(value = "/laser/init/${0}",interceptor = SignInterceptor.class)
     Result getSceneByNum(String num);
 
     /**
      * 新增场景
      */
-    @Post("/laser/init/{sceneNum}/saveOrEdit")
+    @Post(value = "/laser/init/{sceneNum}/saveOrEdit",interceptor = SignInterceptor.class)
     Result saveOrEdit(@Var("sceneNum") String sceneNum, @JSONBody  Map<String,Object> params);
     /**
      * 新增场景
      */
-    @Post("/laser/4dage/scene/getScenesBySnCode")
+    @Post(value = "/laser/4dage/scene/getScenesBySnCode",interceptor = SignInterceptor.class)
     Result getScenesBySnCode(@JSONBody Map<String, String> param, @Header("fdToken") String token) ;
 
     /**
      * 下载深时场景
      * status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
      */
-    @Post("/laser/4dage/downOfflineScene")
+    @Post(value = "/laser/4dage/downOfflineScene",interceptor = SignInterceptor.class)
     Result downOfflineScene(@JSONBody SSDownSceneParam param) ;
     /**
      * 检测深时场景是否需要重新生成
      *
      * status ：离线包状态是否需要重新生成 0未生成，1 不需要 2需要
      */
-    @Post("/laser/4dage/downOfflineSceneStatus")
+    @Post(value = "/laser/4dage/downOfflineSceneStatus",interceptor = SignInterceptor.class)
     Result downOfflineSceneStatus(@JSONBody SSDownSceneParam param) ;
 
     /**
      *解绑相机、绑定相机
      */
-    @Post("/laser/4dage/scene/camera/toBind")
+    @Post(value = "/laser/4dage/scene/camera/toBind",interceptor = SignInterceptor.class)
     Result toBind(@JSONBody SsBindParam param) ;
 
     /**
      * 修改场景状态
      */
-    @Post("/laser/4dage/scene/updateStatus")
+    @Post(value = "/laser/4dage/scene/updateStatus",interceptor = SignInterceptor.class)
     Result updateStatus( @JSONBody  Map<String,Object> params);
 
-    @Post("/laser/4dage/managerSceneList")
+    @Post(value = "/laser/4dage/managerSceneList",interceptor = SignInterceptor.class)
     Result sceneList(@JSONBody LaserSceneParam param);
 
-    @Post("/laser/4dage/scene/sceneStatusInfo/{sceneCode}")
+    @Post(value = "/laser/4dage/scene/sceneStatusInfo/{sceneCode}",interceptor = SignInterceptor.class)
     Result laserSceneInfo(@Var("sceneCode")String sceneCode);
 
-    @Post("/laser/4dage/downE57Status")
+    @Post(value = "/laser/4dage/downE57Status",interceptor = SignInterceptor.class)
     Result downE57Status(@JSONBody SSDownSceneParam param);
 
-    @Post("/laser/4dage/downE57")
+    @Post(value = "/laser/4dage/downE57",interceptor = SignInterceptor.class)
     Result downE57(@JSONBody SSDownSceneParam param);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
@@ -35,7 +36,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class AppSceneService {
+public class AppSceneService extends BaseController {
     @Autowired
     IUserService userService;
     @Autowired
@@ -75,14 +76,17 @@ public class AppSceneService {
     private String ossHost;
 
     public PageInfo pageList(AppSceneParam param) {
-        if((StringUtils.isEmpty(param.getAppUserName())) && StringUtils.isEmpty(param.getPhoneNum()) && param.getCameraId() == null){
-            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
+
+        String username = JwtUtil.getUsername(getToken());
+        if(StringUtils.isBlank(username)){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
         }
-        if(!StringUtils.isEmpty(param.getAppUserName())){
-            Camera camera = cameraService.getByChildName(param.getAppUserName());
-            if(camera == null){
-                throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
-            }
+        Camera camera = cameraService.getByChildName(username);
+        User user = userService.getByUserName(param.getPhoneNum());
+        if(camera == null && user == null){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3004, LoginConstant.FAILURE_MSG_3004);
+        }
+        if(camera != null){
             CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
             if(cameraDetail == null){
                 throw new BusinessException(LoginConstant.FAILURE_CODE_3014, LoginConstant.FAILURE_MSG_3014);
@@ -91,18 +95,15 @@ public class AppSceneService {
             param.setCameraId(camera.getId());
         }
 
-        List<String> cooperationNumList = new ArrayList<>();
-        if(StringUtils.isNotBlank(param.getPhoneNum())){
-            User user = userService.getByUserName(param.getPhoneNum());
-            if(user == null){
-                throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
-            }
+        if(user != null){
+            List<String> cooperationNumList = new ArrayList<>();
             cooperationNumList = sceneCooperationService.getNumByUserIds(Arrays.asList(user.getId()));
             if(cooperationNumList.size() >0){
                 param.setCooperationNumList(cooperationNumList );
             }
             param.setUserId(user.getId());
         }
+
         //云端场景不展示复制场景
         Set<String> copyNumSet = sceneCopyLogService.getCopyNumSet();
         param.setCopyNumSet(copyNumSet);