dengsixing пре 3 дана
родитељ
комит
e93f641df8

+ 5 - 5
src/main/java/com/fdkankan/contro/mq/listener/BuildSxRelocationListener.java

@@ -34,9 +34,9 @@ import java.util.stream.Collectors;
 @Component
 public class BuildSxRelocationListener {
 
-    @Value("${queue.modeling.sx-relocation-pre:sx-relocation-pre}")
+    @Value("${queue.modeling.relocation.relocation-pre:sx-relocation-pre}")
     private String queueModelingPre;
-    @Value("${queue.modeling.sx-relocation-post:sx-relocation-post}")
+    @Value("${queue.modeling.relocation.relocation-post:sx-relocation-post}")
     private String queueModelingPost;
 
     @Autowired
@@ -58,7 +58,7 @@ public class BuildSxRelocationListener {
      * @throws Exception
      */
     @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.sx-relocation-push:sx-relocation-push}"),
+            queuesToDeclare = @Queue("${queue.modeling.relocation.relocation-push:sx-relocation-push}"),
             concurrency = "5"
     )
     public void push(Channel channel, Message message) throws Exception {
@@ -112,7 +112,7 @@ public class BuildSxRelocationListener {
      * @throws Exception
      */
     @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.sx-relocation-pre:sx-relocation-pre}"),
+            queuesToDeclare = @Queue("${queue.modeling.relocation.relocation-pre:sx-relocation-pre}"),
             concurrency = "5"
     )
     public void buildScenePreHandler(Channel channel, Message message) throws Exception {
@@ -144,7 +144,7 @@ public class BuildSxRelocationListener {
      * @throws Exception
      */
     @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.sx-relocation-post:sx-relocation-post}"),
+            queuesToDeclare = @Queue("${queue.modeling.relocation.relocation-post:sx-relocation-post}"),
             concurrency = "5"
     )
     public void buildScenePostHandler(Channel channel, Message message) throws Exception {

+ 3 - 0
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSxRelocationServiceImpl.java

@@ -102,6 +102,9 @@ public class BuildSxRelocationServiceImpl implements IBuildSceneService {
             this.downLoadSource(message, message.getPath());
 
             message.setResultReceiverMqName(queueModelingPost);
+            Map<String, Object> buildContext = new HashMap<>();
+            buildContext.put("sceneNum",message.getSceneNum());
+            message.setBuildContext(buildContext);
 
             ScenePlusExt scenePlusExtByPlusId = scenePlusExtService.getScenePlusExtByPlusId(scenePlusByNum.getId());
             String dataFdageKey = SceneUtil.getHomePath(scenePlusExtByPlusId.getDataSource()) + "data.fdage";

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

@@ -34,7 +34,7 @@ import java.util.Map;
 @Service
 public class RelocationBatchServiceImpl extends ServiceImpl<IRelocationBatchMapper, RelocationBatch> implements IRelocationBatchService {
 
-    @Value("${queue.modeling.sx-relocation-pre:sx-relocation-pre}")
+    @Value("${queue.modeling.relocation.relocation-pre:sx-relocation-pre}")
     private String queueModelingPre;
     @Autowired
     private IScenePlusService scenePlusService;