Browse Source

Merge branch 'release-swsx' into test

dengsixing 16 hours ago
parent
commit
eff203022e

+ 5 - 2
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSxTestServiceImpl.java

@@ -139,9 +139,12 @@ public class BuildSxTestServiceImpl implements IBuildSceneService {
             //发送mq,就进行计算
             message.setResultReceiverMqName(queueModelingPost);
 
-            Map<String, String> dataMap = buildService.getTypeString(message.getCameraType(), message.getAlgorithm(), message.getResolution(), new JSONObject());
+            ScenePlusExt scenePlusExtByPlusId = scenePlusExtService.getScenePlusExtByPlusId(scenePlusByNum.getId());
+            String dataFdageKey = SceneUtil.getHomePath(scenePlusExtByPlusId.getDataSource()) + "data.fdage";
+            JSONObject jsonObject = JSON.parseObject(fYunFileService.getFileContent(dataFdageKey));
+            Map<String, String> dataMap = buildService.getTypeString(message.getCameraType(), message.getAlgorithm(), message.getResolution(),jsonObject);
             dataMap.put("splitType", "SPLIT_V31");
-            buildService.writeDataJson(message, null, dataMap, null);
+            buildService.writeDataJson(message, jsonObject, dataMap, null);
             log.info("场景计算资源准备结束,场景码:{}", message.getSceneNum());
 
         }catch (Exception e){