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

1.算法调整

Browse Source 
2.bug修改
This commit is contained in:
wr
2024-03-14 18:04:45 +08:00
parent c9e369e7bd
commit fd57278abe
9 changed files with 226 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixWireController.java
View File

@@ -163,11 +163,7 @@ public class PmsGeneratrixWireController extends BaseController {
public HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(@RequestBody @Validated PmsGeneratrixParam param) { public HttpResult<List<GeneratrixAndPowerStationDTO>> getGeneratrixAndPowerStationInfo(@RequestBody @Validated PmsGeneratrixParam param) {
String methodDescribe = getMethodDescribe("getGeneratrixAndPowerStationInfo"); String methodDescribe = getMethodDescribe("getGeneratrixAndPowerStationInfo");
List<GeneratrixAndPowerStationDTO> monitorInfo = iGeneratrixWireService.getGeneratrixAndPowerStationInfo(param); List<GeneratrixAndPowerStationDTO> monitorInfo = iGeneratrixWireService.getGeneratrixAndPowerStationInfo(param);
if (CollectionUtil.isEmpty(monitorInfo)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorInfo, methodDescribe);
}
} }
/** /**

85
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageMMapper.xml
View File

@@ -17,8 +17,7 @@
</resultMap> </resultMap>
<select id="getMstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO"> <select id="getMstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
SELECT aa.org_no, SELECT aa.org_no,
aa.station_name powerStationName, aa.busbarId ,
aa.scale busbarVoltageLevel,
ifnull(aa.average,0) average, ifnull(aa.average,0) average,
ifnull(aa.accrued,0) accrued, ifnull(aa.accrued,0) accrued,
ifnull(aa.unbalanceAverage,0) unbalanceAverage, ifnull(aa.unbalanceAverage,0) unbalanceAverage,
@@ -34,68 +33,60 @@
FROM FROM
( (
SELECT b.org_no org_no, SELECT b.org_no org_no,
a.Station_Name station_name, b.busbar_id busbarId,
a.scale scale,
avg(b.v_average) AS average, avg(b.v_average) AS average,
sum(b.v_accrued) AS accrued, sum(b.v_accrued) AS accrued,
avg(b.unbalance_average) unbalanceAverage, avg(b.unbalance_average) unbalanceAverage,
sum(b.unbalance_accrued) unbalanceAccrued, sum(b.unbalance_accrued) unbalanceAccrued,
avg(b.flicker_average) flickerAverage, avg(b.flicker_average) flickerAverage,
sum(b.flicker_average) flickerAccrued sum(b.flicker_average) flickerAccrued
FROM r_stat_org_busbar_voltage_m b, FROM r_stat_org_busbar_voltage_m b
pms_generatrix_wire a <where>
WHERE <if test="param != null and param.ids != null and param.ids.size > 0">
a.id = b.busbar_id AND b.org_no IN
<if test="param != null and param.ids != null and param.ids.size > 0"> <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
AND b.org_no IN #{item}
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> </foreach>
#{item} </if>
</foreach> <if test="param != null and param.startTime != null and param.startTime != ''">
</if> AND b.data_date >= #{param.startTime}
<if test="param != null and param.startTime != null and param.startTime != ''"> </if>
AND b.data_date >= #{param.startTime} <if test="param != null and param.endTime != null and param.endTime != ''">
</if> AND b.data_date &lt;= #{param.endTime}
<if test="param != null and param.endTime != null and param.endTime != ''"> </if>
AND b.data_date &lt;= #{param.endTime} </where>
</if>
GROUP BY org_no, GROUP BY org_no,
station_name, busbar_id
scale ) aa
) aa LEFT JOIN (
LEFT JOIN (
SELECT b.org_no org_no, SELECT b.org_no org_no,
a.Station_Name station_name, b.busbar_id busbarId,
a.scale scale,
avg(b.v_average) AS averageSame, avg(b.v_average) AS averageSame,
sum(b.v_accrued) AS accruedSame, sum(b.v_accrued) AS accruedSame,
avg(b.unbalance_average) unbalanceAverageSame, avg(b.unbalance_average) unbalanceAverageSame,
sum(b.unbalance_accrued) unbalanceAccruedSame, sum(b.unbalance_accrued) unbalanceAccruedSame,
avg(b.flicker_average) flickerAverageSame, avg(b.flicker_average) flickerAverageSame,
sum(b.flicker_average) flickerAccruedSame sum(b.flicker_average) flickerAccruedSame
FROM r_stat_org_busbar_voltage_m b, FROM r_stat_org_busbar_voltage_m b
pms_generatrix_wire a <where>
WHERE <if test="param != null and param.ids != null and param.ids.size > 0">
a.id = b.busbar_id AND b.org_no IN
<if test="param != null and param.ids != null and param.ids.size > 0"> <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
AND b.org_no IN #{item}
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> </foreach>
#{item} </if>
</foreach> <if test="param != null and param.startTime != null and param.startTime != ''">
</if> AND (b.data_date >= date(
<if test="param != null and param.startTime != null and param.startTime != ''">
AND (b.data_date >= date(
DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR))) DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR)))
</if> </if>
<if test="param != null and param.endTime != null and param.endTime != ''"> <if test="param != null and param.endTime != null and param.endTime != ''">
AND (b.data_date &lt;= date( AND (b.data_date &lt;= date(
DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR))) DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR)))
</if> </if>
</where>
GROUP BY b.org_no, GROUP BY b.org_no,
a.Station_Name, b.busbar_id
a.scale ) bb ON aa.org_no = bb.org_no AND aa.busbarId = bb.busbarId
) bb ON aa.org_no = bb.org_no
AND aa.station_name = bb.station_name
AND aa.scale = bb.scale
</select> </select>
</mapper> </mapper>

145
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageQMapper.xml
View File

@@ -17,85 +17,76 @@
</resultMap> </resultMap>
<select id="getQstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO"> <select id="getQstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
SELECT aa.org_no, SELECT aa.org_no,
aa.station_name powerStationName, aa.busbarId ,
aa.scale busbarVoltageLevel, ifnull(aa.average,0) average,
ifnull(aa.average,0) average, ifnull(aa.accrued,0) accrued,
ifnull(aa.accrued,0) accrued, ifnull(aa.unbalanceAverage,0) unbalanceAverage,
ifnull(aa.unbalanceAverage,0) unbalanceAverage, ifnull(aa.unbalanceAccrued,0) unbalanceAccrued,
ifnull(aa.unbalanceAccrued,0) unbalanceAccrued, ifnull(aa.flickerAverage,0) flickerAverage,
ifnull(aa.flickerAverage,0) flickerAverage, ifnull(aa.flickerAccrued,0) flickerAccrued,
ifnull(aa.flickerAccrued,0) flickerAccrued, ifnull(bb.averageSame,0) averageSame,
ifnull(bb.averageSame,0) averageSame, ifnull(bb.accruedSame,0) accruedSame,
ifnull(bb.accruedSame,0) accruedSame, ifnull(bb.unbalanceAverageSame,0) unbalanceAverageSame,
ifnull(bb.unbalanceAverageSame,0) unbalanceAverageSame, ifnull(bb.unbalanceAccruedSame,0) unbalanceAccruedSame,
ifnull(bb.unbalanceAccruedSame,0) unbalanceAccruedSame, ifnull(bb.flickerAverageSame,0) flickerAverageSame,
ifnull(bb.flickerAverageSame,0) flickerAverageSame, ifnull(bb.flickerAccruedSame,0) flickerAccruedSame
ifnull(bb.flickerAccruedSame,0) flickerAccruedSame FROM
FROM (
( SELECT b.org_no org_no,
SELECT b.org_no org_no, b.busbar_id busbarId,
a.Station_Name station_name, avg(b.v_average) AS average,
a.scale scale, sum(b.v_accrued) AS accrued,
avg(b.v_average) AS average, avg(b.unbalance_average) unbalanceAverage,
sum(b.v_accrued) AS accrued, sum(b.unbalance_accrued) unbalanceAccrued,
avg(b.unbalance_average) unbalanceAverage, avg(b.flicker_average) flickerAverage,
sum(b.unbalance_accrued) unbalanceAccrued, sum(b.flicker_average) flickerAccrued
avg(b.flicker_average) flickerAverage, FROM r_stat_org_busbar_voltage_q b
sum(b.flicker_average) flickerAccrued <where>
FROM r_stat_org_busbar_voltage_q b, <if test="param != null and param.ids != null and param.ids.size > 0">
pms_generatrix_wire a AND b.org_no IN
WHERE <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
a.id = b.busbar_id #{item}
<if test="param != null and param.ids != null and param.ids.size > 0"> </foreach>
AND b.org_no IN </if>
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> <if test="param != null and param.startTime != null and param.startTime != ''">
#{item} AND b.data_date >= #{param.startTime}
</foreach> </if>
</if> <if test="param != null and param.endTime != null and param.endTime != ''">
<if test="param != null and param.startTime != null and param.startTime != ''"> AND b.data_date &lt;= #{param.endTime}
AND b.data_date >= #{param.startTime} </if>
</if> </where>
<if test="param != null and param.endTime != null and param.endTime != ''">
AND b.data_date &lt;= #{param.endTime}
</if>
GROUP BY org_no, GROUP BY org_no,
station_name, busbar_id
scale ) aa
) aa LEFT JOIN (
LEFT JOIN ( SELECT b.org_no org_no,
SELECT b.org_no org_no, b.busbar_id busbarId,
a.Station_Name station_name, avg(b.v_average) AS averageSame,
a.scale scale, sum(b.v_accrued) AS accruedSame,
avg(b.v_average) AS averageSame, avg(b.unbalance_average) unbalanceAverageSame,
sum(b.v_accrued) AS accruedSame, sum(b.unbalance_accrued) unbalanceAccruedSame,
avg(b.unbalance_average) unbalanceAverageSame, avg(b.flicker_average) flickerAverageSame,
sum(b.unbalance_accrued) unbalanceAccruedSame, sum(b.flicker_average) flickerAccruedSame
avg(b.flicker_average) flickerAverageSame, FROM r_stat_org_busbar_voltage_q b
sum(b.flicker_average) flickerAccruedSame <where>
FROM r_stat_org_busbar_voltage_q b, <if test="param != null and param.ids != null and param.ids.size > 0">
pms_generatrix_wire a AND b.org_no IN
WHERE <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
a.id = b.busbar_id #{item}
<if test="param != null and param.ids != null and param.ids.size > 0"> </foreach>
AND b.org_no IN </if>
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> <if test="param != null and param.startTime != null and param.startTime != ''">
#{item} AND (b.data_date >= date(
</foreach> DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR)))
</if> </if>
<if test="param != null and param.startTime != null and param.startTime != ''"> <if test="param != null and param.endTime != null and param.endTime != ''">
AND (b.data_date >= date( AND (b.data_date &lt;= date(
DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR))) DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR)))
</if> </if>
<if test="param != null and param.endTime != null and param.endTime != ''"> </where>
AND (b.data_date &lt;= date(
DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR)))
</if>
GROUP BY b.org_no, GROUP BY b.org_no,
a.Station_Name, b.busbar_id
a.scale ) bb ON aa.org_no = bb.org_no AND aa.busbarId = bb.busbarId
) bb ON aa.org_no = bb.org_no
AND aa.station_name = bb.station_name
AND aa.scale = bb.scale
</select> </select>

139
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgBusbarVoltageYMapper.xml
View File

@@ -16,84 +16,75 @@
</resultMap> </resultMap>
<select id="getYstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO"> <select id="getYstatOrgBusbarVoltageVO" resultType="com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO">
SELECT aa.org_no, SELECT aa.org_no,
aa.station_name powerStationName, aa.busbarId ,
aa.scale busbarVoltageLevel, ifnull(aa.average,0) average,
ifnull(aa.average,0) average, ifnull(aa.accrued,0) accrued,
ifnull(aa.accrued,0) accrued, ifnull(aa.unbalanceAverage,0) unbalanceAverage,
ifnull(aa.unbalanceAverage,0) unbalanceAverage, ifnull(aa.unbalanceAccrued,0) unbalanceAccrued,
ifnull(aa.unbalanceAccrued,0) unbalanceAccrued, ifnull(aa.flickerAverage,0) flickerAverage,
ifnull(aa.flickerAverage,0) flickerAverage, ifnull(aa.flickerAccrued,0) flickerAccrued,
ifnull(aa.flickerAccrued,0) flickerAccrued, ifnull(bb.averageSame,0) averageSame,
ifnull(bb.averageSame,0) averageSame, ifnull(bb.accruedSame,0) accruedSame,
ifnull(bb.accruedSame,0) accruedSame, ifnull(bb.unbalanceAverageSame,0) unbalanceAverageSame,
ifnull(bb.unbalanceAverageSame,0) unbalanceAverageSame, ifnull(bb.unbalanceAccruedSame,0) unbalanceAccruedSame,
ifnull(bb.unbalanceAccruedSame,0) unbalanceAccruedSame, ifnull(bb.flickerAverageSame,0) flickerAverageSame,
ifnull(bb.flickerAverageSame,0) flickerAverageSame, ifnull(bb.flickerAccruedSame,0) flickerAccruedSame
ifnull(bb.flickerAccruedSame,0) flickerAccruedSame
FROM FROM
( (
SELECT b.org_no org_no, SELECT b.org_no org_no,
a.Station_Name station_name, b.busbar_id busbarId,
a.scale scale, avg(b.v_average) AS average,
avg(b.v_average) AS average, sum(b.v_accrued) AS accrued,
sum(b.v_accrued) AS accrued, avg(b.unbalance_average) unbalanceAverage,
avg(b.unbalance_average) unbalanceAverage, sum(b.unbalance_accrued) unbalanceAccrued,
sum(b.unbalance_accrued) unbalanceAccrued, avg(b.flicker_average) flickerAverage,
avg(b.flicker_average) flickerAverage, sum(b.flicker_average) flickerAccrued
sum(b.flicker_average) flickerAccrued FROM r_stat_org_busbar_voltage_y b
FROM r_stat_org_busbar_voltage_y b, <where>
pms_generatrix_wire a <if test="param != null and param.ids != null and param.ids.size > 0">
WHERE AND b.org_no IN
a.id = b.busbar_id <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
<if test="param != null and param.ids != null and param.ids.size > 0"> #{item}
AND b.org_no IN </foreach>
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> </if>
#{item} <if test="param != null and param.startTime != null and param.startTime != ''">
</foreach> AND b.data_date >= #{param.startTime}
</if> </if>
<if test="param != null and param.startTime != null and param.startTime != ''"> <if test="param != null and param.endTime != null and param.endTime != ''">
AND b.data_date >= #{param.startTime} AND b.data_date &lt;= #{param.endTime}
</if> </if>
<if test="param != null and param.endTime != null and param.endTime != ''"> </where>
AND b.data_date &lt;= #{param.endTime}
</if>
GROUP BY org_no, GROUP BY org_no,
station_name, busbar_id
scale ) aa
) aa LEFT JOIN (
LEFT JOIN ( SELECT b.org_no org_no,
SELECT b.org_no org_no, b.busbar_id busbarId,
a.Station_Name station_name, avg(b.v_average) AS averageSame,
a.scale scale, sum(b.v_accrued) AS accruedSame,
avg(b.v_average) AS averageSame, avg(b.unbalance_average) unbalanceAverageSame,
sum(b.v_accrued) AS accruedSame, sum(b.unbalance_accrued) unbalanceAccruedSame,
avg(b.unbalance_average) unbalanceAverageSame, avg(b.flicker_average) flickerAverageSame,
sum(b.unbalance_accrued) unbalanceAccruedSame, sum(b.flicker_average) flickerAccruedSame
avg(b.flicker_average) flickerAverageSame, FROM r_stat_org_busbar_voltage_y b
sum(b.flicker_average) flickerAccruedSame <where>
FROM r_stat_org_busbar_voltage_y b, <if test="param != null and param.ids != null and param.ids.size > 0">
pms_generatrix_wire a AND b.org_no IN
WHERE <foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
a.id = b.busbar_id #{item}
<if test="param != null and param.ids != null and param.ids.size > 0"> </foreach>
AND b.org_no IN </if>
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'> <if test="param != null and param.startTime != null and param.startTime != ''">
#{item} AND (b.data_date >= date(
</foreach> DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR)))
</if> </if>
<if test="param != null and param.startTime != null and param.startTime != ''"> <if test="param != null and param.endTime != null and param.endTime != ''">
AND (b.data_date >= date( AND (b.data_date &lt;= date(
DATE_ADD(#{param.startTime}, INTERVAL - 1 YEAR))) DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR)))
</if> </if>
<if test="param != null and param.endTime != null and param.endTime != ''"> </where>
AND (b.data_date &lt;= date(
DATE_ADD(#{param.endTime}, INTERVAL - 1 YEAR)))
</if>
GROUP BY b.org_no, GROUP BY b.org_no,
a.Station_Name, b.busbar_id
a.scale ) bb ON aa.org_no = bb.org_no AND aa.busbarId = bb.busbarId
) bb ON aa.org_no = bb.org_no
AND aa.station_name = bb.station_name
AND aa.scale = bb.scale
</select> </select>
</mapper> </mapper>

43
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java
View File

@@ -1,10 +1,13 @@
package com.njcn.harmonic.service.majornetwork.impl; package com.njcn.harmonic.service.majornetwork.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.constant.BizParamConstant; import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.device.pms.api.PmsGeneratrixClient; import com.njcn.device.pms.api.PmsGeneratrixClient;
import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO;
import com.njcn.device.pms.pojo.param.PmsGeneratrixParam;
import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageMMapper; import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageMMapper;
import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageQMapper; import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageQMapper;
import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageYMapper; import com.njcn.harmonic.mapper.majornetwork.RStatOrgBusbarVoltageYMapper;
@@ -14,10 +17,12 @@ import com.njcn.harmonic.pojo.vo.RStatOrgBusbarVoltageVO;
import com.njcn.harmonic.service.majornetwork.RStatOrgBusbarVoltageService; import com.njcn.harmonic.service.majornetwork.RStatOrgBusbarVoltageService;
import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.web.utils.WebUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
@@ -44,8 +49,7 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbar
@Override @Override
public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) { public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) {
//获取部门信息 //获取部门信息
List<DeptDTO> data = deptFeignClient.getDepSonDetailByDeptId(param.getId()).getData(); List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
Map<String, DeptDTO> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); Map<String, DeptDTO> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));
//获取部门id集合 //获取部门id集合
@@ -73,12 +77,35 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbar
break; break;
} }
} }
temp= temp.stream ().map (rStatOrgBusbarVoltageVO -> { if (CollectionUtil.isNotEmpty(temp)) {
DeptDTO deptDTO = deptMap.get (rStatOrgBusbarVoltageVO.getOrgNo ( )); //获取母线集合
rStatOrgBusbarVoltageVO.setOrgName (deptDTO.getName ()); List<String> busbarIds = temp.stream().map(RStatOrgBusbarVoltageVO::getBusbarId).collect(Collectors.toList());
return rStatOrgBusbarVoltageVO; PmsGeneratrixParam generatrixParam=new PmsGeneratrixParam();
}).collect(Collectors.toList()); generatrixParam.setGeneratrixIds(busbarIds);
return temp; generatrixParam.setGeneratrixVoltageLevel(param.getIds());
List<GeneratrixAndPowerStationDTO> generatrixDTO = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(generatrixParam).getData();
//根据母线信息
Map<String, GeneratrixAndPowerStationDTO> generatrixMap = generatrixDTO.stream().collect(
Collectors.toMap(GeneratrixAndPowerStationDTO::getGeneratrixId, Function.identity()));
Map<String, RStatOrgBusbarVoltageVO> orgMap = temp.stream().collect(Collectors.toMap(x-> x.getOrgNo()+"_"+x.getBusbarId(), Function.identity()));
orgMap.forEach((key, value) -> {
String[] split = key.split("_");
if (deptMap.containsKey(split[0])) {
DeptDTO deptDTO = deptMap.get(split[0]);
value.setOrgName(deptDTO.getName());
if(generatrixMap.containsKey(split[1])){
GeneratrixAndPowerStationDTO dto = generatrixMap.get(split[1]);
value.setBusbarVoltageLevel(dto.getGeneratrixVoltageLevel());
value.setPowerStationName(dto.getPowerName());
info.add(value);
}
}
});
}
if(CollUtil.isNotEmpty(info)){
info.sort(Comparator.comparing(RStatOrgBusbarVoltageVO::getOrgNo));
}
return info;
} }
} }

11
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/RStatOrgBusbarVoltageMServiceImpl.java
View File

@@ -28,7 +28,6 @@ import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.Dept;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -93,14 +92,8 @@ public class RStatOrgBusbarVoltageMServiceImpl extends MppServiceImpl<RStatOrgBu
//获取省级部门ids //获取省级部门ids
Dept dept = deptFeignClient.getRootDept().getData(); Dept dept = deptFeignClient.getRootDept().getData();
String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode(); String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode();
//添加省级数据 this.remove(new LambdaQueryWrapper<RStatOrgBusbarVoltageM>()
List<RStatOrgBusbarVoltageM> provinceData = result .stream().map(object -> { .eq(RStatOrgBusbarVoltageM::getOrgNo,code));
RStatOrgBusbarVoltageM objectNew = new RStatOrgBusbarVoltageM();
BeanUtils.copyProperties(object, objectNew);
objectNew.setOrgNo(code);
return objectNew;
}).collect(Collectors.toList());
result.addAll(provinceData);
this.saveOrUpdateBatchByMultiId(result,1000); this.saveOrUpdateBatchByMultiId(result,1000);
} }
} }

11
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/RStatOrgBusbarVoltageQServiceImpl.java
View File

@@ -28,7 +28,6 @@ import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.Dept;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -93,14 +92,8 @@ public class RStatOrgBusbarVoltageQServiceImpl extends MppServiceImpl<RStatOrgBu
//获取省级部门ids //获取省级部门ids
Dept dept = deptFeignClient.getRootDept().getData(); Dept dept = deptFeignClient.getRootDept().getData();
String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode(); String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode();
//添加省级数据 this.remove(new LambdaQueryWrapper<RStatOrgBusbarVoltageQ>()
List<RStatOrgBusbarVoltageQ> provinceData = result .stream().map(object -> { .eq(RStatOrgBusbarVoltageQ::getOrgNo,code));
RStatOrgBusbarVoltageQ objectNew = new RStatOrgBusbarVoltageQ();
BeanUtils.copyProperties(object, objectNew);
objectNew.setOrgNo(code);
return objectNew;
}).collect(Collectors.toList());
result.addAll(provinceData);
this.saveOrUpdateBatchByMultiId(result,1000); this.saveOrUpdateBatchByMultiId(result,1000);
} }
} }

11
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/RStatOrgBusbarVoltageYServiceImpl.java
View File

@@ -28,7 +28,6 @@ import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient; import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.po.Dept;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -93,14 +92,8 @@ public class RStatOrgBusbarVoltageYServiceImpl extends MppServiceImpl<RStatOrgBu
//获取省级部门ids //获取省级部门ids
Dept dept = deptFeignClient.getRootDept().getData(); Dept dept = deptFeignClient.getRootDept().getData();
String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode(); String code = deptFeignClient.getDepSonDetailByDeptId(dept.getId()).getData().get(0).getCode();
//添加省级数据 this.remove(new LambdaQueryWrapper<RStatOrgBusbarVoltageY>()
List<RStatOrgBusbarVoltageY> provinceData = result .stream().map(object -> { .eq(RStatOrgBusbarVoltageY::getOrgNo,code));
RStatOrgBusbarVoltageY objectNew = new RStatOrgBusbarVoltageY();
BeanUtils.copyProperties(object, objectNew);
objectNew.setOrgNo(code);
return objectNew;
}).collect(Collectors.toList());
result.addAll(provinceData);
this.saveOrUpdateBatchByMultiId(result,1000); this.saveOrUpdateBatchByMultiId(result,1000);
} }
} }

14
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
View File

@@ -620,7 +620,19 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
pqTypicalSourceCreatePO.setVAvgOvRate(initialvalue); pqTypicalSourceCreatePO.setVAvgOvRate(initialvalue);
//稳态指标是否超标(0:否 1:是) //稳态指标是否超标(0:否 1:是)
int ovNum = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsHarmonic()==1).count()+""); Map<String, Integer> collect = rMpSurplusHarmonicDetailDS.stream().collect(Collectors.toMap(RMpSurplusHarmonicDetailD::getMeasurementPointId, RMpSurplusHarmonicDetailD::getIsFlicker));
int ovNum=0;
for (RMpPartHarmonicDetailD detailD : rMpPartHarmonicDetailDS) {
Integer isFlicker=0;
int num = detailD.getIsINeg() + detailD.getIsUnbalance() + detailD.getIsV() + detailD.getIsI();
if(collect.containsKey(detailD.getMeasurementPointId())){
isFlicker = collect.get(detailD.getMeasurementPointId());
}
if(num+isFlicker>0){
ovNum++;
}
}
pqTypicalSourceCreatePO.setOvNum(ovNum); pqTypicalSourceCreatePO.setOvNum(ovNum);
pqTypicalSourceCreatePO.setOvRate(divideAndRound(ovNum,count)); pqTypicalSourceCreatePO.setOvRate(divideAndRound(ovNum,count));
if(ovNum>0){ if(ovNum>0){