getauth增加sourceExpired字段，用于标识本地资源是否本删除了

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -134,39 +134,9 @@ public class SceneEditServiceImpl implements ISceneEditService {
         //判断该场景是否属于增值权益
         boolean isVip = false;
         //获取该相机是否有权益
-        boolean isExpired  = false;
-//        ResultData<Camera> cameraResultData = platformGoodsClient.getCameraById(scenePlus.getCameraId());
-//        if(!cameraResultData.getSuccess()){
-//            throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-//        }
-//        Camera camera = cameraResultData.getData();
-//        if(camera != null){
-//            ResultData<UserIncrement> incrementResultData = platformUserClient
-//                .getUserIncrementByCameraId(camera.getId());
-//            if(!incrementResultData.getSuccess()){
-//                throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
-//            }
-//            UserIncrement userIncrement = incrementResultData.getData();
-//            if(userIncrement != null){
-//                if( userIncrement.getIsExpired().intValue() == 0){
-//                    isVip = true;
-//                }
-//                if(userIncrement.getIsExpired().intValue() == 1){
-//                    isExpired  = true;
-//                }
-//            }else{
-//                Date date = DateUtil.parse("2021-09-09 00:00:00", DateExtUtil.dateStyle);
-//
-//                //非07批次的放开
-//                String pc = camera.getSnCode().substring(0,2);
-//                if(!pc.equals("07") ){
-//                    if(camera.getCreateTime()!=null && date.after(camera.getCreateTime())){
-//                        isVip = true;
-//                        isExpired  = false;
-//                    }
-//                }
-//            }
-//        }
+        boolean isExpired = false;
+        //本地资源是否失效
+        boolean sourceExpired = false;
         // TODO: 2022/4/25 v3v4共存过渡期结束需要删除，恢复上面注释内容 ------------------------------------------start
         url = fkankanMiniHost + URL_ISLOGIN + num;
         Result<Map<String, Object>> isLoginResult = fdkankanMiniClient
@@ -175,11 +145,17 @@ public class SceneEditServiceImpl implements ISceneEditService {
         Map<String, Object> data = isLoginResult.getData();
         isVip = (boolean)data.get("isIncrement");
         isExpired = (boolean)data.get("isExpired");
+        Object sourceExpiredObj = data.get("sourceExpired");
+        if(Objects.nonNull(sourceExpiredObj)){
+            sourceExpired = (boolean) sourceExpiredObj;
+        }
         Integer company = data.get("company") == null ? null : (int)data.get("company");
         // TODO: 2022/4/25 v3v4共存过渡期结束需要删除，恢复上面注释内容 ------------------------------------------end
 
         return SceneAuthVO.builder()
-            .isExpired(isExpired).isVip(isVip)
+            .isExpired(isExpired)
+            .isVip(isVip)
+            .sourceExpired(sourceExpired)
             .company(company)
             .exclude(data.get("exclude"))
             .include(data.get("include"))

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneAuthVO.java

@@ -35,6 +35,11 @@ public class SceneAuthVO {
      */
     private boolean isVip;
 
+    /**
+     * 本地资源是否失效
+     */
+    private boolean sourceExpired;
+
     private Integer company;
 
     private Object exclude;