浏览代码

增加计算进度通知

dsx 2 年之前
父节点
当前提交
eb6768bb9a

+ 1 - 14
src/main/java/com/fdkankan/contro/mq/listener/BuildSceneProgressListener.java

@@ -42,21 +42,8 @@ public class BuildSceneProgressListener{
         String msg = new String(message.getBody(), StandardCharsets.UTF_8);
         log.info("开始推送场景计算进度,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
         BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
-        ExecutorService executor = ThreadUtil.newSingleExecutor();
-        Future future = executor.submit(() -> {
-            buildSceneProgressService.monitorProgress(buildSceneMessage);
-        });
-        try {
-            future.get(2*24*60*60, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
-            e.printStackTrace();
-        } catch (TimeoutException e) {
-            e.printStackTrace();
-        }
+        buildSceneProgressService.monitorProgress(buildSceneMessage);
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-        Thread.sleep(100000000);
         log.info("推送场景计算进度完成,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
 
     }

+ 1 - 1
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneProgressServiceImpl.java

@@ -127,7 +127,7 @@ public class BuildSceneProgressServiceImpl implements IBuildSceneProgressService
                         log.info("222222222222222");
                         int progress = 0;
                         try {
-                            progress = new BigDecimal(projectJson.getDouble("progress")).multiply(new BigDecimal(100)).intValue();
+                            progress = new BigDecimal(state.getDouble("progress")).multiply(new BigDecimal(100)).intValue();
                         }catch (Exception e){
                             log.error("报错", e);
                         }