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

修改谐波bug

Browse Source
This commit is contained in:
cdf
2023-04-11 16:05:00 +08:00
parent 826778a2b8
commit bedbebabc3
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
View File

@@ -113,7 +113,11 @@
OR dev.name LIKE #{searchValueLike} OR dev.name LIKE #{searchValueLike}
OR line.NAME LIKE #{searchValueLike} OR line.NAME LIKE #{searchValueLike}
</if> </if>
ORDER BY areaId.NAME ORDER BY
gdName,
bdName,
devNAME,
objName;
</select> </select>
<select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO"> <select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO">
@@ -184,7 +188,9 @@
OR device.IP LIKE #{searchValueLike} OR device.IP LIKE #{searchValueLike}
</if> </if>
ORDER BY ORDER BY
areaId.NAME gdName,
bdName,
devName;
</select> </select>
<select id="getOnlineEvaluate" resultType="com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO"> <select id="getOnlineEvaluate" resultType="com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO">
SELECT SELECT

9
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
View File

@@ -167,7 +167,14 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid)); groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid));
} }
targetData = targetData.stream().peek(terminalTree -> { targetData = targetData.stream().peek(terminalTree -> {
terminalTree.setChildren(groupLine.get(terminalTree.getId())); if(isLine){
//监测点的数量
int size = groupLine.get(terminalTree.getId()).size();
terminalTree.setName(terminalTree.getName()+"（"+size+"台装置）");
terminalTree.setChildren(groupLine.get(terminalTree.getId()));
}else{
terminalTree.setChildren(groupLine.get(terminalTree.getId()));
}
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }

7
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
View File

@@ -135,9 +135,10 @@ public class THDistortionServiceImpl implements THDistortionService {
/*监测点ID扁平化*/ /*监测点ID扁平化*/
List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( )); List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( ));
QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>(); QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
wrapper.in ("measurement_point_id",collect). wrapper.in ("measurement_point_id",collect)
between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ()). .between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ())
orderByDesc ("v_thd"); .eq("data_type",1)
.orderByDesc ("v_thd");
List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper); List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper);
rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> { rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> {
RMpVThdVO rMpVThdVO = new RMpVThdVO ( ); RMpVThdVO rMpVThdVO = new RMpVThdVO ( );