Merge remote-tracking branch 'origin/release' into project-jp-test

src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -3,7 +3,6 @@ package com.fdkankan.modeling.receiver;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.CommonOperStatus;
 import com.fdkankan.common.constant.ModelingBuildStatus;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.utils.ComputerUtil;
@@ -15,9 +14,7 @@ import com.fdkankan.modeling.exception.BuildException;
 import com.fdkankan.modeling.handler.LaserSceneObjGenerateHandler;
 import com.fdkankan.modeling.service.IBuildLogService;
 import com.fdkankan.modeling.service.IBuildService;
-import com.fdkankan.modeling.service.IMqEcsService;
 import com.fdkankan.modeling.service.ISceneBuildProcessLogService;
-import com.fdkankan.modeling.service.impl.MqEcsServiceImpl;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneProcessLogMessage;
 import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
@@ -25,7 +22,6 @@ import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.rabbitmq.client.Channel;
-import com.fdkankan.model.constants.SceneBuildProcessType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.StopWatch;
@@ -113,6 +109,11 @@ public class RabbitMqListener {
             log.error("消息内容错误,id:{},消息体:{}", messageId, msg);
             return;
         }
+        String bizType = buildSceneMessage.getBizType();
+        if(StrUtil.isEmpty(bizType)){
+            bizType = "standard";
+            buildSceneMessage.setBizType(bizType);
+        }
 
         //计算暂停锁，计算中锁。弹性伸缩控制服务使用
         String modelingKey = String.format(RedisKey.modelingKey,SysConstants.hostName);
@@ -133,7 +134,7 @@ public class RabbitMqListener {
         buildLog.setContent(msg);
 
         Map<String, Object> ext = buildSceneMessage.getExt();
-        if(CollUtil.isNotEmpty(ext) && Objects.nonNull(ext.get("bizType")) && "e57".equals(ext.get("bizType"))){
+        if("e57".equals(bizType)){
             this.process4E57(buildSceneMessage,buildLog);
         }else{
             this.process(buildSceneMessage,buildLog);
@@ -262,6 +263,12 @@ public class RabbitMqListener {
 
         String splitType = dataMap.get("splitType");
         String skyboxType = dataMap.get("skyboxType");
+        if(Objects.nonNull(message.getExt().get("splitType"))){
+            splitType = (String) message.getExt().get("splitType");
+        }
+        if(Objects.nonNull(message.getExt().get("skyboxType"))){
+            skyboxType = (String) message.getExt().get("skyboxType");
+        }
 
         ComputerUtil.createProjectAndDataFile(path,num, splitType, skyboxType,null,null);
         //计算模型并返回需要上传oss的文件集合
@@ -334,7 +341,7 @@ public class RabbitMqListener {
      */
     private void sendCallBuildProcessLog(BuildSceneCallMessage message, ModelingBuildStatus buildStatus){
         rabbitMqProducer.sendByWorkQueue(queueModelingProcessLog,
-                BuildSceneProcessLogMessage.builder().num(message.getSceneNum()).buildStatus(buildStatus.code()).queueName(queueNameService.getQueueName()).build());
+                BuildSceneProcessLogMessage.builder().num(message.getSceneNum()).buildStatus(buildStatus.code()).queueName(queueNameService.getQueueName()).bizType(message.getBizType()).build());
     }
 
     private void preBuild(Map<String,Object> buildContext,BuildSceneCallMessage message, BuildLog buildLog) throws BuildException {