Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组态数据回显调整

Browse Source
This commit is contained in:
xuyang
2023-07-10 08:55:35 +08:00
parent b01e1e5977
commit 331a2e4f01
2 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java
View File

@@ -15,51 +15,36 @@ import java.util.List;
@Data @Data
public class ZuTaiDTO { public class ZuTaiDTO {
@SerializedName("id") @SerializedName("done_json")
private String id; private List<Detail> doneJson;
@SerializedName("title") @Data
private String title; public static class Detail{
@SerializedName("type") @SerializedName("id")
private String type; private String id;
@SerializedName("display") @SerializedName("name")
private Boolean display; private String name;
@SerializedName("typeName") @SerializedName("title")
private String typeName; private String title;
@SerializedName("svgColor") @SerializedName("type")
private String svgColor; private String type;
@SerializedName("svgPositionX") @SerializedName("display")
private Double svgPositionX; private Boolean display;
@SerializedName("svgPositionY") @SerializedName("lineId")
private Double svgPositionY; private List<String> lineId;
@SerializedName("echartsOption") @SerializedName("UID")
private String echartsOption; private List<String> uId;
@SerializedName("list") @SerializedName("UName")
private String list; private String target;
@SerializedName("tableHeader") }
private String tableHeader;
@SerializedName("size")
private Double size;
@SerializedName("angle")
private Double angle;
@SerializedName("lineId")
private List<String> lineId;
@SerializedName("UID")
private List<String> uId;
@SerializedName("UName")
private String target;
} }

8
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
View File

@@ -86,8 +86,8 @@ public class LineTargetServiceImpl implements ILineTargetService {
List<CsRtDataVO> result = new ArrayList<>(); List<CsRtDataVO> result = new ArrayList<>();
String path = csPagePOService.queryById(id).getPath(); String path = csPagePOService.queryById(id).getPath();
InputStream inputStream = fileStorageUtil.getFileStream(path); InputStream inputStream = fileStorageUtil.getFileStream(path);
List<ZuTaiDTO> list = analysisJson(inputStream); ZuTaiDTO zuTaiDto = analysisJson(inputStream);
list.forEach(item->{ zuTaiDto.getDoneJson().forEach(item->{
if (!Objects.isNull(item.getTarget())){ if (!Objects.isNull(item.getTarget())){
String targetTag = item.getTarget().split("\\$")[0]; String targetTag = item.getTarget().split("\\$")[0];
String phasic = item.getTarget().split("\\$")[1]; String phasic = item.getTarget().split("\\$")[1];
@@ -108,13 +108,13 @@ public class LineTargetServiceImpl implements ILineTargetService {
/** /**
* 解析json文件 * 解析json文件
*/ */
public List<ZuTaiDTO> analysisJson(InputStream inputStream) { public ZuTaiDTO analysisJson(InputStream inputStream) {
Gson gson = new Gson(); Gson gson = new Gson();
String text = new BufferedReader( String text = new BufferedReader(
new InputStreamReader(inputStream, StandardCharsets.UTF_8)) new InputStreamReader(inputStream, StandardCharsets.UTF_8))
.lines() .lines()
.collect(Collectors.joining("\n")); .collect(Collectors.joining("\n"));
return gson.fromJson(text, new TypeToken<List<ZuTaiDTO>>(){}.getType()); return gson.fromJson(text, new TypeToken<ZuTaiDTO>(){}.getType());
} }
/** /**