Browse Source

v4重算 生成 v3scene.json videos改为string类型

dengsixing 3 năm trước cách đây
mục cha
commit
fac3cf608f

+ 1 - 1
4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -147,7 +147,7 @@ public class SceneJsonBean {
     /**
      *点位视频
      */
-    private JSONObject videos;
+    private String videos;
 
     /**
      * 是否有热点数据

+ 1 - 3
4dkankan-center-scene/src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -1,18 +1,16 @@
 package com.fdkankan.scene.httpclient;
 
 import com.dtflys.forest.annotation.Get;
-import com.dtflys.forest.annotation.Request;
 import com.dtflys.forest.annotation.Retry;
 import com.dtflys.forest.annotation.Success;
 import com.dtflys.forest.annotation.Var;
 import com.dtflys.forest.callback.OnError;
 import com.dtflys.forest.callback.OnSuccess;
 import com.fdkankan.common.response.Result;
-import com.fdkankan.platform.api.dto.Camera;
 import com.fdkankan.scene.bean.CameraBean;
 import com.fdkankan.scene.bean.UserIncrementBean;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
-import com.yomahub.tlog.forest.TLogForestInterceptor;
+import org.springframework.beans.factory.annotation.Value;
 
 /**
  * <p>

+ 1 - 1
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/BuildScenePostServiceImpl.java

@@ -269,7 +269,7 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
             sceneJson.setCreateTime(scenePlus.getCreateTime());
             sceneJson.setSceneResolution(scenePlusExt.getSceneResolution());
             sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
-            sceneJson.setVideos(videosJson);
+            sceneJson.setVideos(JSON.toJSONString(videosJson));
             if(arrearCap) {
                 sceneJson.setPayStatus(PayStatus.NO_CAPACITY.code());
             }

+ 1 - 1
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/BuildScenePreServiceImpl.java

@@ -98,7 +98,7 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
             String key = String.format(RedisKey.SCENE_BUILDING, message.getSceneNum());
             Long building = redisUtil.incr(key, 1);
             if (building.compareTo(1L) != 0) {
-                log.error("场景正在构建中,退出构建,参数:{}", JSONObject.toJSONString(message));
+                log.info("场景正在构建中,退出构建,参数:{}", JSONObject.toJSONString(message));
                 return;
             } else {
                 redisUtil.expire(key, Duration.of(modelTimeOut, ChronoUnit.HOURS));