diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java index 45e71a2d2..77745d77d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterDetailStatisticsDTO.java @@ -6,88 +6,83 @@ import java.math.BigDecimal; /** * Description: - * Date: 2023/12/6 15:22【需求编号】 + * Date: 2023/12/6 15:30【需求编号】 * * @author clam * @version V1.0.0 */ @Data public class ConverterDetailStatisticsDTO { + /*主键 是否必填：是*/ + private String id; + /*统计日期 是否必填：是*/ + private String statisticalDate; + /*统计类型 是否必填：是*/ + private String statisticalType; - /*主键 是否必填：是*/ - private String id; + /*省级单位id 是否必填：是*/ + private String provinceId; + /*省级单位名称 是否必填：否*/ + private String provinceName; + /*市级单位id 是否必填：是*/ + private String cityId; + /*市级单位名称 是否必填：否*/ + private String cityName; + /*县级单位id 是否必填：否*/ + private String countyId; + /*县级单位名称 是否必填：否*/ + private String countyName; - /*省级单位名称 是否必填：否*/ - private String provinceName; - /*省级单位id 是否必填：是*/ - private String provinceId; + /*换流站id 是否必填：是*/ + private String converterId; + /*换流站名称 是否必填：是*/ + private String converterName; + /*电压等级 是否必填：是*/ + private String voltageLevel; - /*市级单位id 是否必填：是*/ - private String cityId; - /*市级单位名称 是否必填：否*/ - private String cityName; + /*母线id 是否必填：否*/ + private String busId; + /*母线名称 是否必填：否*/ + private String busName; + /*母线电压等级 是否必填：否*/ + private String busVoltageLevel; + /*监测点id 是否必填：否*/ + private String monitorId; + /*站内有效监测点数量（个） 是否必填：是*/ + private Integer effectiveMonitorNum; + /*谐波电压超标天数 是否必填：否*/ + private Integer harmvOvDay; + /*当年累计月数 是否必填：否*/ + private Integer monthsCount; + /*月均超标天数 是否必填：否*/ + private BigDecimal monthOvDays; - /*统计日期 是否必填：是*/ - private String statisticalDate; - /*统计类型 是否必填：是*/ - private String statisticalType; - - /*统计层级 是否必填：是*/ - private String statisticalLevel; - - - /*在运交流母线数量（条） 是否必填：是*/ - private Integer onlineAlternatingBusNum; - /*在运换流站数量（座） 是否必填：是*/ - private Integer onlineConverterNum; - - /*发生超标或暂态母线数量（条） 是否必填：是*/ - private Integer abnormalBusNum; - - - /*监测换流站数量（座） 是否必填：是*/ - private Integer monitorConverterNum; - /*监测交流母线数量（条） 是否必填：否*/ - private Integer monitorAlternatingBusNum; - - /*累计发生超标或暂态换流站数量（座） 是否必填：否*/ - private Integer abnormalConverterCount; - /*累计监测换流站数量（座） 是否必填：否*/ - private Integer monitorConverterCount; - /*累计发生超标或暂态母线数量（座） 是否必填：否*/ - private Integer abnormalBusCount; - /*累计监测交流母线数量（座） 是否必填：否*/ - private Integer monitorAlternatingBusCount; - - - - - /*发生超标或暂态换流站数量（条） 是否必填：否*/ - private Integer abnormalConverterNum; - - /*发生超标或暂态母线日均占比（%） 是否必填：否*/ - private BigDecimal abnormalBusAvgRate; - - /*发生超标或暂态母线占比（%） 是否必填：否*/ - private BigDecimal abnormalBusRate; - /*发生超标或暂态换流站日均占比（%） 是否必填：否*/ - private BigDecimal abnormalConverterAvgRate; - - /*发生超标或暂态换流站占比（%） 是否必填：否*/ - private BigDecimal abnormalConverterRate; - - - /*交流母线监测率（%） 是否必填：否*/ - private BigDecimal monitorAlternatingBusRate; - - /*换流站监测率（%） 是否必填：*/ - private BigDecimal monitorConverterRate; - - + /*奇次谐波电压限值（%） 是否必填：是*/ + private BigDecimal oddVoltLimit; + /*累计超标天数 是否必填：否*/ + private Integer totalOvDays; + /*11次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v11; + /*13次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v13; + /*23次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v23; + /*25次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v25; + /*3次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v3; + /*5次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v5; + /*7次谐波电压95%概率值（%） 是否必填：否*/ + private BigDecimal v7; + /*电压总谐波畸变率95%概率值统计值（%） 是否必填：否*/ + private BigDecimal vthd; + /*电压总谐波畸变率95%概率值限值（%） 是否必填：是*/ + private BigDecimal vthdLimit; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterIndexStatisticsDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterIndexStatisticsDTO.java new file mode 100644 index 000000000..0a7f1aab9 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/ConverterIndexStatisticsDTO.java @@ -0,0 +1,96 @@ +package com.njcn.harmonic.pojo.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Description: + * Date: 2023/12/6 15:22【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class ConverterIndexStatisticsDTO { + + + /*主键 是否必填：是*/ + private String id; + + /*省级单位名称 是否必填：否*/ + private String provinceName; + /*省级单位id 是否必填：是*/ + private String provinceId; + + /*市级单位id 是否必填：是*/ + private String cityId; + /*市级单位名称 是否必填：否*/ + private String cityName; + + + + /*统计日期 是否必填：是*/ + private String statisticalDate; + /*统计类型 是否必填：是*/ + private String statisticalType; + + /*统计层级 是否必填：是*/ + private String statisticalLevel; + + + /*在运交流母线数量（条） 是否必填：是*/ + private Integer onlineAlternatingBusNum; + /*在运换流站数量（座） 是否必填：是*/ + private Integer onlineConverterNum; + + /*发生超标或暂态母线数量（条） 是否必填：是*/ + private Integer abnormalBusNum; + + + /*监测换流站数量（座） 是否必填：是*/ + private Integer monitorConverterNum; + /*监测交流母线数量（条） 是否必填：否*/ + private Integer monitorAlternatingBusNum; + + /*累计发生超标或暂态换流站数量（座） 是否必填：否*/ + private Integer abnormalConverterCount; + /*累计监测换流站数量（座） 是否必填：否*/ + private Integer monitorConverterCount; + /*累计发生超标或暂态母线数量（座） 是否必填：否*/ + private Integer abnormalBusCount; + /*累计监测交流母线数量（座） 是否必填：否*/ + private Integer monitorAlternatingBusCount; + + + + + /*发生超标或暂态换流站数量（条） 是否必填：否*/ + private Integer abnormalConverterNum; + + /*发生超标或暂态母线日均占比（%） 是否必填：否*/ + private BigDecimal abnormalBusAvgRate; + + /*发生超标或暂态母线占比（%） 是否必填：否*/ + private BigDecimal abnormalBusRate; + /*发生超标或暂态换流站日均占比（%） 是否必填：否*/ + private BigDecimal abnormalConverterAvgRate; + + /*发生超标或暂态换流站占比（%） 是否必填：否*/ + private BigDecimal abnormalConverterRate; + + + /*交流母线监测率（%） 是否必填：否*/ + private BigDecimal monitorAlternatingBusRate; + + /*换流站监测率（%） 是否必填：*/ + private BigDecimal monitorConverterRate; + + + + + + + + +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/SubstationQualityStatisticsDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/SubstationQualityStatisticsDTO.java deleted file mode 100644 index c98ee3c23..000000000 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/SubstationQualityStatisticsDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.njcn.harmonic.pojo.dto; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * Description: - * Date: 2023/12/6 15:30【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -@Data -public class SubstationQualityStatisticsDTO { - /*主键 是否必填：是*/ - private String id; - - /*统计日期 是否必填：是*/ - private String statisticalDate; - /*统计类型 是否必填：是*/ - private String statisticalType; - - /*省级单位id 是否必填：是*/ - private String provinceId; - /*省级单位名称 是否必填：否*/ - private String provinceName; - /*市级单位id 是否必填：是*/ - private String cityId; - /*市级单位名称 是否必填：否*/ - private String cityName; - /*县级单位id 是否必填：否*/ - private String countyId; - /*县级单位名称 是否必填：否*/ - private String countyName; - - /*换流站id 是否必填：是*/ - private String converterId; - /*换流站名称 是否必填：是*/ - private String converterName; - /*电压等级 是否必填：是*/ - private String voltageLevel; - - /*母线id 是否必填：否*/ - private String busId; - /*母线名称 是否必填：否*/ - private String busName; - /*母线电压等级 是否必填：否*/ - private String busVoltageLevel; - - /*监测点id 是否必填：否*/ - private String monitorId; - - /*站内有效监测点数量（个） 是否必填：是*/ - private Integer effectiveMonitorNum; - /*谐波电压超标天数 是否必填：否*/ - private Integer harmvOvDay; - /*当年累计月数 是否必填：否*/ - private Integer monthsCount; - /*月均超标天数 是否必填：否*/ - private BigDecimal monthOvDays; - - /*奇次谐波电压限值（%） 是否必填：是*/ - private BigDecimal oddVoltLimit; - /*累计超标天数 是否必填：否*/ - private Integer totalOvDays; - /*11次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v11; - /*13次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v13; - /*23次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v23; - /*25次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v25; - /*3次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v3; - /*5次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v5; - /*7次谐波电压95%概率值（%） 是否必填：否*/ - private BigDecimal v7; - - /*电压总谐波畸变率95%概率值统计值（%） 是否必填：否*/ - private BigDecimal vthd; - /*电压总谐波畸变率95%概率值限值（%） 是否必填：是*/ - private BigDecimal vthdLimit; - - - - - -} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/SubstationQualityStatisticsPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java similarity index 96% rename from pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/SubstationQualityStatisticsPO.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java index 480f6ef87..ca74bb289 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/SubstationQualityStatisticsPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterDetailStatisticsPO.java @@ -17,8 +17,8 @@ import java.math.BigDecimal; * @version V1.0.0 */ @Data -@TableName(value = "substation_quality_statistics") -public class SubstationQualityStatisticsPO { +@TableName(value = "converter_detail_statistics") +public class ConverterDetailStatisticsPO { @TableId(value = "id", type = IdType.INPUT) private String id; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterdetailstatisticsPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java similarity index 96% rename from pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterdetailstatisticsPO.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java index adf9d58ec..d0fc2eccf 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterdetailstatisticsPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/send/ConverterIndexStatisticsPO.java @@ -17,8 +17,8 @@ import java.math.BigDecimal; * @version V1.0.0 */ @Data -@TableName(value = "converterdetailstatistics") -public class ConverterdetailstatisticsPO { +@TableName(value = "converter_index_statistics") +public class ConverterIndexStatisticsPO { @TableId(value = "id", type = IdType.INPUT) private String id; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PotoSqlUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PotoSqlUtil.java new file mode 100644 index 000000000..f286882d2 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/PotoSqlUtil.java @@ -0,0 +1,60 @@ +package com.njcn.harmonic.utils; + +import com.njcn.harmonic.pojo.dto.PqTypicalSourceCreateDTO; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +/** + * Description: + * Date: 2023/12/7 16:12【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public class PotoSqlUtil { + public static String generateCreateTableSql(Class entityClass) { + StringBuilder sql = new StringBuilder("CREATE TABLE "); + sql.append(entityClass.getSimpleName()).append(" ("); + + Field[] fields = entityClass.getDeclaredFields(); + for (int i = 0; i < fields.length; i++) { + Field field = fields[i]; + if (!Modifier.isStatic(field.getModifiers())) { + sql.append(field.getName()).append(" "); + Class fieldType = field.getType(); + if (fieldType == int.class || fieldType == Integer.class) { + sql.append("INT"); + } else if (fieldType == String.class) { + sql.append("VARCHAR(255)"); + } else if (fieldType == double.class || fieldType == Double.class) { + sql.append("DOUBLE"); + } else if (fieldType == float.class || fieldType == Float.class) { + sql.append("FLOAT"); + } else if (fieldType == boolean.class || fieldType == Boolean.class) { + sql.append("BOOLEAN"); + } else if (fieldType == java.util.Date.class) { + sql.append("DATE"); + } else if (fieldType == java.math.BigDecimal.class) { + sql.append("decimal"); + } + else { + // 其他类型暂不支持，可以根据需要添加 + continue; + } + + if (i < fields.length - 1) { + sql.append(", "); + } + } + } + + sql.append(");"); + return sql.toString(); + } + + public static void main(String[] args) { + String createTableSql = generateCreateTableSql(PqTypicalSourceCreateDTO.class); + System.out.println(createTableSql); + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java similarity index 78% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java index cbf6720bc..5dbab4104 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterIndexStatisticsController.java @@ -8,8 +8,8 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; -import com.njcn.harmonic.service.send.ConverterdetailstatisticsPOService; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; +import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -37,17 +37,17 @@ import java.util.List; @RequestMapping("/Converterdetail") @Api(tags = "换流站指标统计明细汇总数据") @RequiredArgsConstructor -public class ConverterdetailstatisticsController extends BaseController { +public class ConverterIndexStatisticsController extends BaseController { - private final ConverterdetailstatisticsPOService converterdetailstatisticsPOService; + private final ConverterIndexStatisticsPOService converterIndexStatisticsPOService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPage") @ApiOperation("数据查询") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) { + public HttpResult> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) { String methodDescribe = getMethodDescribe("queryPage"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); - Page list = converterdetailstatisticsPOService.queryPage(param); + Page list = converterIndexStatisticsPOService.queryPage(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } @@ -57,7 +57,7 @@ public class ConverterdetailstatisticsController extends BaseController { @ApiImplicitParam(name = "ids",value = "请求体",required = true) public HttpResult send(@RequestBody List ids){ String methodDescribe = getMethodDescribe("send"); - String s = converterdetailstatisticsPOService.send(ids); + String s = converterIndexStatisticsPOService.send(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java index 10b0126d7..ee741859a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java @@ -8,8 +8,8 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; -import com.njcn.harmonic.service.send.SubstationQualityStatisticsPOService; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; +import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -42,16 +42,16 @@ import java.util.List; public class SubstationQualityStatisticsController extends BaseController { - private final SubstationQualityStatisticsPOService substationQualityStatisticsPOService; + private final ConverterDetailStatisticsPOService converterDetailStatisticsPOService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryPage") @ApiOperation("数据查询") @ApiImplicitParam(name = "param", value = "实体参数", required = true) - public HttpResult> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) { + public HttpResult> queryPage(@Validated @RequestBody SendQueryParam.SendPageParam param) { String methodDescribe = getMethodDescribe("queryPage"); LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); - Page list = substationQualityStatisticsPOService.queryPage(param); + Page list = converterDetailStatisticsPOService.queryPage(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } @@ -61,7 +61,7 @@ public class SubstationQualityStatisticsController extends BaseController { @ApiImplicitParam(name = "ids",value = "请求体",required = true) public HttpResult send(@RequestBody List ids){ String methodDescribe = getMethodDescribe("send"); - String s = substationQualityStatisticsPOService.send(ids); + String s = converterDetailStatisticsPOService.send(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, s, methodDescribe); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/SubstationQualityStatisticsPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterDetailStatisticsPOMapper.java similarity index 54% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/SubstationQualityStatisticsPOMapper.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterDetailStatisticsPOMapper.java index 42479a443..7ecc3ad69 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/SubstationQualityStatisticsPOMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterDetailStatisticsPOMapper.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.mapper.send; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; /** * @@ -11,5 +11,5 @@ import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; * @author clam * @version V1.0.0 */ -public interface SubstationQualityStatisticsPOMapper extends BaseMapper { +public interface ConverterDetailStatisticsPOMapper extends BaseMapper { } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterdetailstatisticsPOMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterIndexStatisticsPOMapper.java similarity index 55% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterdetailstatisticsPOMapper.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterIndexStatisticsPOMapper.java index abf902323..08897b712 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterdetailstatisticsPOMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/ConverterIndexStatisticsPOMapper.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.mapper.send; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; /** * @@ -11,5 +11,5 @@ import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; * @author clam * @version V1.0.0 */ -public interface ConverterdetailstatisticsPOMapper extends BaseMapper { +public interface ConverterIndexStatisticsPOMapper extends BaseMapper { } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/ConverterdetailstatisticsPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/ConverterdetailstatisticsPOMapper.xml deleted file mode 100644 index 56f766a12..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/ConverterdetailstatisticsPOMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - id, abnormalBusAvgRate, abnormalBusNum, abnormalBusRate, abnormalConverterAvgRate, - abnormalConverterNum, abnormalConverterRate, cityId, cityName, monitorAlternatingBusNum, - monitorAlternatingBusRate, monitorConverterNum, monitorConverterRate, onlineAlternatingBusNum, - onlineConverterNum, provinceName, provinceId, statisticalDate, statisticalType, statisticalLevel, - abnormalConverterCount, monitorConverterCount, abnormalBusCount, monitorAlternatingBusCount - - \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/PqTypicalSourceCreatePOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/PqTypicalSourceCreatePOMapper.xml deleted file mode 100644 index 5ad6a7132..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/PqTypicalSourceCreatePOMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - id, statisticalDate, statisticalLevel, statisticalType, indexType, provinceId, provinceName, - cityId, cityName, countyId, countyName, industryType, interferenceSourceNum, averageOvDays, - flickerAvgOvRate, flickerOvNum, flickerOvRate, iAvgOvRate, iOvNum, iOvRate, inseqAvgOvRate, - inseqOvNum, inseqOvRate, monitorNum, monitoringRate, ovNum, ovRate, unbanOvNum, unbanOvRate, - vAvgOvRate, vOvNum, vOvRate, unbanAvgOvRate, ovDayCount - - \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/SubstationQualityStatisticsPOMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/SubstationQualityStatisticsPOMapper.xml deleted file mode 100644 index 07e4ac234..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/send/mapping/SubstationQualityStatisticsPOMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - id, statisticalDate, statisticalType, provinceId, provinceName, cityId, cityName, - countyId, countyName, converterId, converterName, voltageLevel, busId, busName, busVoltageLevel, - monitorId, effectiveMonitorNum, harmvOvDay, monthsCount, monthOvDays, oddVoltLimit, - totalOvDays, v11, v13, v23, v25, v3, v5, v7, vthd, vthdLimit - - \ No newline at end of file diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java similarity index 60% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java index 0aa0ae409..0a08950dc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterDetailStatisticsPOService.java @@ -3,7 +3,7 @@ package com.njcn.harmonic.service.send; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; import java.util.List; @@ -15,10 +15,10 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface SubstationQualityStatisticsPOService extends IService{ +public interface ConverterDetailStatisticsPOService extends IService{ - Page queryPage(SendQueryParam.SendPageParam param); + Page queryPage(SendQueryParam.SendPageParam param); String send(List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java similarity index 61% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java index 2eec20301..1a3e653f7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterIndexStatisticsPOService.java @@ -3,7 +3,7 @@ package com.njcn.harmonic.service.send; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; import java.util.List; @@ -15,10 +15,10 @@ import java.util.List; * @author clam * @version V1.0.0 */ -public interface ConverterdetailstatisticsPOService extends IService{ +public interface ConverterIndexStatisticsPOService extends IService{ - Page queryPage(SendQueryParam.SendPageParam param); + Page queryPage(SendQueryParam.SendPageParam param); String send(List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java similarity index 72% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java index 3cbce80c6..847611377 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterDetailStatisticsPOServiceImpl.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.harmonic.mapper.send.ConverterdetailstatisticsPOMapper; +import com.njcn.harmonic.mapper.send.ConverterDetailStatisticsPOMapper; import com.njcn.harmonic.pojo.dto.ConverterDetailStatisticsDTO; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; -import com.njcn.harmonic.service.send.ConverterdetailstatisticsPOService; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; +import com.njcn.harmonic.service.send.ConverterDetailStatisticsPOService; import com.njcn.user.api.DeptFeignClient; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.pojo.param.SendParam; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; /** * * Description: - * Date: 2023/12/11 11:35【需求编号】 + * Date: 2023/12/7 16:21【需求编号】 * * @author clam * @version V1.0.0 @@ -35,38 +35,42 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl implements ConverterdetailstatisticsPOService { +public class ConverterDetailStatisticsPOServiceImpl extends ServiceImpl implements ConverterDetailStatisticsPOService { + private final DeptFeignClient deptFeignClient; + + @Override - public Page queryPage(SendQueryParam.SendPageParam param) { - Page page = new Page<> (param.getPageNum ( ), param.getPageSize ( )); + public Page queryPage(SendQueryParam.SendPageParam param) { + Page page = new Page<> (param.getPageNum ( ), param.getPageSize ( )); List deptIds = deptFeignClient.getDepSonSelfCodetByCode(param.getDeptIndex()).getData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().in(ConverterdetailstatisticsPO::getProvinceId,deptIds). - between(ConverterdetailstatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); - Page converterdetailstatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(ConverterDetailStatisticsPO::getProvinceId,deptIds). + between(ConverterDetailStatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); + Page substationQualityStatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); - return converterdetailstatisticsPOPage; + return substationQualityStatisticsPOPage; } @Override public String send(List ids) { - List list = this.lambdaQuery().eq(ConverterdetailstatisticsPO::getId, ids).list(); + + List list = this.lambdaQuery().eq(ConverterDetailStatisticsPO::getId, ids).list(); if (list.size() > 100) { throw new BusinessException("一次最多上送100条数据"); } - List converterDetailStatisticsDTOS = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class); + List converterDetailStatisticsDTOList = BeanUtil.copyToList(list, ConverterDetailStatisticsDTO.class); SendParam param = new SendParam(); - param.setStats(converterDetailStatisticsDTOS); + param.setStats(converterDetailStatisticsDTOList); String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); - Map send = GwSendUtil.send(param, GWSendEnum.DETAIL_CREATE); + Map send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR); log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); - List trIds = converterDetailStatisticsDTOS.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList()); + List trIds = converterDetailStatisticsDTOList.stream().map(ConverterDetailStatisticsDTO::getId).distinct().collect(Collectors.toList()); return returnInformation(1, trIds, send); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java similarity index 65% rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java rename to pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java index a5168981f..516aa8de3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterIndexStatisticsPOServiceImpl.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.harmonic.mapper.send.SubstationQualityStatisticsPOMapper; -import com.njcn.harmonic.pojo.dto.SubstationQualityStatisticsDTO; +import com.njcn.harmonic.mapper.send.ConverterIndexStatisticsPOMapper; +import com.njcn.harmonic.pojo.dto.ConverterIndexStatisticsDTO; import com.njcn.harmonic.pojo.param.SendQueryParam; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; -import com.njcn.harmonic.service.send.SubstationQualityStatisticsPOService; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; +import com.njcn.harmonic.service.send.ConverterIndexStatisticsPOService; import com.njcn.user.api.DeptFeignClient; import com.njcn.web.enums.GWSendEnum; import com.njcn.web.pojo.param.SendParam; @@ -27,7 +27,7 @@ import java.util.stream.Collectors; /** * * Description: - * Date: 2023/12/7 16:21【需求编号】 + * Date: 2023/12/11 11:35【需求编号】 * * @author clam * @version V1.0.0 @@ -35,42 +35,38 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor @Slf4j -public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl implements SubstationQualityStatisticsPOService { - +public class ConverterIndexStatisticsPOServiceImpl extends ServiceImpl implements ConverterIndexStatisticsPOService { private final DeptFeignClient deptFeignClient; - - @Override - public Page queryPage(SendQueryParam.SendPageParam param) { - Page page = new Page<> (param.getPageNum ( ), param.getPageSize ( )); + public Page queryPage(SendQueryParam.SendPageParam param) { + Page page = new Page<> (param.getPageNum ( ), param.getPageSize ( )); List deptIds = deptFeignClient.getDepSonSelfCodetByCode(param.getDeptIndex()).getData(); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().in(SubstationQualityStatisticsPO::getProvinceId,deptIds). - between(SubstationQualityStatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); - Page substationQualityStatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(ConverterIndexStatisticsPO::getProvinceId,deptIds). + between(ConverterIndexStatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); + Page converterdetailstatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); - return substationQualityStatisticsPOPage; + return converterdetailstatisticsPOPage; } @Override public String send(List ids) { - - List list = this.lambdaQuery().eq(SubstationQualityStatisticsPO::getId, ids).list(); + List list = this.lambdaQuery().eq(ConverterIndexStatisticsPO::getId, ids).list(); if (list.size() > 100) { throw new BusinessException("一次最多上送100条数据"); } - List substationQualityStatisticsDTOList = BeanUtil.copyToList(list, SubstationQualityStatisticsDTO.class); + List converterIndexStatisticsDTOS = BeanUtil.copyToList(list, ConverterIndexStatisticsDTO.class); SendParam param = new SendParam(); - param.setStats(substationQualityStatisticsDTOList); + param.setStats(converterIndexStatisticsDTOS); String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); log.info(Thread.currentThread().getName() + "获取返回体 换流站指标统计明细数据接口数据：" + s + "开始----！"); - Map send = GwSendUtil.send(param, GWSendEnum.SUBSTATION_MONITOR); + Map send = GwSendUtil.send(param, GWSendEnum.DETAIL_CREATE); log.info(Thread.currentThread().getName() + "获取返回体换流站指标统计明细数据接口响应结果：" + send + "结束----！"); - List trIds = substationQualityStatisticsDTOList.stream().map(SubstationQualityStatisticsDTO::getId).distinct().collect(Collectors.toList()); + List trIds = converterIndexStatisticsDTOS.stream().map(ConverterIndexStatisticsDTO::getId).distinct().collect(Collectors.toList()); return returnInformation(1, trIds, send); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java index 41c9c2efc..1b1f388f6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java @@ -13,7 +13,7 @@ import com.njcn.prepare.harmonic.service.mysql.dim.*; import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; import com.njcn.prepare.harmonic.service.mysql.newalgorithm.*; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadEvaluationDataDService; -import com.njcn.prepare.harmonic.service.mysql.send.ConverterdetailstatisticsPOService; +import com.njcn.prepare.harmonic.service.mysql.send.ConverterIndexStatisticsPOService; import com.njcn.prepare.harmonic.service.mysql.send.PqTypicalSourceCreatePOService; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService; import com.yomahub.liteflow.annotation.LiteflowComponent; @@ -74,7 +74,7 @@ public class OrgPointExecutor extends BaseExecutor{ private final IRUploadPointStatisticalDataDService irUploadPointStatisticalDataDService; - private final ConverterdetailstatisticsPOService converterdetailstatisticsPOService; + private final ConverterIndexStatisticsPOService converterIndexStatisticsPOService; private final PqTypicalSourceCreatePOService pqTypicalSourceCreatePOService; private final IRUploadEvaluationDataDService irUploadEvaluationDataDService; /** @@ -628,14 +628,14 @@ public class OrgPointExecutor extends BaseExecutor{ * 2.4.1.18 接收电能质量换流站指标汇总统计数据接口 * xuyang */ - @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "converterdetailstatistics", nodeType = NodeTypeEnum.COMMON) - public boolean converterdetailstatisticsAccess(NodeComponent bindCmp) { + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "converterIndexStatistics", nodeType = NodeTypeEnum.COMMON) + public boolean converterIndexStatisticsAccess(NodeComponent bindCmp) { return isAccess(bindCmp); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "converterdetailstatistics", nodeType = NodeTypeEnum.COMMON) - public void converterdetailstatisticsProcess(NodeComponent bindCmp) { + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "converterIndexStatistics", nodeType = NodeTypeEnum.COMMON) + public void converterIndexStatisticsProcess(NodeComponent bindCmp) { CalculatedParam calculatedParam = bindCmp.getRequestData(); - converterdetailstatisticsPOService.handlerDay(calculatedParam); + converterIndexStatisticsPOService.handlerDay(calculatedParam); } /** *河北国网上送接口 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java index fb2ae25db..f02abaa32 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/SubStationExecutor.java @@ -4,7 +4,7 @@ import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatSubstationService; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadSubstationStatisticalDataDService; -import com.njcn.prepare.harmonic.service.mysql.send.SubstationQualityStatisticsPOService; +import com.njcn.prepare.harmonic.service.mysql.send.ConverterDetailStatisticsPOService; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; @@ -27,7 +27,7 @@ public class SubStationExecutor extends BaseExecutor{ private final PollutionService pollutionService; private final RStatSubstationService rStatSubstationService; - private final SubstationQualityStatisticsPOService substationQualityStatisticsPOService; + private final ConverterDetailStatisticsPOService converterDetailStatisticsPOService; private final IRUploadSubstationStatisticalDataDService rUploadSubstationStatisticalDataDService; @@ -71,16 +71,16 @@ public class SubStationExecutor extends BaseExecutor{ * 2.4.1.19 接收电能质量换流站指标统计明细数据接口 * */ - @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "substationQualityStatistics", nodeType = NodeTypeEnum.COMMON) - public boolean processSubstationQualityStatistics(NodeComponent bindCmp) { + @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "converterDetailStatistics", nodeType = NodeTypeEnum.COMMON) + public boolean processConverterDetailStatisticsStatistics(NodeComponent bindCmp) { return isAccess(bindCmp); } - @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "substationQualityStatistics", nodeType = NodeTypeEnum.COMMON) - public void processSubstationQualityStatisticss(NodeComponent bindCmp) { + @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "converterDetailStatistics", nodeType = NodeTypeEnum.COMMON) + public void processConverterDetailStatisticsStatisticss(NodeComponent bindCmp) { String tag = bindCmp.getTag(); CalculatedParam calculatedParam = bindCmp.getRequestData(); - substationQualityStatisticsPOService.handleDay(calculatedParam); + converterDetailStatisticsPOService.handleDay(calculatedParam); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/SubstationQualityStatisticsPOMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterDetailStatisticsPOMapper.java similarity index 56% rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/SubstationQualityStatisticsPOMapper.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterDetailStatisticsPOMapper.java index c14cdf05d..310b75004 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/SubstationQualityStatisticsPOMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterDetailStatisticsPOMapper.java @@ -1,7 +1,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.send; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; /** * @@ -11,5 +11,5 @@ import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; * @author clam * @version V1.0.0 */ -public interface SubstationQualityStatisticsPOMapper extends BaseMapper { +public interface ConverterDetailStatisticsPOMapper extends BaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterdetailstatisticsPOMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterIndexStatisticsPOMapper.java similarity index 57% rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterdetailstatisticsPOMapper.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterIndexStatisticsPOMapper.java index 09af2a210..8432954e6 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterdetailstatisticsPOMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/ConverterIndexStatisticsPOMapper.java @@ -1,7 +1,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.send; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; /** * @@ -11,5 +11,5 @@ import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; * @author clam * @version V1.0.0 */ -public interface ConverterdetailstatisticsPOMapper extends BaseMapper { +public interface ConverterIndexStatisticsPOMapper extends BaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/ConverterdetailstatisticsPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/ConverterdetailstatisticsPOMapper.xml deleted file mode 100644 index 682bc8bb9..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/ConverterdetailstatisticsPOMapper.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, abnormalBusAvgRate, abnormalBusNum, abnormalBusRate, abnormalConverterAvgRate, - abnormalConverterNum, abnormalConverterRate, cityId, cityName, monitorAlternatingBusNum, - monitorAlternatingBusRate, monitorConverterNum, monitorConverterRate, onlineAlternatingBusNum, - onlineConverterNum, provinceName, provinceId, statisticalDate, statisticalType, statisticalLevel, - abnormalConverterCount, monitorConverterCount, abnormalBusCount, monitorAlternatingBusCount - - \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml deleted file mode 100644 index 5ad6a7132..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/PqTypicalSourceCreatePOMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - id, statisticalDate, statisticalLevel, statisticalType, indexType, provinceId, provinceName, - cityId, cityName, countyId, countyName, industryType, interferenceSourceNum, averageOvDays, - flickerAvgOvRate, flickerOvNum, flickerOvRate, iAvgOvRate, iOvNum, iOvRate, inseqAvgOvRate, - inseqOvNum, inseqOvRate, monitorNum, monitoringRate, ovNum, ovRate, unbanOvNum, unbanOvRate, - vAvgOvRate, vOvNum, vOvRate, unbanAvgOvRate, ovDayCount - - \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/SubstationQualityStatisticsPOMapper.xml b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/SubstationQualityStatisticsPOMapper.xml deleted file mode 100644 index 4739d4a94..000000000 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/send/mapping/SubstationQualityStatisticsPOMapper.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, statisticalDate, statisticalType, provinceId, provinceName, cityId, cityName, - countyId, countyName, converterId, converterName, voltageLevel, busId, busName, busVoltageLevel, - monitorId, effectiveMonitorNum, harmvOvDay, monthsCount, monthOvDays, oddVoltLimit, - totalOvDays, v11, v13, v23, v25, v3, v5, v7, vthd, vthdLimit - - \ No newline at end of file diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/SubstationQualityStatisticsPOService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterDetailStatisticsPOService.java similarity index 67% rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/SubstationQualityStatisticsPOService.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterDetailStatisticsPOService.java index 469b9c4f7..0da9ca049 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/SubstationQualityStatisticsPOService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterDetailStatisticsPOService.java @@ -1,6 +1,6 @@ package com.njcn.prepare.harmonic.service.mysql.send; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; @@ -12,7 +12,7 @@ import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; * @author clam * @version V1.0.0 */ -public interface SubstationQualityStatisticsPOService extends IService{ +public interface ConverterDetailStatisticsPOService extends IService{ void handleDay(CalculatedParam calculatedParam); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterdetailstatisticsPOService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterIndexStatisticsPOService.java similarity index 72% rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterdetailstatisticsPOService.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterIndexStatisticsPOService.java index ce57042e5..cb8a06ea3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterdetailstatisticsPOService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/ConverterIndexStatisticsPOService.java @@ -1,7 +1,7 @@ package com.njcn.prepare.harmonic.service.mysql.send; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; -import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; +import com.njcn.harmonic.pojo.po.send.ConverterIndexStatisticsPO; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; @@ -13,7 +13,7 @@ import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; * @author clam * @version V1.0.0 */ -public interface ConverterdetailstatisticsPOService extends IService{ +public interface ConverterIndexStatisticsPOService extends IService{ void handlerDay(CalculatedParam calculatedParam); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/SubstationQualityStatisticsPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/ConverterDetailStatisticsPOServiceImpl.java similarity index 67% rename from pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/SubstationQualityStatisticsPOServiceImpl.java rename to pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/ConverterDetailStatisticsPOServiceImpl.java index 9070d4825..3d9c7060a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/SubstationQualityStatisticsPOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/ConverterDetailStatisticsPOServiceImpl.java @@ -12,15 +12,15 @@ import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.po.Monitor; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.harmonic.pojo.po.day.RStatDataVDPO; -import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; -import com.njcn.prepare.harmonic.mapper.mysql.send.SubstationQualityStatisticsPOMapper; +import com.njcn.harmonic.pojo.po.send.ConverterDetailStatisticsPO; +import com.njcn.prepare.harmonic.mapper.mysql.send.ConverterDetailStatisticsPOMapper; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.pojo.mysql.ROperatingMonitorDPO; import com.njcn.prepare.harmonic.pojo.po.RStatSubstationMPO; import com.njcn.prepare.harmonic.service.mysql.day.IRStatDataVDService; import com.njcn.prepare.harmonic.service.mysql.line.ROperatingMonitorService; import com.njcn.prepare.harmonic.service.mysql.newalgorithm.RStatSubstationMPOService; -import com.njcn.prepare.harmonic.service.mysql.send.SubstationQualityStatisticsPOService; +import com.njcn.prepare.harmonic.service.mysql.send.ConverterDetailStatisticsPOService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -50,7 +50,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor -public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl implements SubstationQualityStatisticsPOService{ +public class ConverterDetailStatisticsPOServiceImpl extends ServiceImpl implements ConverterDetailStatisticsPOService { private final MonitorClient monitorClient; private final DeptFeignClient deptFeignClient; @@ -65,7 +65,7 @@ public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl calculatedParam) { - List substationQualityStatisticsPOList = new ArrayList<>(); + List converterDetailStatisticsPOList = new ArrayList<>(); List monitorList = monitorClient.getMonitorList(new ArrayList<>()).getData(); // List pmsGeneratrixDTOList = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(new PmsGeneratrixParam()).getData(); List stationList = statationStatClient.getstatationStatList(new PmsBaseParam()).getData(); @@ -87,12 +87,12 @@ public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl tempGeneratrixDTOList = pmsGeneratrixDTOList.stream().filter(pmsGeneratrixDTO -> Objects.equals(pmsGeneratrixDTO.getPowerId(), temp.getPowerId())).collect(Collectors.toList()); List tempMonitorList = monitorList.stream().filter(monitor -> Objects.equals(monitor.getPowerrId(), temp.getPowerId())).collect(Collectors.toList()); List monitorIdList = tempMonitorList.stream().map(Monitor::getId).collect(Collectors.toList()); - substationQualityStatisticsPO.setStatisticalDate(calculatedParam.getDataDate()); - substationQualityStatisticsPO.setStatisticalType("03"); + converterDetailStatisticsPO.setStatisticalDate(calculatedParam.getDataDate()); + converterDetailStatisticsPO.setStatisticalType("03"); if (mapCode.containsKey(temp.getOrgId())) { PvTerminalTreeVO pvTerminalTreeVO = mapCode.get(temp.getOrgId()); @@ -103,42 +103,42 @@ public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl cp95 = IRStatDataVDService.lambdaQuery(). @@ -171,38 +171,38 @@ public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl implements ConverterdetailstatisticsPOService{ +public class ConverterIndexStatisticsPOServiceImpl extends ServiceImpl implements ConverterIndexStatisticsPOService { private final MonitorClient monitorClient; @@ -69,7 +69,7 @@ public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl calculatedParam) { - List converterdetailstatisticsPOList = new ArrayList<>(); + List converterIndexStatisticsPOList = new ArrayList<>(); LocalDate localDate = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate(), DatePattern.NORM_DATE_PATTERN); @@ -86,9 +86,9 @@ public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl lineBaseList = deptGetChildrenMoreDTO.getLineBaseList(); @@ -134,8 +134,8 @@ public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl data = pmsGeneratrixClient.getGeneratrixInfo(pmsGeneratrixParam).getData(); List exchangelineIds = data.stream().filter(temp -> exchangeList.contains(temp.getGeneratrixVoltageLevel())). map(PmsGeneratrixDTO::getGeneratrixId).collect(Collectors.toList()); - converterdetailstatisticsPO.setOnlineAlternatingBusNum(exchangelineIds.size()); - converterdetailstatisticsPO.setOnlineConverterNum(powerrIds.size()); + converterIndexStatisticsPO.setOnlineAlternatingBusNum(exchangelineIds.size()); + converterIndexStatisticsPO.setOnlineConverterNum(powerrIds.size()); //监测监测点 List list = new ArrayList<>(); if (!CollectionUtils.isEmpty(tempIds)) { @@ -156,10 +156,10 @@ public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl supervisexchangelineIds = data.stream().filter(temp -> supervisgeneratrixIds.contains(temp.getGeneratrixVoltageLevel())). map(PmsGeneratrixDTO::getGeneratrixId).collect(Collectors.toList()); - converterdetailstatisticsPO.setMonitorAlternatingBusCount(supervisexchangelineIds.size()); - converterdetailstatisticsPO.setMonitorConverterCount(supervispowerrIds.size()); - converterdetailstatisticsPO.setMonitorAlternatingBusNum(supervisexchangelineIds.size()); - converterdetailstatisticsPO.setMonitorConverterNum(supervispowerrIds.size()); + converterIndexStatisticsPO.setMonitorAlternatingBusCount(supervisexchangelineIds.size()); + converterIndexStatisticsPO.setMonitorConverterCount(supervispowerrIds.size()); + converterIndexStatisticsPO.setMonitorAlternatingBusNum(supervisexchangelineIds.size()); + converterIndexStatisticsPO.setMonitorConverterNum(supervispowerrIds.size()); //发生暂态，稳态的监测点集合 List abnormallines; if (!CollectionUtils.isEmpty(tempIds)) { @@ -250,25 +250,25 @@ public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl abnormalpowerrIds = supervisLines.stream().map(Monitor::getPowerrId).distinct().collect(Collectors.toList()); List abnormalgeneratrixIds = supervisLines.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList()); - converterdetailstatisticsPO.setAbnormalBusNum(abnormalgeneratrixIds.size()); - converterdetailstatisticsPO.setAbnormalBusCount(abnormalgeneratrixIds.size()); - converterdetailstatisticsPO.setAbnormalConverterCount(abnormalpowerrIds.size()); - converterdetailstatisticsPO.setAbnormalConverterNum(abnormalpowerrIds.size()); + converterIndexStatisticsPO.setAbnormalBusNum(abnormalgeneratrixIds.size()); + converterIndexStatisticsPO.setAbnormalBusCount(abnormalgeneratrixIds.size()); + converterIndexStatisticsPO.setAbnormalConverterCount(abnormalpowerrIds.size()); + converterIndexStatisticsPO.setAbnormalConverterNum(abnormalpowerrIds.size()); - converterdetailstatisticsPO.setAbnormalBusRate(divideAndRound(converterdetailstatisticsPO.getAbnormalBusNum(),generatrixIds.size())); - converterdetailstatisticsPO.setAbnormalBusAvgRate(divideAndRound(converterdetailstatisticsPO.getAbnormalBusNum(),generatrixIds.size())); + converterIndexStatisticsPO.setAbnormalBusRate(divideAndRound(converterIndexStatisticsPO.getAbnormalBusNum(),generatrixIds.size())); + converterIndexStatisticsPO.setAbnormalBusAvgRate(divideAndRound(converterIndexStatisticsPO.getAbnormalBusNum(),generatrixIds.size())); - converterdetailstatisticsPO.setAbnormalConverterRate(divideAndRound(converterdetailstatisticsPO.getAbnormalConverterNum(),powerrIds.size())); - converterdetailstatisticsPO.setAbnormalConverterAvgRate(divideAndRound(converterdetailstatisticsPO.getAbnormalConverterNum(),powerrIds.size())); + converterIndexStatisticsPO.setAbnormalConverterRate(divideAndRound(converterIndexStatisticsPO.getAbnormalConverterNum(),powerrIds.size())); + converterIndexStatisticsPO.setAbnormalConverterAvgRate(divideAndRound(converterIndexStatisticsPO.getAbnormalConverterNum(),powerrIds.size())); - converterdetailstatisticsPO.setMonitorConverterRate(divideAndRound(converterdetailstatisticsPO.getMonitorConverterNum(),powerrIds.size())); - converterdetailstatisticsPO.setMonitorAlternatingBusRate(divideAndRound(converterdetailstatisticsPO.getMonitorAlternatingBusNum(),generatrixIds.size())); + converterIndexStatisticsPO.setMonitorConverterRate(divideAndRound(converterIndexStatisticsPO.getMonitorConverterNum(),powerrIds.size())); + converterIndexStatisticsPO.setMonitorAlternatingBusRate(divideAndRound(converterIndexStatisticsPO.getMonitorAlternatingBusNum(),generatrixIds.size())); } - converterdetailstatisticsPOList.add(converterdetailstatisticsPO); + converterIndexStatisticsPOList.add(converterIndexStatisticsPO); } - if(!CollectionUtils.isEmpty(converterdetailstatisticsPOList)){ - this.saveOrUpdateBatch(converterdetailstatisticsPOList); + if(!CollectionUtils.isEmpty(converterIndexStatisticsPOList)){ + this.saveOrUpdateBatch(converterIndexStatisticsPOList); } } /**