修改公元文件上传逻辑

4dkankan-modeling/src/main/java/com/fdkankan/modeling/message/BuildSceneReceiver.java

@@ -5,17 +5,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.base.util.FileUtil;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantUrl;
-import com.fdkankan.common.jedis.KeyConsts;
-import com.fdkankan.common.push.Demo;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.PushMsgUtil;
 import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.constants.SysConstants;
 import com.fdkankan.enums.BuildStatusEnum;
 import com.fdkankan.exception.BuildException;
 import com.fdkankan.log.entity.BuildLog;
 import com.fdkankan.log.service.IBuildLogService;
+import com.fdkankan.scene.entity.SceneProEditEntity;
 import com.fdkankan.scene.entity.SceneProEntity;
+import com.fdkankan.scene.service.ISceneProEditService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.util.ComputerUtil;
@@ -43,8 +42,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.*;
 
-import static com.fdkankan.common.push.Demo.*;
-
 @Log4j2
 public class BuildSceneReceiver {
 
@@ -60,6 +57,9 @@ public class BuildSceneReceiver {
     @Autowired
     private GYUploadToOssUtil gYUploadToOssUtil;
 
+    @Autowired
+    private ISceneProEditService sceneProEditService;
+
     @Value("${gy.company.id}")
     private String gyCompanyId;
 
@@ -464,10 +464,19 @@ public class BuildSceneReceiver {
                 UserEntity sceneUser = userService.findById(scene.getUserId());
                 if (!ObjectUtils.isEmpty(sceneUser.getCompanyId()) && gyCompanyId.equals(sceneUser.getCompanyId()+"")) {
                     gYUploadToOssUtil.uploadMulFiles(map);
-                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+scene.getNum()+File.separator+"scene.json",
-                            "data/data"+scene.getNum()+File.separator+"scene.json");
-                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"images/images"+scene.getNum()+File.separator+"floorLogoImg.png",
-                            "images/images"+scene.getNum()+File.separator+"floorLogoImg.png");
+                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "data/data" + scene.getNum() + File.separator + "scene.json",
+                            "data/data" + scene.getNum() + File.separator + "scene.json");
+                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + scene.getNum() + File.separator + "floorLogoImg.png",
+                            "images/images" + scene.getNum() + File.separator + "floorLogoImg.png");
+                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + scene.getNum() + File.separator + "logo-main.png",
+                            "images/images" + scene.getNum() + File.separator + "logo-main.png");
+                    gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + scene.getNum() + File.separator + "logo-main.png",
+                            "images/images" + scene.getNum() + File.separator + "logo-main-en.png");
+                    SceneProEditEntity proEdit = sceneProEditService.findByProId(scene.getId());
+                    if (!ObjectUtils.isEmpty(proEdit.getBgMusicName())) {
+                        gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + scene.getNum() + File.separator + proEdit.getBgMusicName(),
+                                "images/images" + scene.getNum() + File.separator + proEdit.getBgMusicName());
+                    }
                 }
             }