diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/EventDetailPmsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/EventDetailPmsService.java new file mode 100644 index 000000000..abe852dd5 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/EventDetailPmsService.java @@ -0,0 +1,21 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.event.pojo.po.EventDetail; + +import java.util.List; + +/** + * @author qijian + * @version 1.0.0 + * @date 2022年12月14日 09:39 + */ +public interface EventDetailPmsService { + + /** + * 根据监测点id和时区时间time获取暂降事件 + * + * @param id 监测点id + * @return 暂降事件详情 + */ + EventDetail getEventDetailByTime(String id, String time); +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/TransientPmsService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/TransientPmsService.java new file mode 100644 index 000000000..7dc9ff7d2 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/TransientPmsService.java @@ -0,0 +1,21 @@ +package com.njcn.device.pms.service.majornetwork; + +import com.njcn.common.pojo.dto.wave.WaveDataDTO; + +/** + * TransientPmsService + * + * @author qijian + * @version 1.0.0 + * @createTime 2022/12/14 - 15:09 + */ +public interface TransientPmsService { + /** + * 功能描述: 暂态事件波形分析 + * @param timeId + * @param lineId + * @param lineType + * @return + */ + WaveDataDTO getTransientAnalyseWavePms(String timeId, String lineId, Integer lineType); +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/EventDetailPmsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/EventDetailPmsServiceImpl.java new file mode 100644 index 000000000..72e9da89a --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/EventDetailPmsServiceImpl.java @@ -0,0 +1,48 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.date.DateUtil; +import com.njcn.device.pms.service.majornetwork.EventDetailPmsService; +import com.njcn.event.pojo.po.EventDetail; +import com.njcn.influxdb.utils.InfluxDbUtils; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.influxdb.dto.QueryResult; +import org.influxdb.impl.InfluxDBResultMapper; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Objects; + +/** + * @author qijian + * @version 1.0.0 + * @date 2022年12月14日 09:39 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class EventDetailPmsServiceImpl implements EventDetailPmsService { + + private final InfluxDbUtils influxDbUtils; + + @Override + public EventDetail getEventDetailByTime(String id, String time) { + EventDetail eventDetail = new EventDetail(); + //组装sql语句 + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append("time = '").append(time).append("' and ").append("line_id ='").append(id).append("' limit 1 tz('Asia/Shanghai')"); + + String sql = "select * from pqs_eventdetail where " + stringBuilder; + //获取暂降事件 + QueryResult result = influxDbUtils.query(sql); + InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); + if (!Objects.isNull(result)) { + List detailList = influxDBResultMapper.toPOJO(result, EventDetail.class); + if (!CollectionUtils.isEmpty(detailList)) { + eventDetail = detailList.get(0); + } + } + return eventDetail; + } +} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientPmsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientPmsServiceImpl.java new file mode 100644 index 000000000..5482a5786 --- /dev/null +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransientPmsServiceImpl.java @@ -0,0 +1,144 @@ +package com.njcn.device.pms.service.majornetwork.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.config.GeneralInfo; +import com.njcn.common.pojo.dto.wave.WaveDataDTO; +import com.njcn.common.pojo.enums.common.ServerEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.PubUtils; +import com.njcn.common.utils.wave.AnalyWave; +import com.njcn.device.pms.api.DistributionMonitorClient; +import com.njcn.device.pms.api.MonitorClient; +import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper; +import com.njcn.device.pms.mapper.majornetwork.MonitorMapper; +import com.njcn.device.pms.mapper.majornetwork.TerminalMapper; +import com.njcn.device.pms.pojo.po.DistributionMonitor; +import com.njcn.device.pms.pojo.po.Monitor; +import com.njcn.device.pms.pojo.po.PmsTerminal; +import com.njcn.device.pms.service.majornetwork.EventDetailPmsService; +import com.njcn.device.pms.service.majornetwork.IMonitorService; +import com.njcn.device.pms.service.majornetwork.TransientPmsService; +import com.njcn.device.pq.api.GeneralDeviceInfoClient; +import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.enums.DeviceResponseEnum; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.vo.AreaLineInfoVO; +import com.njcn.device.pq.pojo.vo.LineDetailDataVO; +import com.njcn.event.enums.EventResponseEnum; +import com.njcn.event.pojo.param.TransientParam; +import com.njcn.event.pojo.param.WaveFileParam; +import com.njcn.event.pojo.po.EventDetail; +import com.njcn.event.pojo.po.EventDetailNew; +import com.njcn.event.pojo.vo.TransientVO; +import com.njcn.influxdb.mapper.InfluxDBResultMapperCn; +import com.njcn.influxdb.param.InfluxDBPublicParam; +import com.njcn.influxdb.utils.InfluxDBCommUtils; +import com.njcn.influxdb.utils.InfluxDbUtils; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import lombok.AllArgsConstructor; +import org.influxdb.dto.QueryResult; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +/** + * @author: chenchao + * @date: 2022/03/29 14:37 + * @Description: <描述> + */ +@Service +@AllArgsConstructor +public class TransientPmsServiceImpl implements TransientPmsService { + + private final GeneralDeviceInfoClient generalDeviceInfoClient; + + private final DicDataFeignClient dicDataFeignClient; + + private final EventDetailPmsService eventDetailPmsService; + + private final GeneralInfo generalInfo; + + private final DistributionMonitorMapper distributionMonitorMapper; + + private final MonitorMapper monitorMapper; + + private final TerminalMapper terminalMapper; + + @Override + public WaveDataDTO getTransientAnalyseWavePms(String timeId, String lineId,Integer lineType) { + //初始化 + WaveDataDTO waveDataDTO; + PmsTerminal pmsTerminal; + DictData dictData; + String ip = null; + String ptTypeName = null; + Float pt1 = null; + Float pt2 = null; + Float ct1 = null; + Float ct2 = null; + + //根据监测点id获取信息（1主网 2配网） + if (lineType == 1){ + Monitor monitor = monitorMapper.selectById(lineId); + //获取ip + pmsTerminal = terminalMapper.selectById(monitor.getTerminalId()); + ip = pmsTerminal.getIp(); + //获取接线方式 + dictData = dicDataFeignClient.getDicDataById(monitor.getTerminalWiringMethod()).getData(); + ptTypeName = dictData.getName(); + //获取pt、ct + pt1 = monitor.getPt1(); + pt2 = monitor.getPt1(); + ct1 = monitor.getCt1(); + ct2 = monitor.getCt2(); + }else{ + DistributionMonitor distributionMonitor = distributionMonitorMapper.selectById(lineId); + //获取ip + pmsTerminal = terminalMapper.selectById(distributionMonitor.getTerminalId()); + ip = pmsTerminal.getIp(); + //获取接线方式 + dictData = dicDataFeignClient.getDicDataById(distributionMonitor.getTerminalWiringMethod()).getData(); + ptTypeName = dictData.getName(); + //获取pt、ct + pt1 = distributionMonitor.getPt1(); + pt2 = distributionMonitor.getPt1(); + ct1 = distributionMonitor.getCt1(); + ct2 = distributionMonitor.getCt2(); + } + + EventDetail eventDetailByTime = eventDetailPmsService.getEventDetailByTime(lineId, timeId); + String waveName = eventDetailByTime.getWaveName(); + + AnalyWave analyWave = new AnalyWave(); + WaveDataDTO comtrade = analyWave.getComtrade(generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + ".CFG", 1); + if (Objects.isNull(comtrade.getComtradeCfgDTO())) { + throw new BusinessException(EventResponseEnum.ANALYSEWAVE_NOT_FOUND); + } + waveDataDTO = analyWave.getValidData(comtrade); + waveDataDTO.setPtType(PubUtils.ptTypeName(ptTypeName)); + waveDataDTO.setPt((double) (pt1 / pt2)); + waveDataDTO.setCt((double) (ct1 / ct2)); + return waveDataDTO; + } + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java new file mode 100644 index 000000000..05105ae27 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/OverviewParam.java @@ -0,0 +1,25 @@ +package com.njcn.harmonic.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * <功能描述> + * + * @author wr + * @createTime: 2022-12-29 + */ +@Data +public class OverviewParam { + + @ApiModelProperty(name = "id", value = "单位id") + private String id; + + @ApiModelProperty(name = "year", value = "年份") + private String year; + + @ApiModelProperty(name = "month", value = "月份") + private List month; +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java new file mode 100644 index 000000000..a303afaca --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/RStatFileVO.java @@ -0,0 +1,35 @@ +package com.njcn.harmonic.pojo.param; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * <功能描述> + * + * @author wr + * @createTime: 2022-12-29 + */ +@Data +public class RStatFileVO implements Serializable { + + @ApiModelProperty(value = "文件id") + private String id; + + @ApiModelProperty(value = "文件内容") + private String fileContent; + +// @ApiModelProperty(value = "删除图片地址") +// private List address; + + @ApiModelProperty(value = "创建用户") + private String createBy; + + @ApiModelProperty(value = "更新用户") + private String updateBy; +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java new file mode 100644 index 000000000..502495fba --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpDevEvaluateDetailPO.java @@ -0,0 +1,60 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/1 9:18【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 终端评价详情表 + */ +@Data +@TableName(value = "r_mp_dev_evaluate_detail") +public class RMpDevEvaluateDetailPO { + /** + * 生成数据的时间,每月统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 终端id + */ + @MppMultiId(value = "device_id") + private String deviceId; + + /** + * 终端指标完整率 + */ + @TableField(value = "dev_target_rate") + private Double devTargetRate; + + /** + * 终端数据完整率 + */ + @TableField(value = "dev_data_rate") + private Double devDataRate; + + /** + * 终端故障及消缺评分 + */ + @TableField(value = "dev_score") + private Double devScore; + + /** + * 终端有效接入率 + */ + @TableField(value = "dev_effective_rate") + private Double devEffectiveRate; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java new file mode 100644 index 000000000..b0a3fd0ea --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailDPO.java @@ -0,0 +1,54 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/28 14:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 监测点暂态指标超标明细日表 + */ +@Data +@TableName(value = "r_mp_event_detail_d") +public class RMpEventDetailDPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 电压暂升发生次数 + */ + @TableField(value = "swell_times") + private Integer swellTimes; + + /** + * 电压暂降发生次数 + */ + @TableField(value = "sag_times") + private Integer sagTimes; + + /** + * 短时中断发生次数 + */ + @TableField(value = "interrupt_times") + private Integer interruptTimes; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java new file mode 100644 index 000000000..4ca2be35e --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailMPO.java @@ -0,0 +1,54 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/28 14:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 监测点暂态指标超标明细月表 + */ +@Data +@TableName(value = "r_mp_event_detail_m") +public class RMpEventDetailMPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 电压暂升发生次数 + */ + @TableField(value = "swell_times") + private Integer swellTimes; + + /** + * 电压暂降发生次数 + */ + @TableField(value = "sag_times") + private Integer sagTimes; + + /** + * 短时中断发生次数 + */ + @TableField(value = "interrupt_times") + private Integer interruptTimes; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java new file mode 100644 index 000000000..d02e219e8 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailQPO.java @@ -0,0 +1,54 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/28 14:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 监测点暂态指标超标明细季表 + */ +@Data +@TableName(value = "r_mp_event_detail_q") +public class RMpEventDetailQPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 电压暂升发生次数 + */ + @TableField(value = "swell_times") + private Integer swellTimes; + + /** + * 电压暂降发生次数 + */ + @TableField(value = "sag_times") + private Integer sagTimes; + + /** + * 短时中断发生次数 + */ + @TableField(value = "interrupt_times") + private Integer interruptTimes; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java new file mode 100644 index 000000000..cb824b520 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpEventDetailYPO.java @@ -0,0 +1,54 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/28 14:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 监测点暂态指标超标明细年表 + */ +@Data +@TableName(value = "r_mp_event_detail_y") +public class RMpEventDetailYPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 电压暂升发生次数 + */ + @TableField(value = "swell_times") + private Integer swellTimes; + + /** + * 电压暂降发生次数 + */ + @TableField(value = "sag_times") + private Integer sagTimes; + + /** + * 短时中断发生次数 + */ + @TableField(value = "interrupt_times") + private Integer interruptTimes; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java index 72150bb77..ad95da66d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpHarmonicVRateReportD.java @@ -1,14 +1,13 @@ package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * * 稳态监测点指标日报-日表(主配网表) /各次谐波电压含有率 @@ -19,1057 +18,1250 @@ import lombok.Data; @Data public class RMpHarmonicVRateReportD implements Serializable { - private static final long serialVersionUID = 1L; - /** * 监测点ID */ - @ApiModelProperty(name = "measurementPointId", value = "监测点id") + @MppMultiId(value = "measurement_point_id") private String measurementPointId; /** * 生成数据的时间,每日统计一次 */ - @ApiModelProperty(name = "dataDate", value = "dataDate") + @MppMultiId(value = "data_date") private Date dataDate; /** * 相别：‘A’ 'B' 'C' 'ABC' 'T' 配网部分相别的数据采用T标志存储 */ - @ApiModelProperty(name = "phase", value = "相别") + @MppMultiId(value = "phase") private String phase; /** * 电压总谐波畸变率-最大值 */ + @TableField(value = "voltage_harmonic_thd_max") private Double voltageHarmonicThdMax; /** * 电压总谐波畸变率-最小值 */ + @TableField(value = "voltage_harmonic_thd_min") private Double voltageHarmonicThdMin; /** * 电压总谐波畸变率-平均值 */ + @TableField(value = "voltage_harmonic_thd_avg") private Double voltageHarmonicThdAvg; /** * 电压总谐波畸变率-95值 */ + @TableField(value = "voltage_harmonic_thd_95") private Double voltageHarmonicThd95; /** * 相（线）电压基波有效值-最大值 */ - @ApiModelProperty(name = "fundamentalVoltageMax", value = "基波电压-最大值") + @TableField(value = "fundamental_voltage_max") private Double fundamentalVoltageMax; /** * 相（线）电压基波有效值-最小值 */ - @ApiModelProperty(name = "fundamentalVoltageMin", value = "基波电压-最小值") + @TableField(value = "fundamental_voltage_min") private Double fundamentalVoltageMin; /** * 相（线）电压基波有效值-平均值 */ - @ApiModelProperty(name = "fundamentalVoltageAvg", value = "基波电压-平均值") + @TableField(value = "fundamental_voltage_avg") private Double fundamentalVoltageAvg; /** * 相（线）电压基波有效值-95值 */ - @ApiModelProperty(name = "fundamentalVoltage95", value = "基波电压-95值") + @TableField(value = "fundamental_voltage_95") private Double fundamentalVoltage95; /** * 2次谐波电压含有率最大值 */ - @ApiModelProperty(name = "harmonicVoltageContent2Max", value = "2次谐波电压含有率最大值") + @TableField(value = "harmonic_voltage_content_2_max") private Double harmonicVoltageContent2Max; /** * 2次谐波电压含有率最小值 */ - @ApiModelProperty(name = "harmonicVoltageContent2Min", value = "2次谐波电压含有率最小值") + @TableField(value = "harmonic_voltage_content_2_min") private Double harmonicVoltageContent2Min; /** * 2次谐波电压含有率平均值 */ - @ApiModelProperty(name = "harmonicVoltageContent2Avg", value = "2次谐波电压含有率平均值") + @TableField(value = "harmonic_voltage_content_2_avg") private Double harmonicVoltageContent2Avg; /** * 2次谐波电压含有率95值 */ - @ApiModelProperty(name = "harmonicVoltageContent295", value = "2次谐波电压含有率95值") + @TableField(value = "harmonic_voltage_content_2_95") private Double harmonicVoltageContent295; /** * 3次谐波电压含有率最大值 */ - @ApiModelProperty(name = "harmonicVoltageContent3Max", value = "3次谐波电压含有率最大值") + @TableField(value = "harmonic_voltage_content_3_max") private Double harmonicVoltageContent3Max; /** * 3次谐波电压含有率最小值 */ - @ApiModelProperty(name = "harmonicVoltageContent3Min", value = "3次谐波电压含有率最小值") + @TableField(value = "harmonic_voltage_content_3_min") private Double harmonicVoltageContent3Min; /** * 3次谐波电压含有率平均值 */ - @ApiModelProperty(name = "harmonicVoltageContent3Avg", value = "3次谐波电压含有率平均值") + @TableField(value = "harmonic_voltage_content_3_avg") private Double harmonicVoltageContent3Avg; /** * 3次谐波电压含有率95值 */ - @ApiModelProperty(name = "harmonicVoltageContent395", value = "3次谐波电压含有率95值") + @TableField(value = "harmonic_voltage_content_3_95") private Double harmonicVoltageContent395; /** * 4次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_4_max") private Double harmonicVoltageContent4Max; /** * 4次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_4_min") private Double harmonicVoltageContent4Min; /** * 4次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_4_avg") private Double harmonicVoltageContent4Avg; /** * 4次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_4_95") private Double harmonicVoltageContent495; /** * 5次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_5_max") private Double harmonicVoltageContent5Max; /** * 5次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_5_min") private Double harmonicVoltageContent5Min; /** * 5次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_5_avg") private Double harmonicVoltageContent5Avg; /** * 5次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_5_95") private Double harmonicVoltageContent595; /** * 6次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_6_max") private Double harmonicVoltageContent6Max; /** * 6次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_6_min") private Double harmonicVoltageContent6Min; /** * 6次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_6_avg") private Double harmonicVoltageContent6Avg; /** * 6次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_6_95") private Double harmonicVoltageContent695; /** * 7次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_7_max") private Double harmonicVoltageContent7Max; /** * 7次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_7_min") private Double harmonicVoltageContent7Min; /** * 7次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_7_avg") private Double harmonicVoltageContent7Avg; /** * 7次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_7_95") private Double harmonicVoltageContent795; /** * 8次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_8_max") private Double harmonicVoltageContent8Max; /** * 8次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_8_min") private Double harmonicVoltageContent8Min; /** * 8次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_8_avg") private Double harmonicVoltageContent8Avg; /** * 8次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_8_95") private Double harmonicVoltageContent895; /** * 9次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_9_max") private Double harmonicVoltageContent9Max; /** * 9次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_9_min") private Double harmonicVoltageContent9Min; /** * 9次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_9_avg") private Double harmonicVoltageContent9Avg; /** * 9次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_9_95") private Double harmonicVoltageContent995; /** * 10次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_10_max") private Double harmonicVoltageContent10Max; /** * 10次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_10_min") private Double harmonicVoltageContent10Min; /** * 10次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_10_avg") private Double harmonicVoltageContent10Avg; /** * 10次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_10_95") private Double harmonicVoltageContent1095; /** * 11次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_11_max") private Double harmonicVoltageContent11Max; /** * 11次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_11_min") private Double harmonicVoltageContent11Min; /** * 11次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_11_avg") private Double harmonicVoltageContent11Avg; /** * 11次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_11_95") private Double harmonicVoltageContent1195; /** * 12次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_12_max") private Double harmonicVoltageContent12Max; /** * 12次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_12_min") private Double harmonicVoltageContent12Min; /** * 12次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_12_avg") private Double harmonicVoltageContent12Avg; /** * 12次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_12_95") private Double harmonicVoltageContent1295; /** * 13次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_13_max") private Double harmonicVoltageContent13Max; /** * 13次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_13_min") private Double harmonicVoltageContent13Min; /** * 13次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_13_avg") private Double harmonicVoltageContent13Avg; /** * 13次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_13_95") private Double harmonicVoltageContent1395; /** * 14次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_14_max") private Double harmonicVoltageContent14Max; /** * 14次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_14_min") private Double harmonicVoltageContent14Min; /** * 14次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_14_avg") private Double harmonicVoltageContent14Avg; /** * 14次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_14_95") private Double harmonicVoltageContent1495; /** * 15次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_15_max") private Double harmonicVoltageContent15Max; /** * 15次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_15_min") private Double harmonicVoltageContent15Min; /** * 15次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_15_avg") private Double harmonicVoltageContent15Avg; /** * 15次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_15_95") private Double harmonicVoltageContent1595; /** * 16次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_16_max") private Double harmonicVoltageContent16Max; /** * 16次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_16_min") private Double harmonicVoltageContent16Min; /** * 16次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_16_avg") private Double harmonicVoltageContent16Avg; /** * 16次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_16_95") private Double harmonicVoltageContent1695; /** * 17次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_17_max") private Double harmonicVoltageContent17Max; /** * 17次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_17_min") private Double harmonicVoltageContent17Min; /** * 17次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_17_avg") private Double harmonicVoltageContent17Avg; /** * 17次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_17_95") private Double harmonicVoltageContent1795; /** * 18次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_18_max") private Double harmonicVoltageContent18Max; /** * 18次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_18_min") private Double harmonicVoltageContent18Min; /** * 18次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_18_avg") private Double harmonicVoltageContent18Avg; /** * 18次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_18_95") private Double harmonicVoltageContent1895; /** * 19次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_19_max") private Double harmonicVoltageContent19Max; /** * 19次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_19_min") private Double harmonicVoltageContent19Min; /** * 19次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_19_avg") private Double harmonicVoltageContent19Avg; /** * 19次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_19_95") private Double harmonicVoltageContent1995; /** * 20次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_20_max") private Double harmonicVoltageContent20Max; /** * 20次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_20_min") private Double harmonicVoltageContent20Min; /** * 20次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_20_avg") private Double harmonicVoltageContent20Avg; /** * 20次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_20_95") private Double harmonicVoltageContent2095; /** * 21次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_21_max") private Double harmonicVoltageContent21Max; /** * 21次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_21_min") private Double harmonicVoltageContent21Min; /** * 21次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_21_avg") private Double harmonicVoltageContent21Avg; /** * 21次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_21_95") private Double harmonicVoltageContent2195; /** * 22次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_22_max") private Double harmonicVoltageContent22Max; /** * 22次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_22_min") private Double harmonicVoltageContent22Min; /** * 22次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_22_avg") private Double harmonicVoltageContent22Avg; /** * 22次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_22_95") private Double harmonicVoltageContent2295; /** * 23次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_23_max") private Double harmonicVoltageContent23Max; /** * 23次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_23_min") private Double harmonicVoltageContent23Min; /** * 23次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_23_avg") private Double harmonicVoltageContent23Avg; /** * 23次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_23_95") private Double harmonicVoltageContent2395; /** * 24次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_24_max") private Double harmonicVoltageContent24Max; /** * 24次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_24_min") private Double harmonicVoltageContent24Min; /** * 24次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_24_avg") private Double harmonicVoltageContent24Avg; /** * 24次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_24_95") private Double harmonicVoltageContent2495; /** * 25次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_25_max") private Double harmonicVoltageContent25Max; /** * 25次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_25_min") private Double harmonicVoltageContent25Min; /** * 25次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_25_avg") private Double harmonicVoltageContent25Avg; /** * 25次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_25_95") private Double harmonicVoltageContent2595; /** * 26次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_26_max") private Double harmonicVoltageContent26Max; /** * 26次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_26_min") private Double harmonicVoltageContent26Min; /** * 26次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_26_avg") private Double harmonicVoltageContent26Avg; /** * 26次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_26_95") private Double harmonicVoltageContent2695; /** * 27次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_27_max") private Double harmonicVoltageContent27Max; /** * 27次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_27_min") private Double harmonicVoltageContent27Min; /** * 27次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_27_avg") private Double harmonicVoltageContent27Avg; /** * 27次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_27_95") private Double harmonicVoltageContent2795; /** * 28次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_28_max") private Double harmonicVoltageContent28Max; /** * 28次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_28_min") private Double harmonicVoltageContent28Min; /** * 28次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_28_avg") private Double harmonicVoltageContent28Avg; /** * 28次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_28_95") private Double harmonicVoltageContent2895; /** * 29次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_29_max") private Double harmonicVoltageContent29Max; /** * 29次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_29_min") private Double harmonicVoltageContent29Min; /** * 29次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_29_avg") private Double harmonicVoltageContent29Avg; /** * 29次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_29_95") private Double harmonicVoltageContent2995; /** * 30次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_30_max") private Double harmonicVoltageContent30Max; /** * 30次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_30_min") private Double harmonicVoltageContent30Min; /** * 30次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_30_avg") private Double harmonicVoltageContent30Avg; /** * 30次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_30_95") private Double harmonicVoltageContent3095; /** * 31次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_31_max") private Double harmonicVoltageContent31Max; /** * 31次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_31_min") private Double harmonicVoltageContent31Min; /** * 31次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_31_avg") private Double harmonicVoltageContent31Avg; /** * 31次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_31_95") private Double harmonicVoltageContent3195; /** * 32次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_32_max") private Double harmonicVoltageContent32Max; /** * 32次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_32_min") private Double harmonicVoltageContent32Min; /** * 32次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_32_avg") private Double harmonicVoltageContent32Avg; /** * 32次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_32_95") private Double harmonicVoltageContent3295; /** * 33次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_33_max") private Double harmonicVoltageContent33Max; /** * 33次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_33_min") private Double harmonicVoltageContent33Min; /** * 33次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_33_avg") private Double harmonicVoltageContent33Avg; /** * 33次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_33_95") private Double harmonicVoltageContent3395; /** * 34次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_34_max") private Double harmonicVoltageContent34Max; /** * 34次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_34_min") private Double harmonicVoltageContent34Min; /** * 34次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_34_avg") private Double harmonicVoltageContent34Avg; /** * 34次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_34_95") private Double harmonicVoltageContent3495; /** * 35次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_35_max") private Double harmonicVoltageContent35Max; /** * 35次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_35_min") private Double harmonicVoltageContent35Min; /** * 35次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_35_avg") private Double harmonicVoltageContent35Avg; /** * 35次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_35_95") private Double harmonicVoltageContent3595; /** * 36次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_36_max") private Double harmonicVoltageContent36Max; /** * 36次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_36_min") private Double harmonicVoltageContent36Min; /** * 36次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_36_avg") private Double harmonicVoltageContent36Avg; /** * 36次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_36_95") private Double harmonicVoltageContent3695; /** * 37次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_37_max") private Double harmonicVoltageContent37Max; /** * 37次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_37_min") private Double harmonicVoltageContent37Min; /** * 37次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_37_avg") private Double harmonicVoltageContent37Avg; /** * 37次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_37_95") private Double harmonicVoltageContent3795; /** * 38次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_38_max") private Double harmonicVoltageContent38Max; /** * 38次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_38_min") private Double harmonicVoltageContent38Min; /** * 38次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_38_avg") private Double harmonicVoltageContent38Avg; /** * 38次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_38_95") private Double harmonicVoltageContent3895; /** * 39次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_39_max") private Double harmonicVoltageContent39Max; /** * 39次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_39_min") private Double harmonicVoltageContent39Min; /** * 39次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_39_avg") private Double harmonicVoltageContent39Avg; /** * 39次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_39_95") private Double harmonicVoltageContent3995; /** * 40次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_40_max") private Double harmonicVoltageContent40Max; /** * 40次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_40_min") private Double harmonicVoltageContent40Min; /** * 40次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_40_avg") private Double harmonicVoltageContent40Avg; /** * 40次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_40_95") private Double harmonicVoltageContent4095; /** * 41次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_41_max") private Double harmonicVoltageContent41Max; /** * 41次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_41_min") private Double harmonicVoltageContent41Min; /** * 41次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_41_avg") private Double harmonicVoltageContent41Avg; /** * 41次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_41_95") private Double harmonicVoltageContent4195; /** * 42次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_42_max") private Double harmonicVoltageContent42Max; /** * 42次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_42_min") private Double harmonicVoltageContent42Min; /** * 42次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_42_avg") private Double harmonicVoltageContent42Avg; /** * 42次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_42_95") private Double harmonicVoltageContent4295; /** * 43次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_43_max") private Double harmonicVoltageContent43Max; /** * 43次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_43_min") private Double harmonicVoltageContent43Min; /** * 43次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_43_avg") private Double harmonicVoltageContent43Avg; /** * 43次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_43_95") private Double harmonicVoltageContent4395; /** * 44次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_44_max") private Double harmonicVoltageContent44Max; /** * 44次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_44_min") private Double harmonicVoltageContent44Min; /** * 44次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_44_avg") private Double harmonicVoltageContent44Avg; /** * 44次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_44_95") private Double harmonicVoltageContent4495; /** * 45次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_45_max") private Double harmonicVoltageContent45Max; /** * 45次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_45_min") private Double harmonicVoltageContent45Min; /** * 45次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_45_avg") private Double harmonicVoltageContent45Avg; /** * 45次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_45_95") private Double harmonicVoltageContent4595; /** * 46次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_46_max") private Double harmonicVoltageContent46Max; /** * 46次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_46_min") private Double harmonicVoltageContent46Min; /** * 46次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_46_avg") private Double harmonicVoltageContent46Avg; /** * 46次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_46_95") private Double harmonicVoltageContent4695; /** * 47次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_47_max") private Double harmonicVoltageContent47Max; /** * 47次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_47_min") private Double harmonicVoltageContent47Min; /** * 47次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_47_avg") private Double harmonicVoltageContent47Avg; /** * 47次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_47_95") private Double harmonicVoltageContent4795; /** * 48次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_48_max") private Double harmonicVoltageContent48Max; /** * 48次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_48_min") private Double harmonicVoltageContent48Min; /** * 48次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_48_avg") private Double harmonicVoltageContent48Avg; /** * 48次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_48_95") private Double harmonicVoltageContent4895; /** * 49次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_49_max") private Double harmonicVoltageContent49Max; /** * 49次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_49_min") private Double harmonicVoltageContent49Min; /** * 49次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_49_avg") private Double harmonicVoltageContent49Avg; /** * 49次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_49_95") private Double harmonicVoltageContent4995; /** * 50次谐波电压含有率最大值 */ + @TableField(value = "harmonic_voltage_content_50_max") private Double harmonicVoltageContent50Max; /** * 50次谐波电压含有率最小值 */ + @TableField(value = "harmonic_voltage_content_50_min") private Double harmonicVoltageContent50Min; /** * 50次谐波电压含有率平均值 */ + @TableField(value = "harmonic_voltage_content_50_avg") private Double harmonicVoltageContent50Avg; /** * 50次谐波电压含有率95值 */ + @TableField(value = "harmonic_voltage_content_50_95") private Double harmonicVoltageContent5095; + @TableField(exist = false) + private static final long serialVersionUID = 1L; + } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java index 4c2b0d055..847b6ec87 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasurePhaseReportD.java @@ -1,15 +1,13 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - /** * * @TableName r_mp_measure_phase_report_d @@ -23,229 +21,259 @@ public class RMpMeasurePhaseReportD implements Serializable { /** * 监测点ID */ - @ApiModelProperty(name = "measurementPointId", value = "监测点id") + @MppMultiId(value = "measurement_point_id") private String measurementPointId; /** * 生成数据的时间,每日统计一次 */ - @ApiModelProperty(name = "dataDate", value = "监测日期") + @MppMultiId(value = "data_date") private Date dataDate; /** * 相别：‘A’ ‘B’ ‘C’ ‘ABC’ ‘T’ 配网部分相别的数据采用T标志存储 */ + @MppMultiId(value = "phase") private String phase; /** * 相电压有效值-最大值 */ + @TableField(value = "phase_voltage_effective_max") private Double phaseVoltageEffectiveMax; /** * 相电压有效值-最小值 */ + @TableField(value = "phase_voltage_effective_min") private Double phaseVoltageEffectiveMin; /** * 相电压有效值-平均值 */ + @TableField(value = "phase_voltage_effective_avg") private Double phaseVoltageEffectiveAvg; /** * 相电压有效值-95值 */ - + @TableField(value = "phase_voltage_effective_95") private Double phaseVoltageEffective95; /** * 线电压有效值-最大值 */ + @TableField(value = "line_voltage_effective_max") private Double lineVoltageEffectiveMax; /** * 线电压有效值-最小值 */ + @TableField(value = "line_voltage_effective_min") private Double lineVoltageEffectiveMin; /** * 线电压有效值-平均值 */ + @TableField(value = "line_voltage_effective_avg") private Double lineVoltageEffectiveAvg; /** * 线电压有效值-95值 */ + @TableField(value = "line_voltage_effective_95") private Double lineVoltageEffective95; /** * 电压上偏差-最大值 */ - @ApiModelProperty(name = "vDeUpMax", value = "电压正偏差-最大值") + @TableField(value = "v_de_up_max") private Double vDeUpMax; /** * 电压上偏差-最小值 */ + @TableField(value = "v_de_up_min") private Double vDeUpMin; /** * 电压上偏差-平均值 */ + @TableField(value = "v_de_up_avg") private Double vDeUpAvg; /** * 电压上偏差-95值 */ + @TableField(value = "v_de_up_95") private Double vDeUp95; /** * 电压下偏差-最大值 */ - @ApiModelProperty(name = "vDeLowMax", value = "电压负偏差-最大值") + @TableField(value = "v_de_low_max") private Double vDeLowMax; /** * 电压下偏差-最小值 */ + @TableField(value = "v_de_low_min") private Double vDeLowMin; /** * 电压下偏差-平均值 */ + @TableField(value = "v_de_low_avg") private Double vDeLowAvg; /** * 电压下偏差-95值 */ + @TableField(value = "v_de_low_95") private Double vDeLow95; /** * 电流有效值-最大值 */ + @TableField(value = "current_effective_max") private Double currentEffectiveMax; /** * 电流有效值-最小值 */ + @TableField(value = "current_effective_min") private Double currentEffectiveMin; /** * 电流有效值-平均值 */ + @TableField(value = "current_effective_avg") private Double currentEffectiveAvg; /** * 电流有效值-95值 */ + @TableField(value = "current_effective_95") private Double currentEffective95; /** * 单相有功功率-最大值 */ + @TableField(value = "sp_active_power_max") private Double spActivePowerMax; /** * 单相有功功率-最小值 */ + @TableField(value = "sp_active_power_min") private Double spActivePowerMin; /** * 单相有功功率-平均值 */ + @TableField(value = "sp_active_power_avg") private Double spActivePowerAvg; /** * 单相有功功率-95值 */ + @TableField(value = "sp_active_power_95") private Double spActivePower95; /** * 单相无功功率-最大值 */ + @TableField(value = "sp_reactive_power_max") private Double spReactivePowerMax; /** * 单相无功功率-最小值 */ + @TableField(value = "sp_reactive_power_min") private Double spReactivePowerMin; /** * 单相无功功率-平均值 */ + @TableField(value = "sp_reactive_power_avg") private Double spReactivePowerAvg; /** * 单相无功功率-95值 */ + @TableField(value = "sp_reactive_power_95") private Double spReactivePower95; /** * 单相视在功率-最大值 */ - @ApiModelProperty(name = "spApparentPowerMax", value = "视在功率-最大值") + @TableField(value = "sp_apparent_power_max") private Double spApparentPowerMax; /** * 单相视在功率-最小值 */ - @ApiModelProperty(name = "spApparentPowerMin", value = "视在功率-最小值") + @TableField(value = "sp_apparent_power_min") private Double spApparentPowerMin; /** * 单相视在功率-平均值 */ - @ApiModelProperty(name = "spApparentPowerAvg", value = "视在功率-平均值") + @TableField(value = "sp_apparent_power_avg") private Double spApparentPowerAvg; /** * 单相视在功率-95值 */ - @ApiModelProperty(name = "spApparentPower95", value = "视在功率-95值") + @TableField(value = "sp_apparent_power_95") private Double spApparentPower95; /** * 单相功率因数-最大值 */ - @ApiModelProperty(name = "spPowerFactorMax", value = "功率因数-最大值") + @TableField(value = "sp_power_factor_max") private Double spPowerFactorMax; /** * 单相功率因数-最小值 */ - @ApiModelProperty(name = "spPowerFactorMin", value = "功率因数-最小值") + @TableField(value = "sp_power_factor_min") private Double spPowerFactorMin; /** * 单相功率因数-平均值 */ - @ApiModelProperty(name = "spPowerFactorAvg", value = "功率因数-平均值") + @TableField(value = "sp_power_factor_avg") private Double spPowerFactorAvg; /** * 单相功率因数-95值 */ - @ApiModelProperty(name = "spPowerFactor95", value = "功率因数-95值") + @TableField(value = "sp_power_factor_95") private Double spPowerFactor95; /** * 单相基波功率因数-最大值 */ + @TableField(value = "sp_fundamental_power_factor_max") private Double spFundamentalPowerFactorMax; /** * 单相基波功率因数-最小值 */ + @TableField(value = "sp_fundamental_power_factor_min") private Double spFundamentalPowerFactorMin; /** * 单相基波功率因数-平均值 */ + @TableField(value = "sp_fundamental_power_factor_avg") private Double spFundamentalPowerFactorAvg; /** * 单相基波功率因数-95值 */ + @TableField(value = "sp_fundamental_power_factor_95") private Double spFundamentalPowerFactor95; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java index f7d2e87a6..081009ae5 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpMeasureReportD.java @@ -1,18 +1,13 @@ package com.njcn.harmonic.pojo.po; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import javax.validation.constraints.NotNull; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; import java.io.Serializable; - import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.hibernate.validator.constraints.Length; - /** * 【稳态监测点非谐波不带相位指标日报-日表】 * @author jianghf @@ -23,403 +18,570 @@ import org.hibernate.validator.constraints.Length; public class RMpMeasureReportD implements Serializable { /** - * 监测点ID - */ - @ApiModelProperty("监测点ID") + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") private String measurementPointId; + /** - * 生成数据的时间,每日统计一次 - */ - @ApiModelProperty("生成数据的时间,每日统计一次") + * 生成数据的时间,每日统计一次 + */ + @MppMultiId(value = "data_date") private Date dataDate; + /** - * 频率-最大值 - */ + * 频率-最大值 + */ + @TableField(value = "frequency_max") private Double frequencyMax; + /** - * 频率-最小值 - */ + * 频率-最小值 + */ + @TableField(value = "frequency_min") private Double frequencyMin; + /** - * 频率-平均值 - */ + * 频率-平均值 + */ + @TableField(value = "frequency_avg") private Double frequencyAvg; + /** - * 频率-95值 - */ + * 频率-95值 + */ + @TableField(value = "frequency_95") private Double frequency95; + /** - * 频率偏差-最大值 - */ + * 频率偏差-最大值 + */ + @TableField(value = "frequency_deviation_max") private Double frequencyDeviationMax; + /** - * 频率偏差-最小值 - */ + * 频率偏差-最小值 + */ + @TableField(value = "frequency_deviation_min") private Double frequencyDeviationMin; + /** - * 频率偏差-平均值 - */ + * 频率偏差-平均值 + */ + @TableField(value = "frequency_deviation_avg") private Double frequencyDeviationAvg; + /** - * 频率偏差-95值 - */ + * 频率偏差-95值 + */ + @TableField(value = "frequency_deviation_95") private Double frequencyDeviation95; + /** - * 总有功功率-最大值 - */ - @ApiModelProperty("总有功功率-最大值") + * 总有功功率-最大值 + */ + @TableField(value = "total_active_power_max") private Double totalActivePowerMax; + /** - * 总有功功率-最小值 - */ - @ApiModelProperty("总有功功率-最小值") + * 总有功功率-最小值 + */ + @TableField(value = "total_active_power_min") private Double totalActivePowerMin; + /** - * 总有功功率-平均值 - */ - @ApiModelProperty("总有功功率-平均值") + * 总有功功率-平均值 + */ + @TableField(value = "total_active_power_avg") private Double totalActivePowerAvg; + /** - * 总有功功率-95值 - */ - @ApiModelProperty("总有功功率-95值") + * 总有功功率-95值 + */ + @TableField(value = "total_active_power_95") private Double totalActivePower95; + /** - * 总无功功率-最大值 - */ - @ApiModelProperty("总无功功率-最大值") + * 总无功功率-最大值 + */ + @TableField(value = "total_reactive_power_max") private Double totalReactivePowerMax; + /** - * 总无功功率-最小值 - */ - @ApiModelProperty("总无功功率-最小值") + * 总无功功率-最小值 + */ + @TableField(value = "total_reactive_power_min") private Double totalReactivePowerMin; + /** - * 总无功功率-平均值 - */ - @ApiModelProperty("总无功功率-平均值") + * 总无功功率-平均值 + */ + @TableField(value = "total_reactive_power_avg") private Double totalReactivePowerAvg; + /** - * 总无功功率-95值 - */ - @ApiModelProperty("总无功功率-95值") + * 总无功功率-95值 + */ + @TableField(value = "total_reactive_power_95") private Double totalReactivePower95; + /** - * 总视在功率-最大值 - */ - @ApiModelProperty("总视在功率-最大值") + * 总视在功率-最大值 + */ + @TableField(value = "total_apparent_power_max") private Double totalApparentPowerMax; + /** - * 总视在功率-最小值 - */ - @ApiModelProperty("总视在功率-最小值") + * 总视在功率-最小值 + */ + @TableField(value = "total_apparent_power_min") private Double totalApparentPowerMin; + /** - * 总视在功率-平均值 - */ - @ApiModelProperty("总视在功率-平均值") + * 总视在功率-平均值 + */ + @TableField(value = "total_apparent_power_avg") private Double totalApparentPowerAvg; + /** - * 总视在功率-95值 - */ - @ApiModelProperty("总视在功率-95值") + * 总视在功率-95值 + */ + @TableField(value = "total_apparent_power_95") private Double totalApparentPower95; + /** - * 三相功率因数-最大值 - */ + * 三相功率因数-最大值 + */ + @TableField(value = "tp_power_factor_max") private Double tpPowerFactorMax; + /** - * 三相功率因数-最小值 - */ + * 三相功率因数-最小值 + */ + @TableField(value = "tp_power_factor_min") private Double tpPowerFactorMin; + /** - * 三相功率因数-平均值 - */ + * 三相功率因数-平均值 + */ + @TableField(value = "tp_power_factor_avg") private Double tpPowerFactorAvg; + /** - * 三相功率因数-95值 - */ + * 三相功率因数-95值 + */ + @TableField(value = "tp_power_factor_95") private Double tpPowerFactor95; + /** - * 基波功率因数-最大值 - */ + * 基波功率因数-最大值 + */ + @TableField(value = "fundamental_power_factor_max") private Double fundamentalPowerFactorMax; + /** - * 基波功率因数-最小值 - */ + * 基波功率因数-最小值 + */ + @TableField(value = "fundamental_power_factor_min") private Double fundamentalPowerFactorMin; + /** - * 基波功率因数-平均值 - */ + * 基波功率因数-平均值 + */ + @TableField(value = "fundamental_power_factor_avg") private Double fundamentalPowerFactorAvg; + /** - * 基波功率因数-95值 - */ + * 基波功率因数-95值 + */ + @TableField(value = "fundamental_power_factor_95") private Double fundamentalPowerFactor95; + /** - * 正序电压-最大值 - */ + * 正序电压-最大值 + */ + @TableField(value = "positive_sequence_voltage_max") private Double positiveSequenceVoltageMax; + /** - * 正序电压-最小值 - */ + * 正序电压-最小值 + */ + @TableField(value = "positive_sequence_voltage_min") private Double positiveSequenceVoltageMin; + /** - * 正序电压-平均值 - */ + * 正序电压-平均值 + */ + @TableField(value = "positive_sequence_voltage_avg") private Double positiveSequenceVoltageAvg; + /** - * 正序电压-95值 - */ + * 正序电压-95值 + */ + @TableField(value = "positive_sequence_voltage_95") private Double positiveSequenceVoltage95; + /** - * 负序电压-最大值 - */ + * 负序电压-最大值 + */ + @TableField(value = "negative_sequence_voltage_max") private Double negativeSequenceVoltageMax; + /** - * 负序电压-最小值 - */ + * 负序电压-最小值 + */ + @TableField(value = "negative_sequence_voltage_min") private Double negativeSequenceVoltageMin; + /** - * 负序电压-平均值 - */ + * 负序电压-平均值 + */ + @TableField(value = "negative_sequence_voltage_avg") private Double negativeSequenceVoltageAvg; + /** - * 负序电压-95值 - */ + * 负序电压-95值 + */ + @TableField(value = "negative_sequence_voltage_95") private Double negativeSequenceVoltage95; + /** - * 零序电压-最大值 - */ + * 零序电压-最大值 + */ + @TableField(value = "zero_sequence_voltage_max") private Double zeroSequenceVoltageMax; + /** - * 零序电压-最小值 - */ + * 零序电压-最小值 + */ + @TableField(value = "zero_sequence_voltage_min") private Double zeroSequenceVoltageMin; + /** - * 零序电压-平均值 - */ + * 零序电压-平均值 + */ + @TableField(value = "zero_sequence_voltage_avg") private Double zeroSequenceVoltageAvg; + /** - * 零序电压-95值 - */ + * 零序电压-95值 + */ + @TableField(value = "zero_sequence_voltage_95") private Double zeroSequenceVoltage95; + /** - * 负序电压不平衡度-最大值 - */ - @ApiModelProperty("负序电压（三相电压）不平衡度-最大值") + * 负序电压不平衡度-最大值 + */ + @TableField(value = "negative_sequence_voltage_unbalance_max") private Double negativeSequenceVoltageUnbalanceMax; + /** - * 负序电压不平衡度-最小值 - */ - @ApiModelProperty("负序电压（三相电压）不平衡度-最小值") + * 负序电压不平衡度-最小值 + */ + @TableField(value = "negative_sequence_voltage_unbalance_min") private Double negativeSequenceVoltageUnbalanceMin; + /** - * 负序电压不平衡度-平均值 - */ - @ApiModelProperty("负序电压（三相电压）不平衡度-平均值") + * 负序电压不平衡度-平均值 + */ + @TableField(value = "negative_sequence_voltage_unbalance_avg") private Double negativeSequenceVoltageUnbalanceAvg; + /** - * 负序电压不平衡度-95值 - */ - @ApiModelProperty("负序电压（三相电压）不平衡度-95值") + * 负序电压不平衡度-95值 + */ + @TableField(value = "negative_sequence_voltage_unbalance_95") private Double negativeSequenceVoltageUnbalance95; + /** - * 零序电压不平衡度-最大值 - */ + * 零序电压不平衡度-最大值 + */ + @TableField(value = "zero_sequence_voltage_unbalance_max") private Double zeroSequenceVoltageUnbalanceMax; + /** - * 零序电压不平衡度-最小值 - */ + * 零序电压不平衡度-最小值 + */ + @TableField(value = "zero_sequence_voltage_unbalance_min") private Double zeroSequenceVoltageUnbalanceMin; + /** - * 零序电压不平衡度-平均值 - */ + * 零序电压不平衡度-平均值 + */ + @TableField(value = "zero_sequence_voltage_unbalance_avg") private Double zeroSequenceVoltageUnbalanceAvg; + /** - * 零序电压不平衡度-95值 - */ + * 零序电压不平衡度-95值 + */ + @TableField(value = "zero_sequence_voltage_unbalance_95") private Double zeroSequenceVoltageUnbalance95; + /** - * 正序电流-最大值 - */ + * 正序电流-最大值 + */ + @TableField(value = "positive_sequence_current_max") private Double positiveSequenceCurrentMax; + /** - * 正序电流-最小值 - */ + * 正序电流-最小值 + */ + @TableField(value = "positive_sequence_current_min") private Double positiveSequenceCurrentMin; + /** - * 正序电流-平均值 - */ + * 正序电流-平均值 + */ + @TableField(value = "positive_sequence_current_avg") private Double positiveSequenceCurrentAvg; + /** - * 正序电流-95值 - */ + * 正序电流-95值 + */ + @TableField(value = "positive_sequence_current_95") private Double positiveSequenceCurrent95; + /** - * 负序电流-最大值 - */ - @ApiModelProperty("负序电流-最大值") + * 负序电流-最大值 + */ + @TableField(value = "negative_sequence_current_max") private Double negativeSequenceCurrentMax; + /** - * 负序电流-最小值 - */ - @ApiModelProperty("负序电流-最小值") + * 负序电流-最小值 + */ + @TableField(value = "negative_sequence_current_min") private Double negativeSequenceCurrentMin; + /** - * 负序电流-平均值 - */ - @ApiModelProperty("负序电流-平均值") + * 负序电流-平均值 + */ + @TableField(value = "negative_sequence_current_avg") private Double negativeSequenceCurrentAvg; + /** - * 负序电流-95值 - */ - @ApiModelProperty("负序电流-95值") + * 负序电流-95值 + */ + @TableField(value = "negative_sequence_current_95") private Double negativeSequenceCurrent95; + /** - * 零序电流-最大值 - */ + * 零序电流-最大值 + */ + @TableField(value = "zero_sequence_current_max") private Double zeroSequenceCurrentMax; + /** - * 零序电流-最小值 - */ + * 零序电流-最小值 + */ + @TableField(value = "zero_sequence_current_min") private Double zeroSequenceCurrentMin; + /** - * 零序电流-平均值 - */ + * 零序电流-平均值 + */ + @TableField(value = "zero_sequence_current_avg") private Double zeroSequenceCurrentAvg; + /** - * 零序电流-95值 - */ + * 零序电流-95值 + */ + @TableField(value = "zero_sequence_current_95") private Double zeroSequenceCurrent95; + /** - * 负序电流不平衡度-最大值 - */ + * 负序电流不平衡度-最大值 + */ + @TableField(value = "negative_sequence_current_unbalance_max") private Double negativeSequenceCurrentUnbalanceMax; + /** - * 负序电流不平衡度-最小值 - */ + * 负序电流不平衡度-最小值 + */ + @TableField(value = "negative_sequence_current_unbalance_min") private Double negativeSequenceCurrentUnbalanceMin; + /** - * 负序电流不平衡度-平均值 - */ + * 负序电流不平衡度-平均值 + */ + @TableField(value = "negative_sequence_current_unbalance_avg") private Double negativeSequenceCurrentUnbalanceAvg; + /** - * 负序电流不平衡度-95值 - */ + * 负序电流不平衡度-95值 + */ + @TableField(value = "negative_sequence_current_unbalance_95") private Double negativeSequenceCurrentUnbalance95; + /** - * 零序电流不平衡度-最大值 - */ + * 零序电流不平衡度-最大值 + */ + @TableField(value = "zero_sequence_current_imbalance_max") private Double zeroSequenceCurrentImbalanceMax; + /** - * 零序电流不平衡度-最小值 - */ + * 零序电流不平衡度-最小值 + */ + @TableField(value = "zero_sequence_current_imbalance_min") private Double zeroSequenceCurrentImbalanceMin; + /** - * 零序电流不平衡度-平均值 - */ + * 零序电流不平衡度-平均值 + */ + @TableField(value = "zero_sequence_current_imbalance_avg") private Double zeroSequenceCurrentImbalanceAvg; + /** - * 零序电流不平衡度-95值 - */ + * 零序电流不平衡度-95值 + */ + @TableField(value = "zero_sequence_current_imbalance_95") private Double zeroSequenceCurrentImbalance95; + /** - * 等效视在功率-最大值 - */ + * 等效视在功率-最大值 + */ + @TableField(value = "equivalent_apparent_power_max") private Double equivalentApparentPowerMax; + /** - * 等效视在功率-最小值 - */ + * 等效视在功率-最小值 + */ + @TableField(value = "equivalent_apparent_power_min") private Double equivalentApparentPowerMin; + /** - * 等效视在功率-平均值 - */ + * 等效视在功率-平均值 + */ + @TableField(value = "equivalent_apparent_power_avg") private Double equivalentApparentPowerAvg; + /** - * 等效视在功率-95值 - */ + * 等效视在功率-95值 + */ + @TableField(value = "equivalent_apparent_power_95") private Double equivalentApparentPower95; + /** - * 等效功率因数-最大值 - */ + * 等效功率因数-最大值 + */ + @TableField(value = "equivalent_power_factor_max") private Double equivalentPowerFactorMax; + /** - * 等效功率因数-最小值 - */ + * 等效功率因数-最小值 + */ + @TableField(value = "equivalent_power_factor_min") private Double equivalentPowerFactorMin; + /** - * 等效功率因数-平均值 - */ + * 等效功率因数-平均值 + */ + @TableField(value = "equivalent_power_factor_avg") private Double equivalentPowerFactorAvg; + /** - * 等效功率因数-95值 - */ + * 等效功率因数-95值 + */ + @TableField(value = "equivalent_power_factor_95") private Double equivalentPowerFactor95; + /** - * 基波正序视在功率-最大值 - */ + * 基波正序视在功率-最大值 + */ + @TableField(value = "fundamental_wave_rateo_max") private Double fundamentalWaveRateoMax; + /** - * 基波正序视在功率-最小值 - */ + * 基波正序视在功率-最小值 + */ + @TableField(value = "fundamental_wave_rateo_min") private Double fundamentalWaveRateoMin; + /** - * 基波正序视在功率-平均值 - */ + * 基波正序视在功率-平均值 + */ + @TableField(value = "fundamental_wave_rateo_avg") private Double fundamentalWaveRateoAvg; + /** - * 基波正序视在功率-95值 - */ + * 基波正序视在功率-95值 + */ + @TableField(value = "fundamental_wave_rateo_95") private Double fundamentalWaveRateo95; + /** - * 基波等效视在功率-最大值 - */ + * 基波等效视在功率-最大值 + */ + @TableField(value = "fundamental_wave_apparent_max") private Double fundamentalWaveApparentMax; + /** - * 基波等效视在功率-最小值 - */ + * 基波等效视在功率-最小值 + */ + @TableField(value = "fundamental_wave_apparent_min") private Double fundamentalWaveApparentMin; + /** - * 基波等效视在功率-平均值 - */ + * 基波等效视在功率-平均值 + */ + @TableField(value = "fundamental_wave_apparent_avg") private Double fundamentalWaveApparentAvg; + /** - * 基波等效视在功率-95值 - */ + * 基波等效视在功率-95值 + */ + @TableField(value = "fundamental_wave_apparent_95") private Double fundamentalWaveApparent95; + /** - * 非基波等效视在功率-最大值 - */ + * 非基波等效视在功率-最大值 + */ + @TableField(value = "nonfundamental_wave_rateo_max") private Double nonfundamentalWaveRateoMax; + /** - * 非基波等效视在功率-最小值 - */ + * 非基波等效视在功率-最小值 + */ + @TableField(value = "nonfundamental_wave_rateo_min") private Double nonfundamentalWaveRateoMin; + /** - * 非基波等效视在功率-平均值 - */ + * 非基波等效视在功率-平均值 + */ + @TableField(value = "nonfundamental_wave_rateo_avg") private Double nonfundamentalWaveRateoAvg; + /** - * 非基波等效视在功率-95值 - */ + * 非基波等效视在功率-95值 + */ + @TableField(value = "nonfundamental_wave_rateo_95") private Double nonfundamentalWaveRateo95; + /** - * 不平衡视在功率-最大值 - */ + * 不平衡视在功率-最大值 + */ + @TableField(value = "unbalanced_apparent_power_max") private Double unbalancedApparentPowerMax; + /** - * 不平衡视在功率-最小值 - */ + * 不平衡视在功率-最小值 + */ + @TableField(value = "unbalanced_apparent_power_min") private Double unbalancedApparentPowerMin; + /** - * 不平衡视在功率-平均值 - */ + * 不平衡视在功率-平均值 + */ + @TableField(value = "unbalanced_apparent_power_avg") private Double unbalancedApparentPowerAvg; + /** - * 不平衡视在功率-95值 - */ + * 不平衡视在功率-95值 + */ + @TableField(value = "unbalanced_apparent_power_95") private Double unbalancedApparentPower95; + @TableField(exist = false) + private static final long serialVersionUID = 1L; } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPltReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPltReportD.java new file mode 100644 index 000000000..13a70bd58 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPltReportD.java @@ -0,0 +1,62 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; + +/** + * @author qijian + * @TableName r_mp_plt_report_d + */ +@TableName(value ="r_mp_plt_report_d") +@Data +public class RMpPltReportD implements Serializable { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每日统计一次 + */ + @MppMultiId(value = "data_date") + private LocalDate dataDate; + + /** + * 相别："A" "B" "C" "ABC" "T" 配网部分相别的数据采用T标志存储 + */ + @MppMultiId(value = "phase") + private String phase; + + /** + * 长时间闪变值-最大值 + */ + @TableField(value = "long_time_flashing_max") + private Double longTimeFlashingMax; + + /** + * 长时间闪变值-最小值 + */ + @TableField(value = "long_time_flashing_min") + private Double longTimeFlashingMin; + + /** + * 长时间闪变值-平均值 + */ + @TableField(value = "long_time_flashing_avg") + private Double longTimeFlashingAvg; + + /** + * 长时间闪变值-95值 + */ + @TableField(value = "long_time_flashing_95") + private Double longTimeFlashing95; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpTargetWarnDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpTargetWarnDPO.java new file mode 100644 index 000000000..2b86d1be1 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpTargetWarnDPO.java @@ -0,0 +1,99 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/15 11:00【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "r_mp_target_warn_d") +public class RMpTargetWarnDPO { + /** + * 监测点ID + */ + @MppMultiId(value = "measurement_point_id") + private String measurementPointId; + + /** + * 生成数据的时间,每日统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 是否是有效接入监测点(0:否 1:是) + */ + @TableField(value = "is_effective") + private Integer isEffective; + + /** + * 是否是稳态超标监测点(0:否 1:是) + */ + @TableField(value = "is_harmonic") + private Integer isHarmonic; + + /** + * 是否是发生暂态的监测点(0:否 1:是) + */ + @TableField(value = "is_event") + private Integer isEvent; + + /** + * 是否是告警监测点数(0:否 1:是) + */ + @TableField(value = "is_warn") + private Integer isWarn; + + /** + * 电压偏差是否告警(0:否 1:是) + */ + @TableField(value = "is_v_dev_warn") + private Integer isVDevWarn; + + /** + * 频率偏差是否告警(0:否 1:是) + */ + @TableField(value = "is_freq_warn") + private Integer isFreqWarn; + + /** + * 三相电压不平衡度是否告警(0:否 1:是) + */ + @TableField(value = "is_unbalance_warn") + private Integer isUnbalanceWarn; + + /** + * 谐波电压是否告警(0:否 1:是) + */ + @TableField(value = "is_v_warn") + private Integer isVWarn; + + /** + * 闪变是否告警(0:否 1:是) + */ + @TableField(value = "is_flicker_warn") + private Integer isFlickerWarn; + + /** + * 电压暂降是否告警(0:否 1:是) + */ + @TableField(value = "is_sag_warn") + private Integer isSagWarn; + + /** + * 短时中断是否告警(0:否 1:是) + */ + @TableField(value = "is_interrupt_warn") + private Integer isInterruptWarn; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java new file mode 100644 index 000000000..c0235bae4 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexMPO.java @@ -0,0 +1,102 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/30 13:59【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 + */ +@Data +@TableName(value = "r_operating_index_m") +public class ROperatingIndexMPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 在运监测点数 + */ + @TableField(value = "measurement_run_points") + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + @TableField(value = "transit_measurement_points") + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + @TableField(value = "effective_access_measurement_count") + private Integer effectiveAccessMeasurementCount; + + /** + * 监测终端数 + */ + @TableField(value = "online_measurement_points") + private Integer onlineMeasurementPoints; + + /** + * 在线终端数 + */ + @TableField(value = "online_measurement_count") + private Integer onlineMeasurementCount; + + /** + * 应设点数 + */ + @TableField(value = "should_count") + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + @TableField(value = "should_point_coverage") + private Double shouldPointCoverage; + + /** + * 数据完整率 + */ + @TableField(value = "data_integrity_rate") + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + @TableField(value = "data_right_rate") + private Double dataRightRate; + + /** + * 指标完整率 + */ + @TableField(value = "index_integrity_rate") + private Double indexIntegrityRate; + + /** + * 数据否异常(0:正常 1:异常) + */ + @TableField(value = "is_unusual") + private Integer isUnusual; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java new file mode 100644 index 000000000..aa5a2f572 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexQPO.java @@ -0,0 +1,102 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/30 15:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 主网运行指标统计-季表 ,主网监测指标数据质量统计-季表 + */ +@Data +@TableName(value = "r_operating_index_q") +public class ROperatingIndexQPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 在运监测点数 + */ + @TableField(value = "measurement_run_points") + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + @TableField(value = "transit_measurement_points") + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + @TableField(value = "effective_access_measurement_count") + private Integer effectiveAccessMeasurementCount; + + /** + * 监测终端数 + */ + @TableField(value = "online_measurement_points") + private Integer onlineMeasurementPoints; + + /** + * 在线终端数 + */ + @TableField(value = "online_measurement_count") + private Integer onlineMeasurementCount; + + /** + * 应设点数 + */ + @TableField(value = "should_count") + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + @TableField(value = "should_point_coverage") + private Double shouldPointCoverage; + + /** + * 数据完整率 + */ + @TableField(value = "data_integrity_rate") + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + @TableField(value = "data_right_rate") + private Double dataRightRate; + + /** + * 指标完整率 + */ + @TableField(value = "index_integrity_rate") + private Double indexIntegrityRate; + + /** + * 数据是否异常(0:正常 1:异常) + */ + @TableField(value = "is_unusual") + private Integer isUnusual; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java new file mode 100644 index 000000000..ebe99b926 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexYPO.java @@ -0,0 +1,102 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/11/30 15:58【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 + */ +@Data +@TableName(value = "r_operating_index_y") +public class ROperatingIndexYPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + + /** + * 时间 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 在运监测点数 + */ + @TableField(value = "measurement_run_points") + private Integer measurementRunPoints; + + /** + * 在线监测点数 + */ + @TableField(value = "transit_measurement_points") + private Integer transitMeasurementPoints; + + /** + * 有效接入监测点数量 + */ + @TableField(value = "effective_access_measurement_count") + private Integer effectiveAccessMeasurementCount; + + /** + * 监测终端数 + */ + @TableField(value = "online_measurement_points") + private Integer onlineMeasurementPoints; + + /** + * 在线终端数 + */ + @TableField(value = "online_measurement_count") + private Integer onlineMeasurementCount; + + /** + * 应设点数 + */ + @TableField(value = "should_count") + private Integer shouldCount; + + /** + * 应设点覆盖率 + */ + @TableField(value = "should_point_coverage") + private Double shouldPointCoverage; + + /** + * 数据完整率 + */ + @TableField(value = "data_integrity_rate") + private Double dataIntegrityRate; + + /** + * 数据准确率 + */ + @TableField(value = "data_right_rate") + private Double dataRightRate; + + /** + * 指标完整率 + */ + @TableField(value = "index_integrity_rate") + private Double indexIntegrityRate; + + /** + * 数据是否异常(0:正常 1:异常) + */ + @TableField(value = "is_unusual") + private Integer isUnusual; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java new file mode 100644 index 000000000..432cb1e78 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatFile.java @@ -0,0 +1,45 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author wr + * @since 2022-12-28 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("r_stat_file") +@ApiModel(value="RStatFile对象", description="") +public class RStatFile implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "文件id") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + @ApiModelProperty(value = "文件内容") + private String fileContent; + + @ApiModelProperty(value = "创建用户") + @TableField("create_By") + private String createBy; + + @ApiModelProperty(value = "更新用户") + @TableField("update_By") + private String updateBy; + + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java new file mode 100644 index 000000000..b90d443fa --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgDPO.java @@ -0,0 +1,90 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/13 15:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 区域分类统计日表 + */ +@Data +@TableName(value = "r_stat_org_d") +public class RStatOrgDPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + + /** + * 生成数据的时间,每天统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 监测点类别ID、监测对象类型ID + */ + @MppMultiId(value = "measurement_type_class") + private String measurementTypeClass; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @MppMultiId(value = "data_type") + private String dataType; + + /** + * 总监测点数 + */ + @TableField(value = "all_count") + private Integer allCount; + + /** + * 有效接入监测点数 + */ + @TableField(value = "effective_measurement") + private Integer effectiveMeasurement; + + /** + * 稳态超标监测点数 + */ + @TableField(value = "harmonic_measurement") + private Integer harmonicMeasurement; + + /** + * 发生暂态的监测点数 + */ + @TableField(value = "event_measurement") + private Integer eventMeasurement; + + /** + * 暂态指标发生次数 + */ + @TableField(value = "event_count") + private Integer eventCount; + + /** + * 应设点数 + */ + @TableField(value = "should_count") + private Integer shouldCount; + + /** + * 告警监测点数 + */ + @TableField(value = "warn_count") + private Integer warnCount; +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java new file mode 100644 index 000000000..9e3a288d0 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java @@ -0,0 +1,151 @@ +package com.njcn.harmonic.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +import java.util.Date; + +/** + * + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/12/14 16:17【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +/** + * 区域分类统计月表 + */ +@Data +@TableName(value = "r_stat_org_m") +public class RStatOrgMPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @MppMultiId(value = "data_type") + private String dataType; + + /** + * 生成数据的时间,每月统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 监测点类别ID、监测对象类型ID + */ + @MppMultiId(value = "measurement_type_class") + private String measurementTypeClass; + + /** + * 总监测点数 + */ + @TableField(value = "all_count") + private Integer allCount; + + /** + * 日均有效接入监测点数 + */ + @TableField(value = "effective_measurement_average") + private Integer effectiveMeasurementAverage; + + /** + * 累计有效接入监测点数 + */ + @TableField(value = "effective_measurement_accrued") + private Integer effectiveMeasurementAccrued; + + /** + * 日均稳态超标监测点数 + */ + @TableField(value = "harmonic_measurement_average") + private Integer harmonicMeasurementAverage; + + /** + * 累计稳态超标监测点数 + */ + @TableField(value = "harmonic_measurement_accrued") + private Integer harmonicMeasurementAccrued; + + /** + * 日均稳态超标监测点数占比 + */ + @TableField(value = "harmonic_measurement_ratio_average") + private Double harmonicMeasurementRatioAverage; + + /** + * 累计超标天数 + */ + @TableField(value = "over_day_accrued") + private Integer overDayAccrued; + + /** + * 频率偏差合格率 + */ + @TableField(value = "freq_pass_rate") + private Double freqPassRate; + + /** + * 电压偏差合格率 + */ + @TableField(value = "v_dev_pass_rate") + private Double vDevPassRate; + + /** + * 闪变合格率 + */ + @TableField(value = "flicker_pass_rate") + private Double flickerPassRate; + + /** + * 日均监测到暂态指标的监测点数 + */ + @TableField(value = "event_measurement_average") + private Integer eventMeasurementAverage; + + /** + * 累计监测到暂态指标的监测点数 + */ + @TableField(value = "event_measurement_accrued") + private Integer eventMeasurementAccrued; + + /** + * 日均暂态超标监测点数占比 + */ + @TableField(value = "event_measurement_ratio_average") + private Double eventMeasurementRatioAverage; + + /** + * 暂态指标发生频次 + */ + @TableField(value = "event_freq") + private Double eventFreq; + + /** + * 暂态指标发生次数 + */ + @TableField(value = "event_count") + private Integer eventCount; + + /** + * 应设点数 + */ + @TableField(value = "should_count") + private Integer shouldCount; + + /** + * 告警监测点数 + */ + @TableField(value = "warn_count") + private Integer warnCount; + + +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java new file mode 100644 index 000000000..7bdbc9739 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/OverviewVO.java @@ -0,0 +1,62 @@ +package com.njcn.harmonic.pojo.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * <功能描述> + * + * @author wr + * @createTime: 2022-12-29 + */ +@Data +public class OverviewVO implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitorSort", value = "监测点类型") + private String monitorSort; + @ApiModelProperty(name = "harmonicType", value = "指标类型") + private String harmonicType; + @ApiModelProperty(name = "sumNum", value = "超标指标") + private String sumNum; + @ApiModelProperty(name = "ytbSumNum", value = "同比超标指标") + private String ytbSumNum; + @ApiModelProperty(name = "yhbSumNum", value = "环比超标指标") + private String yhbSumNum; + @ApiModelProperty(name = "sumNum", value = "同比超标指标占比") + private String sameNum; + @ApiModelProperty(name = "sumNum", value = "环比超标指标占比") + private String ringNum; + + @Data + public static class GroupVO { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitorSort", value = "监测点类别") + private String monitorSort; + + @ApiModelProperty(name = "unbalanceAlarm", value = "三项不平横") + private List subset; + + } + + @Data + public static class VoltageVO { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "monitoringObject", value = "监测对象") + private String monitoringObject; + + @ApiModelProperty(name = "areaPqEventType", value = "台区电能事件") + private String areaPqEventType; + + @ApiModelProperty(name = "totalMonitorNum", value = "累计监测点") + private String totalMonitorNum; + + + } +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java index 7582181b5..872bf7f5f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRStatOrgVO.java @@ -19,7 +19,7 @@ public class PwRStatOrgVO { @ApiModelProperty(value = "单位名称") private String orgName; - @ApiModelProperty(value = "监测点类别") + @ApiModelProperty(value = "") private String monitorSort; @ApiModelProperty(value = "在线监测点数") diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java new file mode 100644 index 000000000..9d207035d --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/algorithm/AlgorithmController.java @@ -0,0 +1,116 @@ +package com.njcn.harmonic.controller.algorithm; + +import cn.hutool.core.bean.BeanUtil; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; + +import com.njcn.harmonic.enums.HarmonicResponseEnum; +import com.njcn.harmonic.pojo.param.RStatFileVO; +import com.njcn.harmonic.pojo.po.RStatFile; +import com.njcn.harmonic.pojo.vo.PwRStatOrgVO; +import com.njcn.harmonic.service.algorithm.RStatFileService; +import com.njcn.minio.bo.MinIoUploadResDTO; +import com.njcn.minio.config.MinIoProperties; +import com.njcn.minio.utils.MinIoUtils; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; + +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.util.*; + + +@RestController +@RequiredArgsConstructor +@Api(tags = "算法") +@RequestMapping("/algorithm") +public class AlgorithmController extends BaseController { + + private final RStatFileService rStatFileService; + + @Resource + private MinIoUtils minIoUtils; + @Resource + private MinIoProperties minIoProperties; + + /** + * 算法保存 + * + * @param param + * @return + */ + @PostMapping("/getAlgorithmSave") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("算法保存") + @ApiImplicitParam(name = "param", value = "算发内容", required = true) + public HttpResult getAlgorithmSave(@RequestBody RStatFileVO param) { + String methodDescribe = getMethodDescribe("getAlgorithmSave"); + RStatFile rStatFile = BeanUtil.copyProperties(param, RStatFile.class); + boolean b = rStatFileService.updateById(rStatFile); + if(b){ +// minIoUtils.removeObjects( minIoProperties.getBucket(),param.getAddress()); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + }else{ + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); + } + } + + @PostMapping("/getAlgorithmAll") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("算法查询") + public HttpResult> getAlgorithmAll() { + String methodDescribe = getMethodDescribe("getAlgorithmAll"); + List list = rStatFileService.list(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + + } + + /** + * 通用上传请求 + */ + @PostMapping("/common/upload") + @ResponseBody + public HttpResult uploadFile(MultipartFile file) + { + try + { + //把名称存入数据 + MinIoUploadResDTO upload = minIoUtils.upload(file, minIoProperties.getBucket(), "algorithm/"); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, upload, null); + } + catch (Exception e) + { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, null); + } + } + + /** + * 通用删除请求 + */ +// @PostMapping("/common/delete") +// @ResponseBody +// public HttpResult delete() +// { +// try +// { +// List aaa=new ArrayList<>(); +// aaa.add("algorithm/0CA99CB427A94A8A833499A41C557405.png"); +// aaa.add("algorithm/07D8A0FD304A42CDB73F514FBEE641BC.png"); +// minIoUtils.removeObjects( minIoProperties.getBucket(),aaa); +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, null); +// } +// catch (Exception e) +// { +// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, null); +// } +// } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java new file mode 100644 index 000000000..72c64c8cb --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwOverviewController.java @@ -0,0 +1,49 @@ +package com.njcn.harmonic.controller.distribution; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.harmonic.pojo.param.OverviewParam; +import com.njcn.harmonic.pojo.vo.OverviewVO; +import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgMService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * <分布式光伏概览> + * + * @author wr + * @createTime: 2022-12-29 + */ +@RestController +@RequestMapping("/pwOverview") +@Slf4j +@Api(tags = "分布式光伏概览") +@RequiredArgsConstructor +public class PwOverviewController extends BaseController { + + private final RStatHarmonicOrgMService rStatHarmonicOrgMService; + + + @PostMapping("/getAlarmProportion") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("告警监测点数占比") + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + public HttpResult> getAlarmProportion(@RequestBody OverviewParam param) { + String methodDescribe = getMethodDescribe("getAlarmProportion"); + List monitorYoY = rStatHarmonicOrgMService.getExcessiveProportion(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorYoY, methodDescribe); + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java index 9d9e9fb29..fdbb08c7f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java @@ -25,10 +25,10 @@ import java.util.List; /** *

- * 前端控制器 + * 配网指标分类概览-监测点分类总览 *

* - * @author rui.wu + * @author wr * @since 2022-10-09 */ @RestController diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgController.java index d016a38af..9251cd2d0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgController.java @@ -55,7 +55,7 @@ public class PwRStatHarmonicOrgController extends BaseController { switch (string) { //查询各单位累计超标监测点数-年数据 case BizParamConstant.STAT_BIZ_YEAR: - org = rStatHarmonicOrgYService.getPwRStatHarmonicYOldAll(param,2); + org = rStatHarmonicOrgYService.getPwRStatHarmonicYOldAll(param, 2); break; //查询各单位累计超标监测点数-季数据 case BizParamConstant.STAT_BIZ_QUARTER: @@ -81,12 +81,12 @@ public class PwRStatHarmonicOrgController extends BaseController { @ApiImplicitParam(name = "param", value = "各单位超标监测统计参数", required = true) public HttpResult> getPwRStatHarmonicOrgIcon(@RequestBody RStatHarmonicMParam param) { String methodDescribe = getMethodDescribe("getPwRStatHarmonicOrgIcon"); - List icon= null; + List icon = null; String string = param.getType().toString(); switch (string) { //查询各单位累计超标监测点数统计图-年数据 case BizParamConstant.STAT_BIZ_YEAR: - icon = rStatHarmonicOrgYService.getPwRStatHarmonicOrgYOldIcon(param,2); + icon = rStatHarmonicOrgYService.getPwRStatHarmonicOrgYOldIcon(param, 2); break; //查询各单位累计超标监测点数-季数据 case BizParamConstant.STAT_BIZ_QUARTER: diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgController.java index 43540f880..61547a8ac 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgController.java @@ -56,7 +56,7 @@ public class RStatHarmonicOrgController extends BaseController { switch (string) { //查询各单位累计超标监测点数-年数据 case BizParamConstant.STAT_BIZ_YEAR: - rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getPwRStatHarmonicYOldAll(param,1); + rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getPwRStatHarmonicYOldAll(param, 1); break; //查询各单位累计超标监测点数-季数据 case BizParamConstant.STAT_BIZ_QUARTER: @@ -86,7 +86,7 @@ public class RStatHarmonicOrgController extends BaseController { switch (string) { //查询各单位累计超标监测点数统计图-年数据 case BizParamConstant.STAT_BIZ_YEAR: - getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getPwRStatHarmonicOrgYOldIcon(param,1); + getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getPwRStatHarmonicOrgYOldIcon(param, 1); break; //查询各单位累计超标监测点数-季数据 case BizParamConstant.STAT_BIZ_QUARTER: diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java index 6041f516a..d389c1bd1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java @@ -82,7 +82,7 @@ public class RStatOrgController extends BaseController { @GetMapping("/getRStatSubstation") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域稳态指标超标分类统计表") - public HttpResult > getRStatSubstation(StatisticsBizBaseParam param) { + public HttpResult> getRStatSubstation(StatisticsBizBaseParam param) { String methodDescribe = getMethodDescribe("getRStatSubstation"); List statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java index fc5bc6413..8d61df90f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/RStatOrgPvPowerQualityController.java @@ -38,6 +38,7 @@ public class RStatOrgPvPowerQualityController extends BaseController { /** * 低功率因数统计 + * * @param param * @return */ @@ -53,6 +54,7 @@ public class RStatOrgPvPowerQualityController extends BaseController { /** * 详细数据表分页查询 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java index 57bfe2440..9e7aeeb24 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/specialanalysis/WindFarmController.java @@ -40,6 +40,7 @@ public class WindFarmController extends BaseController { /** * 详细数据表分页查询 + * * @param param * @return */ @@ -55,6 +56,7 @@ public class WindFarmController extends BaseController { /** * 详细数据表分页查询 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java index d9ce6796c..5e82c27fc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/StatHarmonicOrgMMapper.java @@ -1,8 +1,10 @@ package com.njcn.harmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RStatHarmonicVO; import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO; import com.njcn.user.pojo.dto.DeptDTO; @@ -33,4 +35,15 @@ public interface StatHarmonicOrgMMapper extends BaseMapper { List selectInfoList(@Param("param") StatSubstationBizBaseParam param, @Param("ids") List ids, @Param("dataType") String dataType); + + /** + * 分布式光伏概览-超标监测点占比 + * @param param + * @param ids + * @param dataType + * @return + */ + List selectYoY(@Param("param") OverviewParam param, + @Param("ids") List ids, + @Param("dataType") String dataType); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/RStatFileMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/RStatFileMapper.java new file mode 100644 index 000000000..600f47741 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/RStatFileMapper.java @@ -0,0 +1,16 @@ +package com.njcn.harmonic.mapper.algorithm; + +import com.njcn.harmonic.pojo.po.RStatFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author wr + * @since 2022-12-28 + */ +public interface RStatFileMapper extends BaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml new file mode 100644 index 000000000..c193aaa55 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/algorithm/mapping/RStatFileMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml index 7f473c467..a034f21b4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/StatHarmonicOrgMMapper.xml @@ -52,5 +52,103 @@ GROUP BY harmonic_type + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java index e3589a61c..740992f6c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RStatOrgPvPowerQualityMMapper.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityMPO; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.StreamReverseOrgVO; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -18,6 +20,15 @@ import java.util.Map; public interface RStatOrgPvPowerQualityMMapper extends BaseMapper { Page getStreamReverseByOrg(IPage page, @Param("condMap")Map condMap); + + /** + * 分布式光伏概览-电压问题 + * @param deptCodes + * @param ids + * @return + */ + List selectVoltage(@Param("deptCodes") List deptCodes, + @Param("ids") List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml index 8f096fcc0..464f92dae 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RStatOrgPvPowerQualityMMapper.xml @@ -43,4 +43,36 @@ GROUP BY org_no,monitoring_object + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/RStatFileService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/RStatFileService.java new file mode 100644 index 000000000..47632bc86 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/RStatFileService.java @@ -0,0 +1,16 @@ +package com.njcn.harmonic.service.algorithm; + +import com.njcn.harmonic.pojo.po.RStatFile; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author wr + * @since 2022-12-28 + */ +public interface RStatFileService extends IService { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/impl/RStatFileServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/impl/RStatFileServiceImpl.java new file mode 100644 index 000000000..742450f9d --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/algorithm/impl/RStatFileServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.harmonic.service.algorithm.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.harmonic.mapper.algorithm.RStatFileMapper; +import com.njcn.harmonic.pojo.po.RStatFile; + +import com.njcn.harmonic.service.algorithm.RStatFileService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author wr + * @since 2022-12-28 + */ +@Service +public class RStatFileServiceImpl extends ServiceImpl implements RStatFileService { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java index 822871fc5..d61128134 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java @@ -23,6 +23,7 @@ public interface PwRStatOrgService extends IService { /** * 配网查询区域超标统计 + * * @param param * @return */ @@ -38,6 +39,7 @@ public interface PwRStatOrgService extends IService { /** * 配网稳态指标合格率明细表 + * * @param param * @return */ @@ -45,13 +47,15 @@ public interface PwRStatOrgService extends IService { /** * 配网区域稳态指标超标分类统计表 + * * @param param * @return */ List getRStatSubstationOrg(StatSubstationBizBaseParam param); /** - *配网区域稳态指标超标明细 + * 配网区域稳态指标超标明细 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java index a657d1ccc..ddf3d31c9 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java @@ -71,20 +71,20 @@ public class PwRStatOrgServiceImpl extends ServiceImpl> collect = info.stream().collect( Collectors.groupingBy(RStatOrgVO.PwRStatOrgVO::getOrgNo)); collect.forEach((key, value) -> { @@ -98,7 +98,7 @@ public class PwRStatOrgServiceImpl extends ServiceImpl info=new ArrayList<>(); + List info = new ArrayList<>(); if (CollectionUtil.isNotEmpty(deptDTOList)) { // 过滤出部门id StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); @@ -153,7 +153,7 @@ public class PwRStatOrgServiceImpl extends ServiceImpl info = new ArrayList<>(); // 获取当前用户的部门的子部门信息 - PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); + PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); //部门id pwPmsMonitorParam.setOrgId(param.getId()); //变电站 @@ -165,10 +165,10 @@ public class PwRStatOrgServiceImpl extends ServiceImpl monitorDTOList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - Map monitorDTOMap = monitorDTOList.stream().collect( - Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(key1,key2) ->key2)); if (CollectionUtil.isNotEmpty(monitorDTOList)) { + Map monitorDTOMap = monitorDTOList.stream().collect( + Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key2)); //获取最新过滤的监测点id List ids = monitorDTOList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); @@ -201,7 +201,7 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRMpPartHarmonicDetail(RStatOrgParam.PwRStatOrgParam param) { - PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); + PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); //部门id pwPmsMonitorParam.setOrgId(param.getId()); //电压等级 @@ -401,7 +401,7 @@ public class PwRStatOrgServiceImpl extends ServiceImpl pwPmsMonitorDTOS = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); Map pwPmsMonitorDTOMap = pwPmsMonitorDTOS.stream().collect( - Collectors.toMap(PwPmsMonitorDTO::getMonitorId,Function.identity(),(key1, key2) -> key2)); + Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(), (key1, key2) -> key2)); if (CollectionUtil.isNotEmpty(pwPmsMonitorDTOS)) { //获取监测点id @@ -410,8 +410,8 @@ public class PwRStatOrgServiceImpl extends ServiceImpl rMpPartHarmonicDetail = rMpSurplusHarmonicDetailMMapper.getRMpPartHarmonicDetail(baseParam); - List newList=BeanUtil.copyToList( - rMpPartHarmonicDetail,RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO.class); + List newList = BeanUtil.copyToList( + rMpPartHarmonicDetail, RMpPartHarmonicDetailVO.PwRMpPartHarmonicDetailDVO.class); if (CollectionUtil.isNotEmpty(newList)) { //因为只有月表，数据进行查询可能出现重复数据。进行分组 Map> detailVOMap = newList.stream() diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicMService.java index e67988b77..211f636e3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicMService.java @@ -12,7 +12,7 @@ import java.util.List; /** *

- * 服务类 + * 服务类 *

* * @author rui.wu @@ -22,6 +22,7 @@ public interface RStatHarmonicMService extends IService { /** * 主网查询查询监测点稳态指标 日/月点数 + * * @param param * @return */ @@ -29,6 +30,7 @@ public interface RStatHarmonicMService extends IService { /** * 主网稳态电铁-频率偏差-电压统计图 + * * @param param * @return */ @@ -36,6 +38,7 @@ public interface RStatHarmonicMService extends IService { /** * 主网稳态电铁-频率偏差-越线日期统计图 + * * @param param * @return */ @@ -43,6 +46,7 @@ public interface RStatHarmonicMService extends IService { /** * 配网查询监测点稳态指标（月） + * * @param param * @return */ @@ -50,6 +54,7 @@ public interface RStatHarmonicMService extends IService { /** * 配网监测点-频率偏差-越线日期统计图 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java index 4a92e306f..112f26c60 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgMService.java @@ -1,9 +1,11 @@ package com.njcn.harmonic.service.majornetwork; import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RArrayVO; import com.njcn.harmonic.pojo.vo.RIconVO; @@ -50,4 +52,13 @@ public interface RStatHarmonicOrgMService extends IService { * @return */ List getPwRStatHarmonicOrgMIcon(RStatHarmonicMParam param); + + + + /** + * 分布式光伏概览-稳态指标超标占比 + * @param param + * @return + */ + List getExcessiveProportion(OverviewParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgYService.java index 2b4bd5098..9398e4d0a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgYService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicOrgYService.java @@ -41,7 +41,7 @@ public interface RStatHarmonicOrgYService extends IService { * @param param * @return */ - List getPwRStatHarmonicOrgYOldIcon(RStatHarmonicMParam param,Integer type); + List getPwRStatHarmonicOrgYOldIcon(RStatHarmonicMParam param, Integer type); /** @@ -50,7 +50,7 @@ public interface RStatHarmonicOrgYService extends IService { * @param param * @return */ - List getPwRStatHarmonicYOldAll(StatisticsBizBaseParam param,Integer type); + List getPwRStatHarmonicYOldAll(StatisticsBizBaseParam param, Integer type); /** * 配网查询各单位稳态指标（年 ）统计暂不使用 @@ -69,5 +69,4 @@ public interface RStatHarmonicOrgYService extends IService { List getPwRStatHarmonicOrgYIcon(RStatHarmonicMParam param); - } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicQService.java index fc2bfe9db..128f1b06e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicQService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicQService.java @@ -9,23 +9,25 @@ import java.util.List; /** *

- * 服务类 + * 服务类 *

* - * @author rui.wu + * @author wr * @since 2022-10-12 */ public interface RStatHarmonicQService extends IService { /** * 主网查询监测点稳态指标（季） + * * @param param * @return */ List getRStatHarmonicQAll(StatisticsBizBaseParam param); /** - * 配网查询监测点稳态指标（季） + * 配网查询监测点稳态指标（季） + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicYService.java index d8fd5e9f7..71f85592f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicYService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatHarmonicYService.java @@ -9,10 +9,10 @@ import java.util.List; /** *

- * 服务类 + * 配网指标分类概览-监测点分类总览 *

* - * @author rui.wu + * @author wr * @since 2022-10-12 */ public interface RStatHarmonicYService extends IService { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatLoadTypeService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatLoadTypeService.java index 44fdbfd6e..e7df3b39b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatLoadTypeService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatLoadTypeService.java @@ -9,7 +9,7 @@ import java.util.List; /** *

- * 服务类 + * 服务类 *

* * @author rui.wu @@ -19,6 +19,7 @@ public interface RStatLoadTypeService extends IService { /** * 区域干扰源电流类指标超标统计 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java index daade575a..c3238e31c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java @@ -19,6 +19,7 @@ public interface RStatOrgMService extends IService { /** * 查询区域超标统计-月数据 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java index 389e0cd56..de9cc079b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java @@ -19,6 +19,7 @@ public interface RStatOrgQService extends IService { /** * 查询区域超标统计-季数据 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java index 721301277..d68bbe88d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java @@ -80,10 +80,10 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicMMapper.selectInfoList(baseParam,mainnetData.getId()); + List list = rStatHarmonicMMapper.selectInfoList(baseParam, mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); @@ -119,7 +119,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl b = new ArrayList<>(); b.addAll(rm); for (RStatHarmonicM rStatHarmonicM : value) { - if(interferenceMap.containsKey(rStatHarmonicM.getMeasurementTypeClass())){ + if (interferenceMap.containsKey(rStatHarmonicM.getMeasurementTypeClass())) { RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicM, RStatHarmonicMVO.class); DictData data1 = interferenceMap.get(rStatHarmonicM.getMeasurementTypeClass()); r.setHarmonicName(data1.getName()); @@ -196,11 +196,11 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 List rStatHarmonicVoltageMS = rStatHarmonicVoltageMMapper - .selectInfoList(baseParam,mainnetData.getId(), measurementDate.getId(),harmonicDate.getId()); + .selectInfoList(baseParam, mainnetData.getId(), measurementDate.getId(), harmonicDate.getId()); //将数据转换为map进行便利 Map voltageMMap = rStatHarmonicVoltageMS.stream() @@ -283,11 +283,11 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 List rStatHarmonicVoltageMS = rStatHarmonicDMapper - .selectInfoList(baseParam,mainnetData.getId(), measurementDate.getId(),harmonicDate.getId()); + .selectInfoList(baseParam, mainnetData.getId(), measurementDate.getId(), harmonicDate.getId()); Map> collect = rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate)); @@ -349,10 +349,10 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicMMapper.selectInfoList(baseParam,distributionData.getId()); + List list = rStatHarmonicMMapper.selectInfoList(baseParam, distributionData.getId()); //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicM::getHarmonicType)); @@ -368,7 +368,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 List rStatHarmonicVoltageMS = rStatHarmonicDMapper - .selectInfoList(baseParam,distributionData.getId(), measurementDate.getId(),harmonicDate.getId()); + .selectInfoList(baseParam, distributionData.getId(), measurementDate.getId(), harmonicDate.getId()); Map> collect = rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate)); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java index 693dfddfd..ab6783814 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java @@ -2,14 +2,18 @@ package com.njcn.harmonic.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM; import com.njcn.harmonic.mapper.StatHarmonicOrgMMapper; +import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RArrayVO; import com.njcn.harmonic.pojo.vo.RIconVO; import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO; @@ -24,8 +28,10 @@ import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; +import org.checkerframework.checker.units.qual.K; import org.springframework.stereotype.Service; +import java.security.Key; import java.text.DecimalFormat; import java.util.*; import java.util.function.Function; @@ -51,7 +57,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getRStatHarmonicMAll(StatisticsBizBaseParam param) { //子节点 获取所有得各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -142,7 +148,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getRStatHarmonicOrgMIcon(RStatHarmonicMParam param) { //子节点 获取所有得各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 @@ -231,7 +237,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -260,7 +266,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getPwRStatHarmonicOrgMIcon(RStatHarmonicMParam param) { //各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); - + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -382,6 +388,81 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getExcessiveProportion(OverviewParam param) { + List info=new ArrayList<>(); + //指标类型 + List steadyData = dicDataFeignClient.getDicDataByTypeCode + (DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); + //监测点类型 + List lineData = dicDataFeignClient.getDicDataByTypeCode + (DicDataTypeEnum.LINE_SORT.getCode()).getData(); + + //获取部门数据 + List deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + if(CollectionUtil.isNotEmpty(deptDTOS)){ + List collect = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //获取配网数据类型 + DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); + List overviewVOS = statHarmonicOrgMMapper.selectYoY(param, collect, data.getId()); + + Map> overviewVOMap = overviewVOS.stream().collect( + Collectors.groupingBy(OverviewVO::getMonitorSort)); + + overviewVOMap.forEach((key,value)->{ + OverviewVO.GroupVO groupVO = new OverviewVO.GroupVO(); + + Map> listMap = value.stream().collect(Collectors.groupingBy(OverviewVO::getHarmonicType)); + List notDict = steadyData.stream().filter(r -> !listMap.containsKey(r.getId())) + .collect(Collectors.toList()); + //生成默认值 + if(CollectionUtil.isNotEmpty(notDict)){ + groupVO.setMonitorSort(key); + OverviewVO overviewVO; + for (DictData dictData : notDict) { + overviewVO=new OverviewVO(); + overviewVO.setMonitorSort(key); + overviewVO.setHarmonicType(dictData.getId()); + overviewVO.setSumNum("0"); + overviewVO.setYtbSumNum("0"); + overviewVO.setYhbSumNum("0"); + overviewVO.setSameNum("0"); + overviewVO.setRingNum("0"); + value.add(overviewVO); + } + groupVO.setSubset(value); + } + info.add(groupVO); + }); + + List notDict = lineData.stream().filter(r -> !overviewVOMap.containsKey(r.getId())) + .collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(notDict)){ + OverviewVO.GroupVO overviewVO; + OverviewVO vo; + for (DictData dictData : notDict) { + overviewVO=new OverviewVO.GroupVO(); + overviewVO.setMonitorSort(dictData.getId()); + List vos=new ArrayList<>(); + for (DictData lineDatum : steadyData) { + vo=new OverviewVO(); + vo.setMonitorSort(dictData.getId()); + vo.setHarmonicType(lineDatum.getId()); + vo.setSumNum("0"); + vo.setYtbSumNum("0"); + vo.setYhbSumNum("0"); + vo.setSameNum("0"); + vo.setRingNum("0"); + vos.add(vo); + } + overviewVO.setSubset(vos); + info.add(overviewVO); + } + } + } + return info; + } + /** * 便利赋值 * diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java index 7cc3e9c3f..f8aee816e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java @@ -56,7 +56,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -85,7 +85,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl getRStatHarmonicOrgQIcon(RStatHarmonicMParam param) { //子节点 获取所有得各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 @@ -210,7 +210,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); @@ -239,7 +239,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl getPwRStatHarmonicOrgQIcon(RStatHarmonicMParam param) { //各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java index 968f2dfb3..94a0f26ae 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; /** *

- * 服务实现类 + * 服务实现类 *

* * @author rui.wu @@ -73,15 +73,15 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); - List newList=new ArrayList<>(); + List newList = new ArrayList<>(); for (DeptLevelVO deptLevelVO : deptLevelVOList) { //数据库查询 - baseParam=BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); + baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); //没有子部门说明就是最底层部门 - if(CollUtil.isNotEmpty(deptLevelVO.getDeptList())){ + if (CollUtil.isNotEmpty(deptLevelVO.getDeptList())) { List deptCodeS = deptLevelVO.getDeptList().stream().map(DeptLevelVO::getCode).collect(Collectors.toList()); baseParam.setIds(deptCodeS); - }else{ + } else { baseParam.setIds(Arrays.asList(deptLevelVO.getCode())); } //区分 年 季 月 @@ -90,15 +90,15 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl { - if(lineTypeMap.containsKey(key)){ - RArrayVO arrayVO=new RArrayVO(); + if (lineTypeMap.containsKey(key)) { + RArrayVO arrayVO = new RArrayVO(); DictData data = lineTypeMap.get(key); arrayVO.setRowName(data.getName()); arrayVO.setSort(data.getSort()); - List b=new ArrayList<>(); + List b = new ArrayList<>(); for (RStatHarmonicVO orgY : value) { RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class); DeptLevelVO data1 = deptMap.get(orgY.getOrgNo()); - if (ObjectUtil.isNotNull(data1)){ + if (ObjectUtil.isNotNull(data1)) { r.setHarmonicName(data1.getName()); r.setSort(data1.getSort()); r.setOverDay(0); @@ -172,21 +172,21 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort())); - harmonicData =indicatorTypeDate.get(0); - }else{ + harmonicData = indicatorTypeDate.get(0); + } else { //获取指标对象（频率偏差） - harmonicData= dicDataFeignClient.getDicDataById( + harmonicData = dicDataFeignClient.getDicDataById( param.getStasisID()).getData(); } //初始化指标类型（横向） StatSubstationBizBaseParam baseParam; - List arrayVOList=new ArrayList<>(); + List arrayVOList = new ArrayList<>(); for (DeptLevelVO deptLevelVO : deptLevelVOList) { //数据库查询 baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); @@ -220,13 +220,13 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); - List newList=new ArrayList<>(); + List newList = new ArrayList<>(); for (DeptLevelVO deptLevelVO : deptLevelVOList) { //数据库查询 - baseParam=BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); + baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); //没有子部门说明就是最底层部门 - if(CollUtil.isNotEmpty(deptLevelVO.getDeptList())){ + if (CollUtil.isNotEmpty(deptLevelVO.getDeptList())) { List deptCodeS = deptLevelVO.getDeptList().stream().map(DeptLevelVO::getCode).collect(Collectors.toList()); baseParam.setIds(deptCodeS); - }else{ + } else { baseParam.setIds(Arrays.asList(deptLevelVO.getCode())); } //区分 年 季 月 @@ -280,15 +280,15 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl { - if(lineTypeMap.containsKey(key)){ - RArrayVO arrayVO=new RArrayVO(); + if (lineTypeMap.containsKey(key)) { + RArrayVO arrayVO = new RArrayVO(); DictData data = lineTypeMap.get(key); arrayVO.setRowName(data.getName()); arrayVO.setSort(data.getSort()); - List b=new ArrayList<>(); + List b = new ArrayList<>(); for (RStatHarmonicVO orgY : value) { RStatHarmonicMVO r = BeanUtil.copyProperties(orgY, RStatHarmonicMVO.class); DeptLevelVO data1 = deptMap.get(orgY.getOrgNo()); - if (ObjectUtil.isNotNull(data1)){ + if (ObjectUtil.isNotNull(data1)) { r.setHarmonicName(data1.getName()); r.setSort(data1.getSort()); r.setOverDay(0); @@ -350,7 +350,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl getPwRStatHarmonicYOldAll(StatisticsBizBaseParam param,Integer type) { + public List getPwRStatHarmonicYOldAll(StatisticsBizBaseParam param, Integer type) { //对象主节点 获取所有的稳态类型 List steadyData = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); @@ -359,17 +359,17 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); //获取部门id集合 List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); - DictData dictData ; - if(type==1){ + DictData dictData; + if (type == 1) { //获取主网信息 dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); - }else{ + } else { //获取配网信息 dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); } @@ -395,7 +395,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl indicatorTypeDate = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); indicatorTypeDate.sort(Comparator.comparing(data -> data.getSort())); - harmonicData =indicatorTypeDate.get(0); - }else{ + harmonicData = indicatorTypeDate.get(0); + } else { //获取指标对象（频率偏差） - harmonicData= dicDataFeignClient.getDicDataById( + harmonicData = dicDataFeignClient.getDicDataById( param.getStasisID()).getData(); } //初始化指标类型（横向） StatSubstationBizBaseParam baseParam; - List arrayVOList=new ArrayList<>(); + List arrayVOList = new ArrayList<>(); for (DeptLevelVO deptLevelVO : deptLevelVOList) { //数据库查询 baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); @@ -491,13 +491,13 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl getPwRStatHarmonicOrgYOldIcon(RStatHarmonicMParam param,Integer type) { + public List getPwRStatHarmonicOrgYOldIcon(RStatHarmonicMParam param, Integer type) { //各单位类型 List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptDTOList= DeptUtil.getDeptSubsetVOList(deptList,param.getId()); + List deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 @@ -538,11 +538,11 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicQMapper.selectInfoList(baseParam,mainnetData.getId()); + List list = rStatHarmonicQMapper.selectInfoList(baseParam, mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); @@ -100,7 +100,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl b = new ArrayList<>(); b.addAll(rm); for (RStatHarmonicQ rStatHarmonicQ : value) { - if(interferenceMap.containsKey(rStatHarmonicQ.getMeasurementTypeClass())){ + if (interferenceMap.containsKey(rStatHarmonicQ.getMeasurementTypeClass())) { RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicQ, RStatHarmonicMVO.class); DictData data1 = interferenceMap.get(rStatHarmonicQ.getMeasurementTypeClass()); r.setHarmonicName(data1.getName()); @@ -152,10 +152,10 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicQMapper.selectInfoList(baseParam,distributionData.getId()); + List list = rStatHarmonicQMapper.selectInfoList(baseParam, distributionData.getId()); //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getHarmonicType)); @@ -171,7 +171,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl * - * @author rui.wu + * @author wr * @since 2022-10-12 */ @Service @@ -60,10 +59,10 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicYMapper.selectInfoList(baseParam,mainnetData.getId()); + List list = rStatHarmonicYMapper.selectInfoList(baseParam, mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); @@ -102,7 +101,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl b = new ArrayList<>(); b.addAll(rm); for (RStatHarmonicY rStatHarmonicY : value) { - if(interferenceMap.containsKey(rStatHarmonicY.getMeasurementTypeClass())){ + if (interferenceMap.containsKey(rStatHarmonicY.getMeasurementTypeClass())) { RStatHarmonicMVO r = BeanUtil.copyProperties(rStatHarmonicY, RStatHarmonicMVO.class); DictData data1 = interferenceMap.get(rStatHarmonicY.getMeasurementTypeClass()); r.setHarmonicName(data1.getName()); @@ -154,16 +153,16 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicYMapper.selectInfoList(baseParam,distributionData.getId()); + List list = rStatHarmonicYMapper.selectInfoList(baseParam, distributionData.getId()); //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType)); //判断对象是否为空 - if(CollUtil.isNotEmpty(list)){ + if (CollUtil.isNotEmpty(list)) { //重新生成数据结构 measurementMap.forEach((key, value) -> { List eventVO = new ArrayList<>(); @@ -173,7 +172,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl busbarIds = temp.stream().map(RStatOrgBusbarVoltageVO::getBusbarId).collect(Collectors.toList()); - PmsGeneratrixParam generatrixParam=new PmsGeneratrixParam(); + PmsGeneratrixParam generatrixParam = new PmsGeneratrixParam(); generatrixParam.setGeneratrixIds(busbarIds); generatrixParam.setGeneratrixVoltageLevel(param.getIds()); List generatrixDTO = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(generatrixParam).getData(); @@ -89,7 +89,7 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl> map = temp .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo)); map.forEach((key, value) -> { @@ -305,9 +305,9 @@ public class RStatOrgYServiceImpl extends ServiceImpl infoIds = new ArrayList<>(); Map pmsMonitorDTOMap = pmsMonitorDTOS.stream().filter( v -> { - if(infoIds.contains(v.getPowerrId())){ + if (infoIds.contains(v.getPowerrId())) { return false; - }else { + } else { infoIds.add(v.getPowerrId()); return true; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/DistributedPvVolOverService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/DistributedPvVolOverService.java index 641ad9ffb..81f776073 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/DistributedPvVolOverService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/DistributedPvVolOverService.java @@ -1,7 +1,6 @@ package com.njcn.harmonic.service.specialanalysis; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.pojo.param.PowerQualityParam; import com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RMpWpPowerDetailMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RMpWpPowerDetailMService.java index c85a7931b..b22df826d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RMpWpPowerDetailMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RMpWpPowerDetailMService.java @@ -19,6 +19,7 @@ public interface RMpWpPowerDetailMService extends IService { /** * 详细数据表分页查询 + * * @param param * @return */ @@ -26,6 +27,7 @@ public interface RMpWpPowerDetailMService extends IService { /** * 电气化铁路分页查询 + * * @param param * @return */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java index 6033669e8..1843d678d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/RStatOrgPvPowerQualityService.java @@ -2,11 +2,15 @@ package com.njcn.harmonic.service.specialanalysis; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.PowerQualityParam; import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityQPO; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO; +import java.util.List; + /** * 分布式光伏_台区电能质量明细 * @@ -17,6 +21,7 @@ public interface RStatOrgPvPowerQualityService extends IService getPowerQualityInfo(PowerQualityParam.PowerQualityDetailInfoParam param); + + + /** + * 分布式光伏概览-电压问题 + * @param param + * @return + */ + List getVoltage(OverviewParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java index 3c99b585b..289d84854 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvOverviewServiceImpl.java @@ -26,7 +26,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.Function; import java.util.stream.Collectors; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java index 8a4778f26..49451904f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/DistributedPvVolOverServiceImpl.java @@ -4,14 +4,12 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.harmonic.pojo.param.PowerQualityParam; import com.njcn.harmonic.pojo.po.RMpPvPowerDetailMPO; import com.njcn.harmonic.pojo.vo.RMpPvPowerDetailVO; -import com.njcn.harmonic.pojo.vo.RMpWpPowerDetailVO; import com.njcn.harmonic.service.specialanalysis.DistributedPvVolOverService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java index c76011738..89655e136 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpEmissionMServiceImpl.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java index 049ffa517..f56de183b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RMpWpPowerDetailMServiceImpl.java @@ -81,47 +81,47 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl pageY = rMpWpPowerDetailYMapper.selectPage(new Page<>(param.getPageNum(), param.getPageSize()) - ,new LambdaQueryWrapper() - .in(RMpWpPowerDetailY::getMeasurementPointId,monitorIds) - .eq(RMpWpPowerDetailY::getMonitorTag,param.getMonitorTag()) + , new LambdaQueryWrapper() + .in(RMpWpPowerDetailY::getMeasurementPointId, monitorIds) + .eq(RMpWpPowerDetailY::getMonitorTag, param.getMonitorTag()) .ge(StrUtil.isNotBlank(param.getStartTime()), RMpWpPowerDetailY::getDataDate, param.getStartTime()) .le(StrUtil.isNotBlank(param.getEndTime()), RMpWpPowerDetailY::getDataDate, param.getEndTime()) ); List rMpWpPowerDetailVOS = BeanUtil.copyToList(pageY.getRecords(), RMpWpPowerDetailVO.class); - page=BeanUtil.copyProperties(pageY,Page.class); + page = BeanUtil.copyProperties(pageY, Page.class); page.setRecords(rMpWpPowerDetailVOS); break; //查询区域超标统计-季数据 case BizParamConstant.STAT_BIZ_QUARTER: Page pageList = rMpWpPowerDetailQMapper.selectPage(new Page<>(param.getPageNum(), param.getPageSize()) - ,new LambdaQueryWrapper() - .in(RMpWpPowerDetailQ::getMeasurementPointId,monitorIds) - .eq(RMpWpPowerDetailQ::getMonitorTag,param.getMonitorTag()) + , new LambdaQueryWrapper() + .in(RMpWpPowerDetailQ::getMeasurementPointId, monitorIds) + .eq(RMpWpPowerDetailQ::getMonitorTag, param.getMonitorTag()) .ge(StrUtil.isNotBlank(param.getStartTime()), RMpWpPowerDetailQ::getDataDate, param.getStartTime()) .le(StrUtil.isNotBlank(param.getEndTime()), RMpWpPowerDetailQ::getDataDate, param.getEndTime()) ); List rMpWpPowerDetailVOS2 = BeanUtil.copyToList(pageList.getRecords(), RMpWpPowerDetailVO.class); - page=BeanUtil.copyProperties(pageList,Page.class); + page = BeanUtil.copyProperties(pageList, Page.class); page.setRecords(rMpWpPowerDetailVOS2); break; //查询各区域超标统计-月数据 case BizParamConstant.STAT_BIZ_MONTH: - Page page1= this.page(new Page<>(param.getPageNum(), param.getPageSize()) - ,new LambdaQueryWrapper() - .in(RMpWpPowerDetailM::getMeasurementPointId,monitorIds) - .eq(RMpWpPowerDetailM::getMonitorTag,param.getMonitorTag()) + Page page1 = this.page(new Page<>(param.getPageNum(), param.getPageSize()) + , new LambdaQueryWrapper() + .in(RMpWpPowerDetailM::getMeasurementPointId, monitorIds) + .eq(RMpWpPowerDetailM::getMonitorTag, param.getMonitorTag()) .ge(StrUtil.isNotBlank(param.getStartTime()), RMpWpPowerDetailM::getDataDate, param.getStartTime()) .le(StrUtil.isNotBlank(param.getEndTime()), RMpWpPowerDetailM::getDataDate, param.getEndTime()) ); List rMpWpPowerDetailVOS3 = BeanUtil.copyToList(page1.getRecords(), RMpWpPowerDetailVO.class); - page=BeanUtil.copyProperties(page1,Page.class); + page = BeanUtil.copyProperties(page1, Page.class); page.setRecords(rMpWpPowerDetailVOS3); break; default: break; } - page.getRecords().stream().forEach(vo->{ - if(monitorMap.containsKey(vo.getMeasurementPointId())){ + page.getRecords().stream().forEach(vo -> { + if (monitorMap.containsKey(vo.getMeasurementPointId())) { PmsMonitorDTO monitorDTO = monitorMap.get(vo.getMeasurementPointId()); vo.setOrgName(monitorDTO.getOrgName()); vo.setMeasurementPointName(monitorDTO.getName()); @@ -137,7 +137,7 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl deptIds = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList()); //根据部门信息，获取牵引站信息 - PmsTractionStationParam stationParam=new PmsTractionStationParam(); + PmsTractionStationParam stationParam = new PmsTractionStationParam(); stationParam.setOrgIds(deptIds); List tractionStationDTOS = tractionStationClient.getPmsTractionStationInfo(stationParam).getData(); @@ -153,18 +153,18 @@ public class RMpWpPowerDetailMServiceImpl extends ServiceImpl newList = BeanUtil.copyToList(oldPage.getRecords(), RMpRailwayTractionDetailVO.class); - newList.stream().forEach(vo->{ - if(dtoMap.containsKey(vo.getTractionStationId())){ - PmsTractionStationDTO dto = dtoMap.get(vo.getTractionStationId()); - vo.setOrgName(dto.getOrgName()); - vo.setRailwayType(dto.getRailwayType()); - vo.setTractionStationName(dto.getName()); - vo.setRailwayLineName(dto.getRailwayLineName()); - vo.setVoltageLevel(dto.getVoltageLevel()); - vo.setRatedCapacity(dto.getRatedCapacity()); - } + newList.stream().forEach(vo -> { + if (dtoMap.containsKey(vo.getTractionStationId())) { + PmsTractionStationDTO dto = dtoMap.get(vo.getTractionStationId()); + vo.setOrgName(dto.getOrgName()); + vo.setRailwayType(dto.getRailwayType()); + vo.setTractionStationName(dto.getName()); + vo.setRailwayLineName(dto.getRailwayLineName()); + vo.setVoltageLevel(dto.getVoltageLevel()); + vo.setRatedCapacity(dto.getRatedCapacity()); + } }); - Page page=BeanUtil.copyProperties(oldPage,Page.class); + Page page = BeanUtil.copyProperties(oldPage, Page.class); page.setRecords(newList); return page; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java index d5c22a2f1..9a45b3d4c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/RStatOrgPvPowerQualityServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Console; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -12,10 +13,14 @@ import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.harmonic.mapper.specialanalysis.*; +import com.njcn.harmonic.pojo.param.OverviewParam; import com.njcn.harmonic.pojo.param.PowerQualityParam; +import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityMPO; import com.njcn.harmonic.pojo.po.RStatOrgPvPowerQualityQPO; +import com.njcn.harmonic.pojo.vo.OverviewVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvDetailVO; import com.njcn.harmonic.pojo.vo.RStatOrgPvPowerStreamVO; +import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityMService; import com.njcn.harmonic.service.specialanalysis.RStatOrgPvPowerQualityService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; @@ -46,42 +51,43 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl getPowerQualityStream(PowerQualityParam param) { - PowerQualityParam.PowerQualityDetailParam bearParam= BeanUtil.copyProperties(param, PowerQualityParam.PowerQualityDetailParam.class); - Map list=new HashMap<>(3); + PowerQualityParam.PowerQualityDetailParam bearParam = BeanUtil.copyProperties(param, PowerQualityParam.PowerQualityDetailParam.class); + Map list = new HashMap<>(3); List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AREA_PQ_EVENT_TYPE.getCode()).getData(); - if(CollectionUtil.isEmpty(dictDataList)){ - throw new BusinessException(CommonResponseEnum.NO_DATA, "台区电能质量事件类型为空"); + if (CollectionUtil.isEmpty(dictDataList)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "台区电能质量事件类型为空"); } //获取部门id集合 List deptDTOS = deptFeignClient.getDirectSonSelf(param.getId()).getData(); - if(CollectionUtil.isEmpty(deptDTOS)){ - throw new BusinessException(CommonResponseEnum.NO_DATA, "获取部门信息为空"); + if (CollectionUtil.isEmpty(deptDTOS)) { + throw new BusinessException(CommonResponseEnum.NO_DATA, "获取部门信息为空"); } Map deptDTOMap = deptDTOS.stream().collect (Collectors.toMap(Dept::getCode, Function.identity(), (key, key2) -> key2)); List OrgNOS = deptDTOS.stream().map(Dept::getCode).collect(Collectors.toList()); //根据字典Code，取出字典id，拼入sql中 - dictDataList.stream().forEach(dictData ->{ - if(DicDataEnum.EVENT_TYPE_L.getCode().equals(dictData.getCode())){ - list.put("eventTypeL",dictData.getId()); - } - if(DicDataEnum.EVENT_TYPE_P.getCode().equals(dictData.getCode())){ - Console.log(list); - list.put("eventTypeP",dictData.getId()); - } - if(DicDataEnum.EVENT_TYPE_O.getCode().equals(dictData.getCode())){ - list.put("eventTypeO",dictData.getId()); - } - }); + dictDataList.stream().forEach(dictData -> { + if (DicDataEnum.EVENT_TYPE_L.getCode().equals(dictData.getCode())) { + list.put("eventTypeL", dictData.getId()); + } + if (DicDataEnum.EVENT_TYPE_P.getCode().equals(dictData.getCode())) { + Console.log(list); + list.put("eventTypeP", dictData.getId()); + } + if (DicDataEnum.EVENT_TYPE_O.getCode().equals(dictData.getCode())) { + list.put("eventTypeO", dictData.getId()); + } + }); bearParam.setMapId(list); bearParam.setOrgNos(OrgNOS); //数据分页查询 Page page = rStatOrgPvPowerQualityYPOMapper.selectListPage(new Page<>(param.getPageNum(), param.getPageSize()), bearParam); - page.getRecords().stream().forEach(vo->{ - if(deptDTOMap.containsKey(vo.getOrgNo())){ + page.getRecords().stream().forEach(vo -> { + if (deptDTOMap.containsKey(vo.getOrgNo())) { Dept deptDTO = deptDTOMap.get(vo.getOrgNo()); vo.setOrgNo(deptDTO.getName()); } @@ -98,7 +104,7 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl pwMonitorList = pwMonitorClient.getPwPhotovoltaicMonitorList(pwPmsMonitorParam).getData(); if (CollUtil.isEmpty(pwMonitorList)) { return new Page<>(); @@ -112,8 +118,8 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl page = rStatOrgPvPowerQualityYPOMapper.selectDetailListPage(new Page<>(param.getPageNum(), param.getPageSize()), bearParam); - page.getRecords().stream().forEach(vo->{ - if(monitorMap.containsKey(vo.getMeasurementPointId())){ + page.getRecords().stream().forEach(vo -> { + if (monitorMap.containsKey(vo.getMeasurementPointId())) { PwPmsMonitorDTO monitorDTO = monitorMap.get(vo.getMeasurementPointId()); vo.setOrgNo(monitorDTO.getOrgId()); vo.setOrgName(monitorDTO.getOrgName()); @@ -124,4 +130,58 @@ public class RStatOrgPvPowerQualityServiceImpl extends ServiceImpl getVoltage(OverviewParam param) { + List vos=new ArrayList<>(); + //获取部门信息 + List deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + + if(CollectionUtil.isNotEmpty(deptDTOS)){ + //获取台区电能质量事件类型 + List areaType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.AREA_PQ_EVENT_TYPE.getCode()).getData(); + if(CollectionUtil.isNotEmpty(deptDTOS)){ + List typeID=new ArrayList<>(); + //取出电压相关的字典 + for (DictData dictData : areaType) { + //电压 电压越上限15%以上 + if(DicDataEnum.EVENT_TYPE_T.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + //电压 电压越上限7%-15% + if(DicDataEnum.EVENT_TYPE_R.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + //电压 超标3%-10% + if(DicDataEnum.EVENT_TYPE_Z.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + //电压 超标10%以下 + if(DicDataEnum.EVENT_TYPE_X.getCode().equals(dictData.getCode())){ + typeID.add(dictData.getId()); + } + + } + //数据库查询 + List deptCodes = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + List voltageVOS = rStatOrgPvPowerQualityMMapper.selectVoltage(deptCodes, typeID); + if(CollectionUtil.isNotEmpty(voltageVOS)){ + Map> voltageMap = voltageVOS.stream().collect( + Collectors.groupingBy(OverviewVO.VoltageVO::getMonitoringObject)); + + } + + } + + + } + + + + + + + + return null; + } }