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

1.功能bug调整

Browse Source 
2.算法添加部分指标异常数据判断
This commit is contained in:
xy
2024-05-21 14:01:31 +08:00
parent e2b84c275e
commit 2618f4cc33
7 changed files with 133 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,70 +18,70 @@
<select id="getRunManageList" resultType="com.njcn.device.pq.pojo.vo.RunManageVO">
SELECT
linedetail.Num AS id,
line.NAME AS lineName,
area.NAME AS areaName,
gd.NAME AS gdName,
sub.NAME AS bdName,
scaleId.Name as scale,
manufacturerId.name as manufacturer,
dev.name as devName,
device.IP as ip,
case device.Run_Flag when 0 then "投运"
when 1 then "热备用"
when 2 then "停运"
end as runFlag,
case device.Com_Flag when 0 then "中断"
when 1 then "正常"
end as comFlag,
loadtypeId.Name as loadType,
businesstypeId.name as businessType,
IFNULL(linedetail.Obj_Name,"/") as objName,
case linedetail.PT_Type when 0 then "星型接线"
when 1 then "三角型接线"
when 2 then "开口三角型接线"
end as ptType,
CONCAT(linedetail.PT1,"/", linedetail.PT2) as pt,
CONCAT(linedetail.CT1,"/", linedetail.CT2) as ct,
linedetail.Standard_Capacity as standardCapacity,
linedetail.Short_Capacity as shortCapacity,
linedetail.Dev_Capacity as devCapacity,
linedetail.Deal_Capacity as dealCapacity,
over.Freq_Dev as freqDev,
over.Voltage_Dev as voltageDev,
over.Uvoltage_Dev as uvoltageDev,
over.Ubalance as ubalance,
over.I_Neg as iNeg,
over.Flicker as flicker,
over.Uaberrance as uaberrance,
over.Uharm_3 as oddHarm,
over.Uharm_2 as evenHarm,
over.Iharm_2 as iharm2,
over.Iharm_3 as iharm3,
over.Iharm_4 as iharm4,
over.Iharm_5 as iharm5,
over.Iharm_6 as iharm6,
over.Iharm_7 as iharm7,
over.Iharm_8 as iharm8,
over.Iharm_9 as iharm9,
over.Iharm_10 as iharm10,
over.Iharm_11 as iharm11,
over.Iharm_12 as iharm12,
over.Iharm_13 as iharm13,
over.Iharm_14 as iharm14,
over.Iharm_15 as iharm15,
over.Iharm_16 as iharm16,
over.Iharm_17 as iharm17,
over.Iharm_18 as iharm18,
over.Iharm_19 as iharm19,
over.Iharm_20 as iharm20,
over.Iharm_21 as iharm21,
over.Iharm_22 as iharm22,
over.Iharm_23 as iharm23,
over.Iharm_24 as iharm24,
over.Iharm_25 as iharm25,
over.InUharm_1 as inUharm,
over.InUharm_16 as inUharm16
linedetail.Num AS id,
line.NAME AS lineName,
area.NAME AS areaName,
gd.NAME AS gdName,
sub.NAME AS bdName,
scaleId.Name as scale,
manufacturerId.name as manufacturer,
dev.name as devName,
device.IP as ip,
case device.Run_Flag when 0 then "投运"
when 1 then "热备用"
when 2 then "停运"
end as runFlag,
case device.Com_Flag when 0 then "中断"
when 1 then "正常"
end as comFlag,
loadtypeId.Name as loadType,
businesstypeId.name as businessType,
IFNULL(linedetail.Obj_Name,"/") as objName,
case linedetail.PT_Type when 0 then "星型接线"
when 1 then "三角型接线"
when 2 then "开口三角型接线"
end as ptType,
CONCAT(linedetail.PT1,"/", linedetail.PT2) as pt,
CONCAT(linedetail.CT1,"/", linedetail.CT2) as ct,
linedetail.Standard_Capacity as standardCapacity,
linedetail.Short_Capacity as shortCapacity,
linedetail.Dev_Capacity as devCapacity,
linedetail.Deal_Capacity as dealCapacity,
overlimit.Freq_Dev as freqDev,
overlimit.Voltage_Dev as voltageDev,
overlimit.Uvoltage_Dev as uvoltageDev,
overlimit.Ubalance as ubalance,
overlimit.I_Neg as iNeg,
overlimit.Flicker as flicker,
overlimit.Uaberrance as uaberrance,
overlimit.Uharm_3 as oddHarm,
overlimit.Uharm_2 as evenHarm,
overlimit.Iharm_2 as iharm2,
overlimit.Iharm_3 as iharm3,
overlimit.Iharm_4 as iharm4,
overlimit.Iharm_5 as iharm5,
overlimit.Iharm_6 as iharm6,
overlimit.Iharm_7 as iharm7,
overlimit.Iharm_8 as iharm8,
overlimit.Iharm_9 as iharm9,
overlimit.Iharm_10 as iharm10,
overlimit.Iharm_11 as iharm11,
overlimit.Iharm_12 as iharm12,
overlimit.Iharm_13 as iharm13,
overlimit.Iharm_14 as iharm14,
overlimit.Iharm_15 as iharm15,
overlimit.Iharm_16 as iharm16,
overlimit.Iharm_17 as iharm17,
overlimit.Iharm_18 as iharm18,
overlimit.Iharm_19 as iharm19,
overlimit.Iharm_20 as iharm20,
overlimit.Iharm_21 as iharm21,
overlimit.Iharm_22 as iharm22,
overlimit.Iharm_23 as iharm23,
overlimit.Iharm_24 as iharm24,
overlimit.Iharm_25 as iharm25,
overlimit.InUharm_1 as inUharm,
overlimit.InUharm_16 as inUharm16
FROM pq_line line
INNER JOIN pq_line vol ON vol.Id = line.Pid
INNER JOIN pq_line dev ON dev.Id = vol.Pid
@@ -89,7 +89,7 @@
INNER JOIN pq_line gd ON gd.Id = sub.Pid
INNER JOIN pq_line areaId ON areaId.Id = gd.Pid
INNER JOIN sys_area area ON area.Id = areaId.NAME
INNER JOIN pq_overlimit over ON over.Id = line.Id
INNER JOIN pq_overlimit overlimit ON overlimit.Id = line.Id
INNER JOIN pq_voltage voltage ON voltage.Id = vol.Id
INNER JOIN sys_dict_data scaleId ON scaleId.Id = voltage.Scale
INNER JOIN pq_device device ON device.Id = dev.Id
@@ -114,10 +114,10 @@
OR line.NAME LIKE #{searchValueLike}
</if>
ORDER BY
gdName,
bdName,
devNAME,
objName;
gdName,
bdName,
devNAME,
objName;
</select>
<select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO">

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

@@ -74,7 +74,7 @@ public class RunManageServiceImpl implements RunManageService {
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, runManageParam.getRunFlag(), Stream.of(1).collect(Collectors.toList()));
List<String> lineIndexes = generalDeviceDTOList.stream().flatMap(list -> list.getLineIndexes().stream()).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(lineIndexes)) {
return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(), runManageParam.getSearchValue());
return deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
} else {
return new ArrayList<>();
}