From 3c46b483c33091546d3a7353ad0388e4f5d3c47b Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 24 Jul 2023 16:01:22 +0800 Subject: [PATCH] =?UTF-8?q?3.3.8.=09=E5=8D=95=E4=BD=8D=E7=A8=B3=E6=80=81?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1(xy)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/po/RStatHarmonicVoltageMPO.java | 88 +++++++++++++++++++ .../RStatHarmonicVoltageMPOMapper.java | 16 ++++ .../area/RStatHarmonicOrgServiceImpl.java | 6 +- .../area/RStatHarmonicVoltageServiceImpl.java | 3 +- .../RStatHarmonicVoltageMPOService.java | 17 ++++ .../RStatHarmonicVoltageMPOServiceImpl.java | 22 +++++ .../mapping/RStatHarmonicVoltageMPOMapper.xml | 25 ++++++ 7 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RStatHarmonicVoltageMPOMapper.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java create mode 100644 pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatHarmonicVoltageMPOServiceImpl.java create mode 100644 pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java new file mode 100644 index 000000000..2ba3c7917 --- /dev/null +++ b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/RStatHarmonicVoltageMPO.java @@ -0,0 +1,88 @@ +package com.njcn.prepare.harmonic.pojo.mysql.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 java.util.Date; + +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +/** + * + * Description: + * Date: 2023/7/21 15:44【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "r_stat_harmonic_voltage_m") +public class RStatHarmonicVoltageMPO { + /** + * 单位ID + */ + @MppMultiId(value = "org_no") + private String orgNo; + + /** + * 生成数据的时间,每月统计一次 + */ + @MppMultiId(value = "data_date") + private Date dataDate; + + /** + * 监测对象类型ID + */ + @MppMultiId(value = "measurement_type_class") + private String measurementTypeClass; + + /** + * 稳态指标类型Id，字典表ID + */ + @MppMultiId(value = "harmonic_type") + private String harmonicType; + + /** + * 电压等级Id，字典表ID + */ + @MppMultiId(value = "voltage_type") + private String voltageType; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @MppMultiId(value = "data_type") + private String dataType; + + /** + * 日均超标监测点数 + */ + @TableField(value = "over_limit_measurement_average") + private Double overLimitMeasurementAverage; + + /** + * 累计超标监测点数 + */ + @TableField(value = "over_limit_measurement_accrued") + private Integer overLimitMeasurementAccrued; + + /** + * 累计超标天数 + */ + @TableField(value = "over_day") + private Integer overDay; + + /** + * 日均超标监测点数占比 + */ + @TableField(value = "over_limit_measurement_ratio_average") + private Double overLimitMeasurementRatioAverage; + + /** + * 累计超标监测点数占比 + */ + @TableField(value = "over_limit_measurement_ratio_accrued") + private Double overLimitMeasurementRatioAccrued; +} \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RStatHarmonicVoltageMPOMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RStatHarmonicVoltageMPOMapper.java new file mode 100644 index 000000000..cca029c9f --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/RStatHarmonicVoltageMPOMapper.java @@ -0,0 +1,16 @@ +package com.njcn.prepare.harmonic.mapper.mysql.newalgorithm; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO; + +/** + * + * Description: + * Date: 2023/7/21 15:44【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RStatHarmonicVoltageMPOMapper extends MppBaseMapper { +} \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicOrgServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicOrgServiceImpl.java index 688c6c0c5..cee401b77 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicOrgServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicOrgServiceImpl.java @@ -2,14 +2,12 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.njcn.device.pms.pojo.po.RStatOrgPO; -import com.njcn.harmonic.pojo.po.RStatOrgDPO; + import com.njcn.harmonic.pojo.po.RStatOrgMPO; import com.njcn.prepare.harmonic.mapper.mysql.area.*; import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicDPO; import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicMPO; -import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicQPO; -import com.njcn.prepare.harmonic.pojo.mysql.po.RStatOrgQPO; + import com.njcn.prepare.harmonic.pojo.param.OrgParam; import com.njcn.prepare.harmonic.pojo.po.*; import com.njcn.prepare.harmonic.service.mysql.area.RStatHarmonicOrgService; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java index 8b2ba715d..2c96256cd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicVoltageServiceImpl.java @@ -12,8 +12,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailDMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpPartHarmonicDetailMMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailDMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.RMpSurplusHarmonicDetailMMapper; -import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicDPO; -import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicMPO; + import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageDPO; import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO; import com.njcn.prepare.harmonic.service.mysql.area.RStatHarmonicVoltageDPOService; diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java new file mode 100644 index 000000000..a95a96a11 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/RStatHarmonicVoltageMPOService.java @@ -0,0 +1,17 @@ +package com.njcn.prepare.harmonic.service.mysql.newalgorithm; + +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * Date: 2023/7/21 15:44【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RStatHarmonicVoltageMPOService extends IMppService { + + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatHarmonicVoltageMPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatHarmonicVoltageMPOServiceImpl.java new file mode 100644 index 000000000..f78212dbe --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatHarmonicVoltageMPOServiceImpl.java @@ -0,0 +1,22 @@ +package com.njcn.prepare.harmonic.service.mysql.newalgorithm.impl; + +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.prepare.harmonic.pojo.mysql.po.RStatHarmonicVoltageMPO; +import com.njcn.prepare.harmonic.mapper.mysql.newalgorithm.RStatHarmonicVoltageMPOMapper; +import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatHarmonicVoltageMPOService; +/** + * + * Description: + * Date: 2023/7/21 15:44【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +public class RStatHarmonicVoltageMPOServiceImpl extends MppServiceImpl implements RStatHarmonicVoltageMPOService{ + +} diff --git a/pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml b/pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml new file mode 100644 index 000000000..41797d5c8 --- /dev/null +++ b/pqs-prepare/prepare-boot/src/main/resources/com/njcn/prepare/harmonic/mapper/mysql/newalgorithm/mapping/RStatHarmonicVoltageMPOMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + org_no, data_date, measurement_type_class, harmonic_type, voltage_type, data_type, + over_limit_measurement_average, over_limit_measurement_accrued, over_day, over_limit_measurement_ratio_average, + over_limit_measurement_ratio_accrued + + \ No newline at end of file