|
@@ -186,10 +186,10 @@ public class TableElementConverter implements ITableElementConverter {
|
|
String coords = this.coordinateMap.get(fd.getTableName()).get(fd.getKey());
|
|
String coords = this.coordinateMap.get(fd.getTableName()).get(fd.getKey());
|
|
StringBuilder sb = new StringBuilder();
|
|
StringBuilder sb = new StringBuilder();
|
|
if(Func.isNotEmpty(coords)){
|
|
if(Func.isNotEmpty(coords)){
|
|
- List<Coords> list = Stream.of(coords).flatMap(e-> Arrays.stream(e.split(";"))).map(e->{String[] xy=e.split("_");return new Coords(xy[0],xy[1]);}).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Coords> list = Stream.of(coords).flatMap(e-> Arrays.stream(e.split(";"))).map(e->{String[] xy=e.split("_");return new Coords(xy[1],xy[0]);}).collect(Collectors.toList());
|
|
for(int i=0;i<dataList.size();i++){
|
|
for(int i=0;i<dataList.size();i++){
|
|
ElementData ed = dataList.get(i);
|
|
ElementData ed = dataList.get(i);
|
|
- if(list.size()>i){
|
|
|
|
|
|
+ if(list.size()>i&&Func.isNotEmpty(ed.getValue())){
|
|
Coords c=list.get(i);
|
|
Coords c=list.get(i);
|
|
sb.append(ed.stringValue()).append("_^_").append(c.getY()).append("_").append(c.getX()).append("☆");
|
|
sb.append(ed.stringValue()).append("_^_").append(c.getY()).append("_").append(c.getX()).append("☆");
|
|
}
|
|
}
|