Merge branch 'master' into hotfix-33370-20221123

src/main/java/com/fdkankan/contro/entity/SceneEditInfoExt.java

@@ -62,6 +62,12 @@ public class SceneEditInfoExt {
     private String mosaics;
 
     /**
+     * mosaics数据
+     */
+    @TableField("share_logo_img")
+    private String shareLogoImg;
+
+    /**
      * 是否有场景关联(0-否，1-是)
      */
     @TableField("links")

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -272,7 +272,11 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             this.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
 
-            createQrCode(sceneCode, scenePlusExt, ObjectUtils.isEmpty(company) ? null : company.getQrLogo());
+            String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
+
+            qrLogo = ObjectUtils.isEmpty(qrLogo) && !ObjectUtils.isEmpty(sceneEditInfoExt.getShareLogoImg()) ? fYunFileConfig.getHost().concat(sceneEditInfoExt.getShareLogoImg()) : null;
+
+            createQrCode(sceneCode, scenePlusExt, qrLogo);
 
             //计算成功，通知APP
             Integer pushChannel = fdageData.getInteger("pushChannel");

src/main/java/com/fdkankan/contro/service/impl/BuildSceneDTServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.contro.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.fdkankan.contro.service.IBuildSceneDTService;
 import com.fdkankan.dingtalk.DingTalkSendUtils;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,11 +33,14 @@ public class BuildSceneDTServiceImpl implements IBuildSceneDTService {
         "**num**: %s\n\n" +
         "**server-path**: %s\n\n";
 
-    public static final String contentExt = "**algorithm-log**: [https://4dkk.4dage.com/build_log/%s/console.log](https://4dkk.4dage.com/build_log/%s/console.log)";
+    public static final String contentExt = "**algorithm-log**: [%sbuild_log/%s/console.log](%sbuild_log/%s/console.log)";
 
     @Autowired
     private DingTalkSendUtils dingTalkSendUtils;
 
+    @Autowired
+    private FYunFileConfig fYunFileConfig;
+
     @Value("${main.url}")
     private String mainUrl;
 
@@ -44,7 +48,10 @@ public class BuildSceneDTServiceImpl implements IBuildSceneDTService {
     public void handModelFail(String reason, String serverPath, String num, String hostName) {
         CompletableFuture.runAsync(() -> {
             try {
-                String content = String.format(this.DINGTALK_MSG_PATTERN +  contentExt, this.mainUrl, hostName, reason, num, serverPath, num, num);
+                log.info("开始发送钉钉消息");
+                String logPath = String.format(contentExt,fYunFileConfig.getHost(),num,fYunFileConfig.getHost(),num);
+                log.info("发送钉钉消息，content:{}", logPath);
+                String content = String.format(this.DINGTALK_MSG_PATTERN, this.mainUrl, hostName, reason, num, serverPath) + logPath;
                 log.info("发送钉钉消息，content:{}", content);
                 dingTalkSendUtils.sendActioncardMsgToDingRobot(content,"场景计算失败");
             } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -219,6 +219,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         sceneFileBuild = new SceneFileBuild();
         sceneFileBuild.setChildName(mac);
         sceneFileBuild.setFileId(fileId);
+        sceneFileBuild.setRecStatus("A");
         sceneFileBuild.setUnicode(folderName);
         sceneFileBuild.setTotalPicNum(Integer.valueOf(totalPicNum));
         sceneFileBuild.setChunks(Integer.valueOf(chunks));

src/main/java/com/fdkankan/contro/service/impl/ScenePlusServiceImpl.java

@@ -91,7 +91,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public String getDataSourceLikeUnicode(String unicode) {
 
         ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
-            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, unicode));
+            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, unicode)
+                    .eq(ScenePlusExt::getRecStatus,"A"));
 
         if(Objects.isNull(scenePlusExt)){
             return null;
@@ -104,7 +105,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public ScenePlus getByFileId(String fileId) {
 
         ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
-            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, fileId));
+            new LambdaQueryWrapper<ScenePlusExt>().like(ScenePlusExt::getDataSource, fileId)
+                    .eq(ScenePlusExt::getRecStatus,"A"));
 
         if(Objects.isNull(scenePlusExt)){
             return null;