Bläddra i källkod

优先级计算代码合并

dengsixing 1 år sedan
förälder
incheckning
36260fb4d4

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

@@ -60,7 +60,7 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
             sceneBuildProcessLogService.clearSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.WAITING.code(), null);
             buildSceneService.buildScenePre(buildSceneMessage);
-//            commonService.saveMqSendLog(num, buildSceneMessage);
+            commonService.saveMqSendLog(num, buildSceneMessage);
             sceneBuildProcessLogService.saveSceneBuildProcessLog(num, SceneBuildProcessType.PRE.code(), queueName, CommonOperStatus.SUCCESS.code(), null);
         }catch (Exception e){
             log.error("场景计算前置处理出错,num=" + num, e);

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

@@ -144,7 +144,6 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             message.setResolution(jsonObject.getString("resolution"));
             message.setPath(laserObjFilePath);
             message.setResultReceiverMqName(queueObjModelingPost);
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
 
             success = true;
 

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

@@ -211,7 +211,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 }
                 ext.put("128G", 1);
             }
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
 
             log.info("场景计算资源准备结束,场景码:{}", message.getSceneNum());
 

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

@@ -159,7 +159,6 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
             message.getBuildContext().put("cameraType",message.getCameraType());
 
             message.setResultReceiverMqName(queueV3ModelingPost);
-            mqProducer.sendByWorkQueue(queueModelingCall, message);
 
             log.info("场景计算资源准备结束,场景码:{}", message.getSceneNum());
 

+ 0 - 29
src/main/java/com/fdkankan/contro/schedule/ScheduleJob.java

@@ -13,38 +13,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class ScheduleJob {
 
-    @Value("${rocketmq.autoScaling.num.normal}")
-    private String baseNum;
-
-    @Autowired
-    private RabbitMqProducer rabbitMqProducer;
-
-    @Autowired
-    private ScalingService scalingService;
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
-
     @Autowired
     private IScene3dNumService scene3dNumService;
 
-    @Scheduled(cron = "${rocketmq.autoScaling.corn:0 0/5 8-21 * * ?}")
-    public void job8() {
-        try {
-            //当mq排队数大于指定数量时使用弹性升缩
-            int mqNum = rabbitMqProducer.getMessageCount(queueModelingCall);
-            log.info("每5分钟查询一次排队队列,mqNum:" + mqNum);
-            if(mqNum - Integer.parseInt(baseNum) > 0){
-                log.info("使用弹性升缩开启一台ECS");
-                log.info(scalingService.createEcs());
-            }
-        } catch (Exception e) {
-            log.error("弹性升缩开启失败!", e);
-            log.error(e.getMessage());
-        }
-    }
-
-
 
     /**
      * 定时生成场景码,间隔1小时执行一次,项目启动一秒后执行一次