1.功能bug调整
2.算法添加部分指标异常数据判断
This commit is contained in:
@@ -31,4 +31,9 @@ public interface RStatDataVDMapper extends BaseMapper<RStatDataVD> {
|
||||
*/
|
||||
List<RStatDataVD> getVthd(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
/**
|
||||
* 获取三相电压不平衡度
|
||||
*/
|
||||
List<RStatDataVD> getUnbalance(@Param("list") List<String> lineList, @Param("startTime") String startTime, @Param("endTime") String endTime);
|
||||
|
||||
}
|
||||
|
||||
@@ -63,4 +63,24 @@
|
||||
`time`,line_id
|
||||
</select>
|
||||
|
||||
<select id="getUnbalance" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
|
||||
select
|
||||
`time` time,
|
||||
line_id lineId,
|
||||
avg(v_unbalance) vUnbalance
|
||||
from
|
||||
r_stat_data_v_d
|
||||
where
|
||||
`time` between #{startTime} and #{endTime}
|
||||
and phasic_type = 'T'
|
||||
and value_type = 'CP95'
|
||||
and line_id IN
|
||||
<foreach collection="list" item="item" separator="," open="(" close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
and quality_flag = 0
|
||||
group by
|
||||
`time`,line_id
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@@ -91,6 +91,7 @@ public class GridServiceImpl implements IGridService {
|
||||
if (lineDetailMap.containsKey(item.getArea())) {
|
||||
AssessVo assessVo = new AssessVo();
|
||||
assessVo.setName(item.getName());
|
||||
assessVo.setCode(item.getCode());
|
||||
List<String> ll = lineDetailMap.get(item.getArea()).stream().map(LineDetail::getId).collect(Collectors.toList());
|
||||
List<PQSComAssesPO> deptAssessList = assesList.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList());
|
||||
List<PqsComasses> communicateList = BeanUtil.copyToList(deptAssessList,PqsComasses.class);
|
||||
@@ -310,6 +311,7 @@ public class GridServiceImpl implements IGridService {
|
||||
List<RStatDataVD> list2 = getList2(lineList,param.getStartTime(),param.getEndTime());
|
||||
List<RStatDataVD> list3 = getList3(lineList,param.getStartTime(),param.getEndTime());
|
||||
List<RStatDataPltDPO> list4 = getList4(lineList,param.getStartTime(),param.getEndTime());
|
||||
List<RStatDataVD> list5 = getList5(lineList,param.getStartTime(),param.getEndTime());
|
||||
if (CollUtil.isNotEmpty(list1)) {
|
||||
List<Double> d = list1.stream().map(o->o.getFreqDev().doubleValue()).collect(Collectors.toList());
|
||||
double avg = d.stream().collect(Collectors.averagingDouble(x->x));
|
||||
@@ -328,7 +330,7 @@ public class GridServiceImpl implements IGridService {
|
||||
vo3.setAvg(PubUtils.doubleRound(2,avg));
|
||||
vo3.setSd(targetSd(d,avg));
|
||||
}
|
||||
if (CollUtil.isNotEmpty(list1)) {
|
||||
if (CollUtil.isNotEmpty(list5)) {
|
||||
List<Double> d = list1.stream().map(o -> o.getVUnbalance().doubleValue()).collect(Collectors.toList());
|
||||
double avg = d.stream().collect(Collectors.averagingDouble(x -> x));
|
||||
vo4.setAvg(PubUtils.doubleRound(2,avg));
|
||||
@@ -545,7 +547,7 @@ public class GridServiceImpl implements IGridService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取监测点频率偏差 T相最大值\获取监测点三相电压不平衡度 T相最大值
|
||||
* 获取监测点频率偏差 T相最大值
|
||||
*/
|
||||
public List<RStatDataVD> getList1(List<String> lineList, String startTime, String endTime) {
|
||||
return statDataVDMapper.getFreqDev(lineList,startTime,endTime);
|
||||
@@ -572,6 +574,13 @@ public class GridServiceImpl implements IGridService {
|
||||
return statDataPltDMapper.getPlt(lineList,startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取监测点三相电压不平衡度 T相 CP95
|
||||
*/
|
||||
public List<RStatDataVD> getList5(List<String> lineList, String startTime, String endTime) {
|
||||
return statDataVDMapper.getUnbalance(lineList,startTime,endTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算标准差
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user