diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java index 964907c..ecbd349 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java @@ -15,51 +15,36 @@ import java.util.List; @Data public class ZuTaiDTO { - @SerializedName("id") - private String id; + @SerializedName("done_json") + private List doneJson; - @SerializedName("title") - private String title; + @Data + public static class Detail{ - @SerializedName("type") - private String type; + @SerializedName("id") + private String id; - @SerializedName("display") - private Boolean display; + @SerializedName("name") + private String name; - @SerializedName("typeName") - private String typeName; + @SerializedName("title") + private String title; - @SerializedName("svgColor") - private String svgColor; + @SerializedName("type") + private String type; - @SerializedName("svgPositionX") - private Double svgPositionX; + @SerializedName("display") + private Boolean display; - @SerializedName("svgPositionY") - private Double svgPositionY; + @SerializedName("lineId") + private List lineId; - @SerializedName("echartsOption") - private String echartsOption; + @SerializedName("UID") + private List uId; - @SerializedName("list") - private String list; + @SerializedName("UName") + private String target; - @SerializedName("tableHeader") - private String tableHeader; + } - @SerializedName("size") - private Double size; - - @SerializedName("angle") - private Double angle; - - @SerializedName("lineId") - private List lineId; - - @SerializedName("UID") - private List uId; - - @SerializedName("UName") - private String target; } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index ad8e831..6f0d523 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -86,8 +86,8 @@ public class LineTargetServiceImpl implements ILineTargetService { List result = new ArrayList<>(); String path = csPagePOService.queryById(id).getPath(); InputStream inputStream = fileStorageUtil.getFileStream(path); - List list = analysisJson(inputStream); - list.forEach(item->{ + ZuTaiDTO zuTaiDto = analysisJson(inputStream); + zuTaiDto.getDoneJson().forEach(item->{ if (!Objects.isNull(item.getTarget())){ String targetTag = item.getTarget().split("\\$")[0]; String phasic = item.getTarget().split("\\$")[1]; @@ -108,13 +108,13 @@ public class LineTargetServiceImpl implements ILineTargetService { /** * 解析json文件 */ - public List analysisJson(InputStream inputStream) { + public ZuTaiDTO analysisJson(InputStream inputStream) { Gson gson = new Gson(); String text = new BufferedReader( new InputStreamReader(inputStream, StandardCharsets.UTF_8)) .lines() .collect(Collectors.joining("\n")); - return gson.fromJson(text, new TypeToken>(){}.getType()); + return gson.fromJson(text, new TypeToken(){}.getType()); } /**