修改构建逻辑

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

@@ -17,7 +17,6 @@ import com.fdkankan.contro.bean.SceneJsonBean;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.mq.service.IBuildSceneService;
 import com.fdkankan.contro.service.*;
-import com.fdkankan.contro.service.impl.FdkkV4Service;
 import com.fdkankan.contro.vo.SceneEditControlsVO;
 import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
@@ -28,7 +27,6 @@ import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.model.utils.CreateHouseJsonUtil;
 import com.fdkankan.model.utils.CreateObjUtil;
-import com.fdkankan.model.utils.SceneUtil;
 import com.fdkankan.push.config.PushMessageConfig;
 import com.fdkankan.push.utils.PushMsgUtil;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
@@ -149,7 +147,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         Integer cameraType = Integer.parseInt(message.getCameraType());
         String sceneCode = message.getSceneCode();
         String fileId = message.getFileId();
-        Integer payStatus = message.getPayStatus();
         Long computeTime = message.getComputeTime();
 
         String path = message.getPath();
@@ -200,7 +197,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
 
             //写入数据库
-            ScenePlus scenePlus = this.updateDbPlus(sceneCode, space, payStatus, videosJson.toJSONString(), computeTime, fileId,fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1);
+            ScenePlus scenePlus = this.updateDbPlus(sceneCode, space, videosJson.toJSONString(), computeTime, fileId,fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1);
             ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
 
             //变更容量，arrearCap为true时，代表容量不足
@@ -649,7 +646,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 .set(ScenePlusExt::getAlgorithmTime, Calendar.getInstance().getTime()));
     }
 
-    private ScenePlus updateDbPlus(String num, Long space, Integer payStatus, String videosJson, Long computeTime, String fileId,boolean isObj){
+    private ScenePlus updateDbPlus(String num, Long space, String videosJson, Long computeTime, String fileId,boolean isObj){
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         List<ScenePlus> list = scenePlusService.list(
@@ -665,7 +662,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             .in(ScenePlus::getId, scenePlusIds)
             .set(ScenePlus::getSceneStatus, SceneStatus.NO_DISPLAY.code())
             .set(ScenePlus::getCreateTime, Calendar.getInstance().getTime())
-            .set(ScenePlus::getPayStatus, payStatus));
+            .set(ScenePlus::getPayStatus, PayStatus.PAY.code()));
 
         scenePlusExtService.update(new LambdaUpdateWrapper<ScenePlusExt>()
                 .in(ScenePlusExt::getPlusId, scenePlusIds)