|
@@ -504,13 +504,18 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
|
|
|
long startTime = System.currentTimeMillis();
|
|
|
String scenes = someDataToJson.getString("scenes");
|
|
|
BaseRuntimeException.isBlank(scenes, null, "someData的场景码参数未空");
|
|
|
- List<ScenePanoEntity> list = scenePanoService.findByWorkId(id);
|
|
|
+ List<ScenePanoEntity> listPano = scenePanoService.findByWorkId(id);
|
|
|
+ List<FodderEntity> list = fodderService.batchBySceneCodes(getSceneCodesList(scenes));
|
|
|
|
|
|
// 读取tour.xml模板
|
|
|
String baseTour = getBaseTour();
|
|
|
StringBuilder builder = new StringBuilder();
|
|
|
builder.append(baseTour).append("\r\n");
|
|
|
- for (ScenePanoEntity entity : list) {
|
|
|
+ for (FodderEntity entity : list) {
|
|
|
+ String tour = entity.getTour();
|
|
|
+ builder.append(tour).append("\r\n");
|
|
|
+ }
|
|
|
+ for (ScenePanoEntity entity : listPano) {
|
|
|
String tour = entity.getTour();
|
|
|
builder.append(tour).append("\r\n");
|
|
|
}
|