|
@@ -112,13 +112,15 @@ public class OpsServiceImpl implements OpsService {
|
|
|
log.info("场景码:{}", sceneCodes);
|
|
|
BaseRuntimeException.isBlank(sceneCodes, null, "场景码为空, 不需要合并");
|
|
|
|
|
|
- List<String> list = Arrays.asList(sceneCodes);
|
|
|
+ String[] split = sceneCodes.split(",");
|
|
|
+
|
|
|
// tourXml路径
|
|
|
String downloadPath;
|
|
|
String basePath = configConstant.serverBasePath;
|
|
|
- int size = list.size();
|
|
|
+ int size = split.length;
|
|
|
log.info("场景数量: {}", size);
|
|
|
- String firstTourPath = File.separator + list.get(0) + "/vtour/tour.xml";
|
|
|
+ BaseRuntimeException.isHas(size==0, null, "场景码为空, 不需要合并");
|
|
|
+ String firstTourPath = File.separator + split[0] + "/vtour/tour.xml";
|
|
|
if (size == 1){
|
|
|
log.info("firstTourPath:{}", firstTourPath);
|
|
|
downloadPath = firstTourPath;
|
|
@@ -127,7 +129,7 @@ public class OpsServiceImpl implements OpsService {
|
|
|
StringBuffer sceneLabels = new StringBuffer();
|
|
|
int i = 0;
|
|
|
String tourPath;
|
|
|
- for (String sceneCode : list) {
|
|
|
+ for (String sceneCode : split) {
|
|
|
tourPath = basePath + File.separator + sceneCode + "/vtour/tour.xml";
|
|
|
String scene = getSceneLabel(tourPath);
|
|
|
sceneLabels.append(scene).append("\r\n");
|