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

监测点分布接口优化

Browse Source
This commit is contained in:
zhuxinyu
2023-03-09 15:47:17 +08:00
parent 57ac6fd4f7
commit 484b5dc2e5
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,7 @@
<if test="deviceInfoParam.powerFlag!=2">
and t2.Power_Flag = #{deviceInfoParam.powerFlag}
</if>
<if test="deviceInfoParam.lineGrade!='' and deviceInfoParam.lineGrade!=''">
<if test="deviceInfoParam.lineGrade!='' and deviceInfoParam.lineGrade!=null">
and t2.line_grade = #{deviceInfoParam.lineGrade}
</if>
<if test="deviceInfoParam.loadType!=null and deviceInfoParam.loadType.size()!=0">

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

@@ -276,20 +276,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
lineDistributionVO.setValue(generalDeviceDTO.getLineIndexes().size());
lineDistributionVOList.add(lineDistributionVO);
}
List<LineDistributionVO> result = new ArrayList<LineDistributionVO>();
Map<String, Integer> map = new HashMap<String, Integer>();
for (LineDistributionVO lineDistributionVO : lineDistributionVOList) {
if (map.containsKey(lineDistributionVO.getName())) {
map.put(lineDistributionVO.getName(), map.get(lineDistributionVO.getName()) + lineDistributionVO.getValue());
} else {
map.put(lineDistributionVO.getName(), lineDistributionVO.getValue());
}
}
for (Map.Entry<String, Integer> entry : map.entrySet()) {
result.add(new LineDistributionVO(entry.getKey(), entry.getValue()));
}
return result;
return lineDistributionVOList;
}
@Override
@@ -308,7 +295,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
//获取监测点新增数
QueryWrapper<Line> lineQueryWrapper = new QueryWrapper<>();
lineQueryWrapper.in("pq_line.id", generalDeviceDTO.getLineIndexes());
lineQueryWrapper.between("pq_line.Create_Time", DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
lineQueryWrapper.between("pq_line.Create_Time",
DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())),
DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())));
int countNum = lineMapper.selectCount(lineQueryWrapper);
lineSaveTail += countNum;
lineStatisticsDetail.setAddLineNum(countNum);