Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.pmsBug修改

Browse Source
This commit is contained in:
雨木c
2024-01-25 08:34:21 +08:00
parent 2c487a8242
commit c1d68009ca
6 changed files with 47 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java
View File

@@ -110,4 +110,6 @@ public class RStatOrgVO implements Serializable {
@ApiModelProperty(name = "dataType",value = "数据类型（01：主网测点 02：配网测点）")
private String dataType;
}
private Integer sort;
}

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
View File

@@ -30,10 +30,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -126,7 +123,8 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
Map<String, DeptDTO> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO -> DeptDTO));
return result.stream().peek(vo -> {
vo.setOrgName(deptDTOMap.get(vo.getOrgNo()).getName());
}).collect(Collectors.toList());
vo.setSort(deptDTOMap.get(vo.getOrgNo()).getSort());
}).sorted(Comparator.comparing(RStatOrgVO::getSort)).collect(Collectors.toList());
}