diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java index d42076809..4e76c5ecc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/PqTypicalSourceCreateDTO.java @@ -97,4 +97,28 @@ public class PqTypicalSourceCreateDTO { /*平均超标天数 当统计类型是月数据、年数据时必填是否必填：*/ private BigDecimal averageOvDays; + + + private Integer isUploadHead; + /*当年累计月数*/ + private Integer monthsCount; + /*累计闪变超标数*/ + private Integer flickerOvCount; + /*累计谐波电流超标数*/ + private Integer harmiOvCount; + /*累计负序电流超标数*/ + private Integer inseqOvCount; + /*累计三相不平衡超标数*/ + private Integer unbanOvCount; + /*累计谐波电压超标数*/ + private Integer harmvOvCount; + /*累计实现监测数量*/ + private Integer monitorCount; + /*电压等级*/ + private String voltageLevel; + /*累计超标总数*/ + private Integer ovCount; + /*累计干扰源总数*/ + private Integer interferenceSourceCount; + } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java index 904579493..e7f49df67 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/PqTypicalSourceCreatePO.java @@ -126,4 +126,27 @@ public class PqTypicalSourceCreatePO { */ @TableField(value = "is_upload_head") private Integer isUploadHead; + @TableField("monthsCount") + private Integer monthsCount; + @TableField("flickerOvCount") + private Integer flickerOvCount; + @TableField("harmiOvCount") + private Integer harmiOvCount; + @TableField("inseqOvCount") + private Integer inseqOvCount; + @TableField("unbanOvCount") + private Integer unbanOvCount; + @TableField("harmvOvCount") + private Integer harmvOvCount; + @TableField("monitorCount") + private Integer monitorCount; + @TableField("voltageLevel") + private String voltageLevel; + @TableField("ovCount") + private Integer ovCount; + @TableField("interferenceSourceCount") + private Integer interferenceSourceCount; + + + } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java index 154b8ced0..73b037318 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -124,6 +124,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl{ SendParam sendParam = new SendParam(); sendParam.setStats(temp); + sendParam.setStatisticalDate(temp.get(0).getStatisticalDate()); String s = JSONObject.toJSONStringWithDateFormat(sendParam, JSON.DEFFAULT_DATE_FORMAT); log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); Map send = GwSendUtil.send(sendParam, GWSendEnum.TYPICAL_SOURCE); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/PmsStatisticsSpecialMonitorServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/PmsStatisticsSpecialMonitorServiceImpl.java index 9e68716f0..c5656bdb0 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/PmsStatisticsSpecialMonitorServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/PmsStatisticsSpecialMonitorServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.newalgorithm.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.utils.PubUtils; @@ -16,9 +17,9 @@ import com.njcn.prepare.harmonic.service.mysql.newalgorithm.IPmsStatisticsSpecia import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -35,13 +36,14 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor +@Slf4j public class PmsStatisticsSpecialMonitorServiceImpl extends MppServiceImpl implements IPmsStatisticsSpecialMonitorService { private final CommTerminalGeneralClient commTerminalGeneralClient; private final DeptFeignClient deptFeignClient; @Override @Async("asyncExecutor") - @Transactional(rollbackFor = {Exception.class}) +// @Transactional(rollbackFor = {Exception.class}) public void pmsStatisticsSpecialMonitorHandler(LineParam jobParam) { List info=new ArrayList<>(); Dept dept = deptFeignClient.getRootDept().getData(); @@ -66,6 +68,7 @@ public class PmsStatisticsSpecialMonitorServiceImpl extends MppServiceImpl queryWrapper = new QueryWrapper<>(); QueryWrapper rMpSurplusHarmonicDetailDQueryWrapper = new QueryWrapper<>(); + List sysdictreepo = dictTreeFeignClient.queryAll().getData(); + List other_interferencesource_users = Stream.of(DicDataEnum.SEMICONDUCTOR_MANUFACTURING.getCode(), + DicDataEnum.PRECISION_MACHINING.getCode(), + DicDataEnum.PARTY_GOVERNMENT.getCode(), + DicDataEnum.NOSOCOMIUM.getCode(), + DicDataEnum.TRANSPORTATION_HUB.getCode(), + DicDataEnum.AERODROME.getCode(), + DicDataEnum.FINANCE.getCode(), + DicDataEnum.DATA_CENTER.getCode(), + DicDataEnum.HAZARDOUS_CHEMICALS.getCode(), + DicDataEnum.EXPLOSIVE_PRODUCTS.getCode(), + DicDataEnum.LARGEVENUE.getCode() + ).collect(Collectors.toList()); + List windfarm_user = Stream.of( + DicDataEnum.WINDPOWER_STATION.getCode()).collect(Collectors.toList()); + List photovoltaicsit_eusers = Stream.of( + DicDataEnum.PHOTOVOLTAIC_POWER_STATION.getCode()).collect(Collectors.toList()); + List tractionstation = Stream.of( + DicDataEnum.ELECTRIFIED_RAILWAY.getCode()).collect(Collectors.toList()); + + /*3.45 典型源荷用户类型*/ + List collect = Stream.of(DicDataEnum.TRACTIONSTATION.getCode(), + DicDataEnum.WINDFARM_USER.getCode(), + DicDataEnum.PHOTOVOLTAICSIT_EUSERS.getCode(), + DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode()).collect(Collectors.toList()); + + List other_interferencesource_users_dict = sysdictreepo.stream().filter(temp -> other_interferencesource_users.contains(temp.getCode())).collect(Collectors.toList()); + List windfarm_user_dict = sysdictreepo.stream().filter(temp -> windfarm_user.contains(temp.getCode())).collect(Collectors.toList()); + List photovoltaicsit_eusers_dict = sysdictreepo.stream().filter(temp -> photovoltaicsit_eusers.contains(temp.getCode())).collect(Collectors.toList()); + List tractionstation_dict = sysdictreepo.stream().filter(temp -> tractionstation.contains(temp.getCode())).collect(Collectors.toList()); List deptList = deptFeignClient.allDeptList().getData(); Map mapCode = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getCode, Function.identity())); Map mapList = deptList.stream().collect(Collectors.toMap(PvTerminalTreeVO::getId, Function.identity())); - List indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode( - DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); +// List indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode( +// DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); + + List supvVoltageDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); + Map mapVoltage = supvVoltageDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : calculatedParam.getIdList()) { List collect1 = deptGetChildrenMoreDTO.getLineBaseList().stream().filter(temp->Objects.equals(temp.getIsUpToGrid(),1)).map(LineDevGetDTO::getPointId).collect(Collectors.toList()); - - - //站内有效监测点数量 - Integer effectiveMonitorNum; - - List rMpPartHarmonicDetailDS; - List rMpSurplusHarmonicDetailDS; + List monitorList; if (!CollectionUtils.isEmpty(collect1)) { - List list = rOperatingMonitorService.lambdaQuery(). - in(ROperatingMonitorDPO::getMeasurementPointId, collect1). - eq(ROperatingMonitorDPO::getDataDate, calculatedParam.getDataDate()). - ge(ROperatingMonitorDPO::getDataIntegrityRate, 0.95). - eq(ROperatingMonitorDPO::getIsUnusual, 1).list(); - effectiveMonitorNum = list.size(); - - queryWrapper.clear(); - queryWrapper. - in("measurement_point_id",collect1). - eq("data_date",localDate); - rMpPartHarmonicDetailDS = rMpPartHarmonicDetailDMapper.selectList(queryWrapper); - - rMpSurplusHarmonicDetailDQueryWrapper.clear(); - rMpSurplusHarmonicDetailDQueryWrapper. - in("measurement_point_id",collect1). - eq("data_date",localDate); - rMpSurplusHarmonicDetailDS = rMpSurplusHarmonicDetailDMapper.selectList(rMpSurplusHarmonicDetailDQueryWrapper); - + monitorList = monitorClient.getMonitorList(collect1).getData(); } else { - rMpSurplusHarmonicDetailDS = new ArrayList<>(); - rMpPartHarmonicDetailDS = new ArrayList<>(); - effectiveMonitorNum = 0; + monitorList = new ArrayList<>(); } -// rStatOrgDPOQueryWrapper.clear(); -// rStatOrgDPOQueryWrapper.select("effective_measurement"). -// eq("org_no",deptGetChildrenMoreDTO.getUnitId()). -// eq("data_type",dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()). -// eq("data_date",localDate); -// RStatOrgDPO rStatOrgDPO = rStatOrgDMapper.selectOne(rStatOrgDPOQueryWrapper); + collect.stream().forEach(temp->{ + PqTypicalSourceCreatePO pqTypicalSourceCreatePO = new PqTypicalSourceCreatePO(); - indicatorTypeDate.forEach(dictData -> { - if(Objects.equals(dictData.getCode(), DicDataEnum.HARMONIC_VOLTAGE.getCode())|| - Objects.equals(dictData.getCode(), DicDataEnum.FLICKER.getCode())|| - Objects.equals(dictData.getCode(), DicDataEnum.phase_Voltage.getCode())|| -// Objects.equals(dictData.getCode(), DicDataEnum.HARMONIC_CURRENT.getCode())|| - Objects.equals(dictData.getCode(), DicDataEnum.NEG_CURRENT.getCode() - )){ - PqTypicalSourceCreatePO pqTypicalSourceCreatePO = new PqTypicalSourceCreatePO(); - pqTypicalSourceCreatePO = initPqTypicalSourceCreatePO(pqTypicalSourceCreatePO,dictData.getCode(),rMpPartHarmonicDetailDS,rMpSurplusHarmonicDetailDS,collect1.size()); - pqTypicalSourceCreatePO.setStatisticalDate(calculatedParam.getDataDate()); - pqTypicalSourceCreatePO.setStatisticalType("03"); + List tempList = new ArrayList<>(); + if (temp.equals(DicDataEnum.TRACTIONSTATION.getCode())){ + List idList = tractionstation_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); + tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); - pqTypicalSourceCreatePO.setMonitorNum(effectiveMonitorNum); - pqTypicalSourceCreatePO.setMonitoringRate(divideAndRound(effectiveMonitorNum,collect1.size())); + } else if (temp.equals(DicDataEnum.WINDFARM_USER.getCode())) { + List idList = windfarm_user_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); + tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); + }else if(temp.equals(DicDataEnum.PHOTOVOLTAICSIT_EUSERS.getCode())) { + List idList = photovoltaicsit_eusers_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); + tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); - if (mapCode.containsKey(deptGetChildrenMoreDTO.getUnitId())) { - PvTerminalTreeVO pvTerminalTreeVO = mapCode.get(deptGetChildrenMoreDTO.getUnitId()); - String[] split = (pvTerminalTreeVO.getPids() + StrUtil.COMMA + pvTerminalTreeVO.getId()) - .split(StrUtil.COMMA); - if (split.length <3) { - return; + }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) { + List idList = other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); + tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); + + } + + if(CollectionUtils.isEmpty(tempList)){ + return; + }else { + //电站等级 + if (mapVoltage.containsKey(tempList.get(0).getVoltageLevel())) { + pqTypicalSourceCreatePO.setVoltageLevel(String.format("%02d", mapVoltage.get(tempList.get(0).getVoltageLevel()).getAlgoDescribe())); + pqTypicalSourceCreatePO.setIndustryType("01"); + } + + } + List monitorIds = tempList.stream().map(Monitor::getId).collect(Collectors.toList()); + //站内有效监测点数量 + Integer effectiveMonitorNum; + + List rMpPartHarmonicDetailDS; + List rMpSurplusHarmonicDetailDS; + if (!CollectionUtils.isEmpty(monitorIds)) { + List list = rOperatingMonitorService.lambdaQuery(). + in(ROperatingMonitorDPO::getMeasurementPointId, monitorIds). + eq(ROperatingMonitorDPO::getDataDate, calculatedParam.getDataDate()). + ge(ROperatingMonitorDPO::getDataIntegrityRate, 0.95). + eq(ROperatingMonitorDPO::getIsUnusual, 1).list(); + effectiveMonitorNum = list.size(); + + queryWrapper.clear(); + queryWrapper. + in("measurement_point_id",monitorIds). + eq("data_date",localDate); + rMpPartHarmonicDetailDS = rMpPartHarmonicDetailDMapper.selectList(queryWrapper); + + rMpSurplusHarmonicDetailDQueryWrapper.clear(); + rMpSurplusHarmonicDetailDQueryWrapper. + in("measurement_point_id",monitorIds). + eq("data_date",localDate); + rMpSurplusHarmonicDetailDS = rMpSurplusHarmonicDetailDMapper.selectList(rMpSurplusHarmonicDetailDQueryWrapper); + + } else { + rMpSurplusHarmonicDetailDS = new ArrayList<>(); + rMpPartHarmonicDetailDS = new ArrayList<>(); + effectiveMonitorNum = 0; + } + pqTypicalSourceCreatePO = initPqTypicalSourceCreatePO(pqTypicalSourceCreatePO,rMpPartHarmonicDetailDS,rMpSurplusHarmonicDetailDS,collect1.size()); + pqTypicalSourceCreatePO.setIndexType(temp); + pqTypicalSourceCreatePO.setStatisticalDate(calculatedParam.getDataDate()); + pqTypicalSourceCreatePO.setStatisticalType("03"); + pqTypicalSourceCreatePO.setMonitorNum(effectiveMonitorNum); + pqTypicalSourceCreatePO.setMonitorCount(effectiveMonitorNum); + pqTypicalSourceCreatePO.setMonitoringRate(divideAndRound(effectiveMonitorNum,collect1.size())); + if (mapCode.containsKey(deptGetChildrenMoreDTO.getUnitId())) { + PvTerminalTreeVO pvTerminalTreeVO = mapCode.get(deptGetChildrenMoreDTO.getUnitId()); + String[] split = (pvTerminalTreeVO.getPids() + StrUtil.COMMA + pvTerminalTreeVO.getId()) + .split(StrUtil.COMMA); + if (split.length <3) { + return; + } + + for (int i = 2; i < split.length; i++) { + //省 + if (i == 2) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setProvinceName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setProvinceId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("3"); + } } + //市 + if (i == 3) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setCityName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setCityId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("4"); - for (int i = 2; i < split.length; i++) { - //省 - if (i == 2) { - if (mapList.containsKey(split[i])) { - pvTerminalTreeVO = mapList.get(split[i]); - pqTypicalSourceCreatePO.setProvinceName(pvTerminalTreeVO.getName()); - pqTypicalSourceCreatePO.setProvinceId(pvTerminalTreeVO.getCode()); - pqTypicalSourceCreatePO.setStatisticalLevel("3"); - } } - //市 - if (i == 3) { - if (mapList.containsKey(split[i])) { - pvTerminalTreeVO = mapList.get(split[i]); - pqTypicalSourceCreatePO.setCityName(pvTerminalTreeVO.getName()); - pqTypicalSourceCreatePO.setCityId(pvTerminalTreeVO.getCode()); - pqTypicalSourceCreatePO.setStatisticalLevel("4"); + } + //县 + if (i == 4) { + if (mapList.containsKey(split[i])) { + pvTerminalTreeVO = mapList.get(split[i]); + pqTypicalSourceCreatePO.setCountyName(pvTerminalTreeVO.getName()); + pqTypicalSourceCreatePO.setCountyId(pvTerminalTreeVO.getCode()); + pqTypicalSourceCreatePO.setStatisticalLevel("5"); - } - } - //县 - if (i == 4) { - if (mapList.containsKey(split[i])) { - pvTerminalTreeVO = mapList.get(split[i]); - pqTypicalSourceCreatePO.setCountyName(pvTerminalTreeVO.getName()); - pqTypicalSourceCreatePO.setCountyId(pvTerminalTreeVO.getCode()); - pqTypicalSourceCreatePO.setStatisticalLevel("5"); - - } } } } - pqTypicalSourceCreatePO.setId(deptGetChildrenMoreDTO.getUnitId()+"-"+pqTypicalSourceCreatePO.getIndexType()+"-"+calculatedParam.getDataDate()); - pqTypicalSourceCreatePOList.add(pqTypicalSourceCreatePO); } + pqTypicalSourceCreatePO.setId(deptGetChildrenMoreDTO.getUnitId()+"-"+pqTypicalSourceCreatePO.getIndexType()+"-"+calculatedParam.getDataDate()); + pqTypicalSourceCreatePOList.add(pqTypicalSourceCreatePO); + }); @@ -190,8 +251,9 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl rMpPartHarmonicDetailDS, List rMpSurplusHarmonicDetailDS, int count) { @@ -231,44 +293,45 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpltemp.getIsFlicker()==1).count()+""); - pqTypicalSourceCreatePO.setFlickerOvNum(value); - pqTypicalSourceCreatePO.setFlickerOvRate(divideAndRound(value,count)); - pqTypicalSourceCreatePO.setFlickerAvgOvRate(divideAndRound(value,count)); + int flickervalue = Integer.valueOf(rMpSurplusHarmonicDetailDS.stream().filter(temp ->temp.getIsFlicker()==1).count()+""); + pqTypicalSourceCreatePO.setFlickerOvNum(flickervalue); + pqTypicalSourceCreatePO.setFlickerOvRate(divideAndRound(flickervalue,count)); + pqTypicalSourceCreatePO.setFlickerAvgOvRate(divideAndRound(flickervalue,count)); - } else if (Objects.equals(code,DicDataEnum.NEG_CURRENT.getCode())) { - pqTypicalSourceCreatePO.setIndexType("06"); - int value = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsINeg()==1).count()+""); - pqTypicalSourceCreatePO.setInseqOvNum(value); - pqTypicalSourceCreatePO.setInseqOvRate(divideAndRound(value,count)); - pqTypicalSourceCreatePO.setInseqAvgOvRate(divideAndRound(value,count)); + int neg_currentvalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsINeg()==1).count()+""); - } -// else if (Objects.equals(code,DicDataEnum.HARMONIC_CURRENT.getCode())) { -// pqTypicalSourceCreatePO.setIndexType("02"); -// -// } - else if (Objects.equals(code,DicDataEnum.phase_Voltage.getCode())) { - int value = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsUnbalance()==1).count()+""); + pqTypicalSourceCreatePO.setInseqOvNum(neg_currentvalue); + pqTypicalSourceCreatePO.setInseqOvRate(divideAndRound(neg_currentvalue,count)); + pqTypicalSourceCreatePO.setInseqAvgOvRate(divideAndRound(neg_currentvalue,count)); - pqTypicalSourceCreatePO.setIndexType("03"); - pqTypicalSourceCreatePO.setUnbanOvNum(value); - pqTypicalSourceCreatePO.setUnbanOvRate(divideAndRound(value,count)); - pqTypicalSourceCreatePO.setUnbanAvgOvRate(divideAndRound(value,count)); + int phase_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsUnbalance()==1).count()+""); - } else if (Objects.equals(code,DicDataEnum.HARMONIC_VOLTAGE.getCode())) { - int value = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsV()==1).count()+""); - pqTypicalSourceCreatePO.setIndexType("01"); - pqTypicalSourceCreatePO.setVOvNum(value); - pqTypicalSourceCreatePO.setVOvRate(divideAndRound(value,count)); - pqTypicalSourceCreatePO.setVAvgOvRate(divideAndRound(value,count)); + pqTypicalSourceCreatePO.setUnbanOvNum(phase_voltagevalue); + pqTypicalSourceCreatePO.setUnbanOvRate(divideAndRound(phase_voltagevalue,count)); + pqTypicalSourceCreatePO.setUnbanAvgOvRate(divideAndRound(phase_voltagevalue,count)); + + int harmonic_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsV()==1).count()+""); + + pqTypicalSourceCreatePO.setVOvNum(harmonic_voltagevalue); + pqTypicalSourceCreatePO.setVOvRate(divideAndRound(harmonic_voltagevalue,count)); + pqTypicalSourceCreatePO.setVAvgOvRate(divideAndRound(harmonic_voltagevalue,count)); + + int harmonic_Ivalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsI()==1).count()+""); + + + + pqTypicalSourceCreatePO.setFlickerOvCount(flickervalue); + pqTypicalSourceCreatePO.setHarmiOvCount(harmonic_Ivalue); + pqTypicalSourceCreatePO.setInseqOvCount(inseqOvNum); + pqTypicalSourceCreatePO.setUnbanOvCount(phase_voltagevalue); + pqTypicalSourceCreatePO.setHarmvOvCount(harmonic_voltagevalue); + + pqTypicalSourceCreatePO.setOvCount(ovNum); + pqTypicalSourceCreatePO.setInterferenceSourceCount(count); - } return pqTypicalSourceCreatePO; } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 5072ad184..13b3a0d75 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -515,7 +515,34 @@ public enum DicDataEnum { Nocarried("未开展","Nocarried"), Progressing("开展中","Progressing"), Reviewing("待审核","Reviewing"), - Completed("已完成","Completed") + Completed("已完成","Completed"), + + /*3.45 典型源荷用户类型*/ + TRACTIONSTATION("牵引站","01"), + WINDFARM_USER("风电场用户","02"), + PHOTOVOLTAICSIT_EUSERS("光伏场站用户","03"), + OTHER_INTERFERENCESOURCE_USERS("其他干扰源用户","04"), + + /*3.39 监测对象类型-大类*/ + SEMICONDUCTOR_MANUFACTURING("半导体制造","2401"), + PRECISION_MACHINING("精密加工","2402"), + PARTY_GOVERNMENT("党政机关","2403"), + NOSOCOMIUM("医院","2404"), + TRANSPORTATION_HUB("交通枢纽（公交场站、客运站、火车站等）","2405"), + AERODROME("机场","2406"), + FINANCE("金融","2407"), + DATA_CENTER("数据中心","2408"), + HAZARDOUS_CHEMICALS("危险化学品","2409"), + EXPLOSIVE_PRODUCTS("易燃易爆品制造","2410"), + LARGEVENUE("大型场馆（体育场、剧院等）","2411"), + WINDPOWER_STATION("风电场","1401"), + PHOTOVOLTAIC_POWER_STATION("光伏电站","1402"), + ELECTRIFIED_RAILWAY("电气化铁路","1300"), + + + + +