Merge branch 'hotfix-28213-20220608' into test

# Conflicts:
#	4dkankan-center-scene/src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java
#	4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/RequestSceneProV4.java

@@ -0,0 +1,33 @@
+package com.fdkankan.scene.bean;
+
+import com.google.firebase.database.annotations.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/24
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RequestSceneProV4 {
+
+    @NotNull
+    private Long id;
+
+    private String webSite;
+
+    private String thumb;
+
+    private String sceneName;
+
+
+}

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

@@ -12,6 +12,7 @@ import com.dtflys.forest.callback.OnSuccess;
 import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.response.Result;
 import com.fdkankan.scene.bean.CameraBean;
+import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.UserIncrementBean;
 //import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
@@ -56,4 +57,11 @@ public interface FdkankanMiniClient {
     @Retry(maxRetryCount = "3", maxRetryInterval = "100")
     Result<Map<String, Object>> getIsLogin(@Var("url") String url, @Header("token") String token, OnSuccess<Result> onSuccess, OnError onError);
 
+    @Post(
+        url = "${url}",
+        contentType = "application/json"
+    )
+    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+    Result upgradeToV4ResultSync(@Var("url") String url, @Body RequestSceneProV4 param, OnSuccess<Result> onSuccess, OnError onError);
+
 }

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

@@ -38,6 +38,7 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.api.dto.SceneInfoDTO;
 import com.fdkankan.scene.bean.BoxPhotoBean;
+import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.SceneJsonBean;
 import com.fdkankan.scene.bean.TagBean;
 import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
@@ -128,6 +129,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private String URL_GET_DATASYNC_BY_CAMERAID;
     @Value("${http.api-v4.getSceneProByNum}")
     private String URL_GET_SCENEPRO_BY_NUM;
+    @Value("${http.api-v4.upgradeToV4ResultSync}")
+    private String URL_UPGRADE_TO_V4_RESULT_SYNC;
 
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
@@ -305,6 +308,14 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 //            sceneEditControlsService.updateById(sceneEditControls);
 //        }
 
+        // todo 调用v3接口同步场景缩略图url---------------------------------start
+        String url = fkankanMiniHost + URL_UPGRADE_TO_V4_RESULT_SYNC;
+        fdkankanMiniClient.upgradeToV4ResultSync(url,
+            RequestSceneProV4.builder().id(scenePlus.getId()).thumb(scenePlusExt.getThumb()).sceneName(sceneEditInfo.getTitle()).build(),
+            new FdkkMiniReqSuccessCallback(), new FdkkMiniReqErrorCallback()
+        );
+        // todo 调用v3接口同步场景缩略图url---------------------------------end
+
         return ResultData.ok();
     }
 

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

@@ -31,8 +31,12 @@ import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.IconBean;
+import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.TagBean;
+import com.fdkankan.scene.callback.FdkkMiniReqErrorCallback;
+import com.fdkankan.scene.callback.FdkkMiniReqSuccessCallback;
 import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.httpclient.FdkankanMiniClient;
 import com.fdkankan.scene.mapper.ISceneProMapper;
 import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.*;
@@ -75,36 +79,30 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Value("${oss.prefix.ali}")
     private String prefixAli;
-
     @Value("${oss.prefix.url}")
     private String ossUrlPrefix;
-
     @Value("${upload.type}")
     private String type;
-
     @Value("${hot.domain.list}")
     private String hotDomainList;
-
     @Value("${hot.delete}")
     private String hotDelete;
-
     @Value("${main.url}")
     private String mainUrl;
-
     @Value("${scene.url}")
     private String sceneUrl;
-
     @Value("${scene.pro.url}")
     private String sceneProUrl;
-
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
-
     @Value("${ecs.checkFile.maxTimes:5}")
     private int maxCheckTimes;
-
     @Value("${ecs.checkFile.waitTime:5000}")
     private int waitTime;
+    @Value("${http.host.4dkankanMini}")
+    private String fkankanMiniHost;
+    @Value("${http.api-v4.upgradeToV4ResultSync}")
+    private String URL_UPGRADE_TO_V4_RESULT_SYNC;
 
     @Autowired
     @Qualifier("uploadToOssUtil")
@@ -143,6 +141,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IFdkkLaserService fdkkLaserService;
     @Resource
     ISceneProMapper sceneProMapper;
+    @Autowired
+    private FdkankanMiniClient fdkankanMiniClient;
 
     @Override
     public List<SceneVO> convert(List<ScenePro> list){