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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-09-07 19:43:22 +08:00
parent 8fa7e6521a 6caa2785b2
commit 8b0c56096b
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
View File

@@ -18,6 +18,8 @@ public class OverLimitLineDTO {
private String lineScale; private String lineScale;
private String manufacturer;
private String loadType; private String loadType;
private String lineObjectName; private String lineObjectName;

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

@@ -667,7 +667,8 @@
A4.`Name` subName, A4.`Name` subName,
C3.`Name` subScale, C3.`Name` subScale,
A5.`Name` cityCompany, A5.`Name` cityCompany,
F.`Name` provinceCompany F.`Name` provinceCompany,
dev.Manufacturer
FROM FROM
pq_line A1, pq_line A1,
pq_line A2, pq_line A2,
@@ -676,6 +677,7 @@
pq_line A5, pq_line A5,
pq_line A6, pq_line A6,
pq_voltage B, pq_voltage B,
pq_device dev,
sys_dict_data C1, sys_dict_data C1,
sys_dict_data C2, sys_dict_data C2,
sys_dict_data C3, sys_dict_data C3,
@@ -689,7 +691,7 @@
</foreach> </foreach>
AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
</select> </select>
<select id="getDeviceStatus" resultType="LineStateVO"> <select id="getDeviceStatus" resultType="LineStateVO">

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
View File

@@ -34,6 +34,9 @@ public class MonitorOverLimitVO {
@ApiModelProperty("监测点电压等级") @ApiModelProperty("监测点电压等级")
private String lineScale; private String lineScale;
@ApiModelProperty("厂家")
private String manufacturer;
@ApiModelProperty("变电站名称") @ApiModelProperty("变电站名称")
private String subName; private String subName;

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
View File

@@ -180,7 +180,9 @@ public class IntegrityServiceImpl implements IntegrityService {
outParam.setType(generalDeviceDTO.getName()); outParam.setType(generalDeviceDTO.getName());
//根据监测点查询数据完整性 //根据监测点查询数据完整性
List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime()); List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue());
double temSingle = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
outParam.setSingle(temSingle == 3.14159 ? temSingle :NumberUtil.round(temSingle, 2).doubleValue());
//如果存在需要比较的时间，再获取对应数据 //如果存在需要比较的时间，再获取对应数据
if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) { if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime()); List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());