dengsixing 1 рік тому
батько
коміт
47647f884e

+ 3 - 2
src/main/java/com/fdkankan/modeling/entity/BuildLog.java

@@ -12,10 +12,10 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-04-07
  */
 @Getter
@@ -78,6 +78,7 @@ public class BuildLog implements Serializable {
      * 0:场景计算
      * 1:标定算法,
      * 2:只生激光场景OBJ文件
+     * 3:生成e57
      */
     @TableField("build_type")
     private Integer buildType;

+ 78 - 2
src/main/java/com/fdkankan/modeling/receiver/RabbitMqListener.java

@@ -127,12 +127,12 @@ public class RabbitMqListener {
         }
 
         BuildLog buildLog = new BuildLog();
-        log.info("场景计算开始,队列名:{},id:{},deliveryTag:{},消息体:{}", queueModelingCall, messageId,deliveryTag,msg);
+        log.info("场景计算开始,队列名:{},id:{},deliveryTag:{},消息体:{}", queueNameService.getQueueName(), messageId,deliveryTag,msg);
         buildLog.setMessageId(messageId);
         buildLog.setContent(msg);
 
         this.process(buildSceneMessage,buildLog);
-        log.info("场景计算结束,队列名:{},id:{}", queueModelingCall, messageId);
+        log.info("场景计算结束,队列名:{},id:{}", queueNameService.getQueueName(), messageId);
 
         //计算完毕,将当前系统构建状态改为false
         redisUtil.del(modelingKey);
@@ -362,4 +362,80 @@ public class RabbitMqListener {
         buildResult.setBuildContext(message.getBuildContext());
         rabbitMqProducer.sendByWorkQueue(buildSceneResult.getResultQueueName(),buildResult);
     }
+
+    public void process4E57(BuildSceneCallMessage message,BuildLog buildLog) {
+        //开始计时
+        StopWatch watch = new StopWatch();
+        watch.start();
+
+        //发送记录计算状态为计算中
+        this.sendCallBuildProcessLog(message, ModelingBuildStatus.CALCULATING);
+
+        final BuildSceneResultBean buildSceneResult = new BuildSceneResultBean();
+        String resultQueueName = StrUtil.isNotBlank(message.getResultReceiverMqName()) ?
+                message.getResultReceiverMqName() : queueModelingPost;
+        buildSceneResult.setResultQueueName(resultQueueName);
+        ModelingBuildStatus status = null;
+        Future<ModelingBuildStatus> future = null;
+        try {
+            Map<String,Object> buildContext = new HashMap<>();
+            // 初始化日志参数
+            buildLog.setHostName(SysConstants.hostName);
+            buildLog.setQueueName(queueNameService.getQueueName());
+            buildLog.setSceneNum(message.getSceneNum());
+            buildLog.setDataSource(message.getPath());
+            buildLog.setCreateTime(new Date());
+            buildLog.setUpdateTime(new Date());
+            buildLog.setBuildType(3);
+            buildLog.setStatus(0);
+            buildLogService.save(buildLog);
+
+            future = SysConstants.executorService.submit(() -> {
+                try {
+                    return buildScene(buildContext,message, buildSceneResult,buildLog);
+                } catch (Exception e) {
+                    log.error("服务实例:{} 构建异常:", SysConstants.hostName, e);
+                    e.printStackTrace();
+                    return ModelingBuildStatus.FAILED;
+                }
+            });
+            status = future.get(SysConstants.modelTimeOut, TimeUnit.HOURS);
+
+            //结束计时
+            watch.stop();
+            buildLog.setDuration(watch.getTime(TimeUnit.SECONDS));
+        } catch (TimeoutException ex) {
+            log.error("服务实例:{} 构建异常:",SysConstants.hostName,ex);
+            status = ModelingBuildStatus.OVERTIME;
+            log.info("释放线程");
+            //场景计算超时,需要中断当前执行任务,释放线程池中的任务线程,否则下个场景计算获取不到线程进行计算
+            future.cancel(true);
+        } catch (BuildException e){
+            status = e.getBuildStatus();
+        } catch(Exception e) {
+            log.error("服务实例:{} 构建异常:", SysConstants.hostName, e);
+            if (e.getCause() instanceof BuildException) {
+                status = ((BuildException) e.getCause()).getBuildStatus();
+                buildLog.setStatus(((BuildException) e.getCause()).getBuildStatus().code());
+            } else {
+                status = ModelingBuildStatus.FAILED;
+            }
+        }
+        buildLog.setStatus(status.code());
+        buildSceneResult.setCameraType(message.getCameraType());
+        buildSceneResult.setBuildStatus(status);
+        //计算后处理
+        ModelingBuildStatus buildStatus = null;
+        buildStatus = buildSceneResult.getBuildStatus();
+        log.info("服务{} 计算结束:{},计算状态:{}", SysConstants.hostName, buildLog.getSceneNum(),buildStatus.message());
+        buildLog.setUpdateTime(new Date());
+        buildLog.setResultQuequeName(buildSceneResult.getResultQueueName());
+        buildLogService.updateById(buildLog);
+        //发送计算结果mq
+        buildSceneResult.setDuration(buildLog.getDuration());
+        this.sendCallResult(message, buildSceneResult);
+        this.sendCallBuildProcessLog(message, buildStatus);
+
+
+    }
 }