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

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<>();
String path = csPagePOService.queryById(id).getPath();
InputStream inputStream = fileStorageUtil.getFileStream(path);
List<ZuTaiDTO> 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<ZuTaiDTO> 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<List<ZuTaiDTO>>(){}.getType());
return gson.fromJson(text, new TypeToken<ZuTaiDTO>(){}.getType());
}
/**