diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java new file mode 100644 index 000000000..1c302b5bf --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/DimBusBarParam.java @@ -0,0 +1,39 @@ +package com.njcn.harmonic.pojo.param.upload; + +import lombok.Data; + +import java.util.List; + +/** + * pqs + * + * @author cdf + * @date 2024/5/9 + */ +@Data +public class DimBusBarParam { + private String busId; + private List busIds; + private String busName; + private String dataSource; + private String deployState; + private String detailType; + private String endTime; + private Integer harmonicNum; + private String indexType; + private String monitorId; + private String nodeId; + private String nodeLevel; + private List seqs; + private String startTime; + private String statDate; + private String statType; + private String stationName; + private String voltageLevel; + private Integer pageNum; + private Integer pageSize; + + + private List onlineBusIds; + private List orgIds; +} diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticD.java similarity index 95% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticD.java index 6e3e76181..47733505f 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticD.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -43,6 +43,8 @@ public class PmsRunStatisticD { private String onlineBusIds; + private String onlineBusMidIds; + private String runDevIds; private String runStationIds; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticM.java similarity index 95% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticM.java index 8b4b6e012..df50866b7 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticM.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -46,6 +46,8 @@ public class PmsRunStatisticM { private String onlineBusIds; + private String onlineBusMidIds; + private String runDevIds; private String runStationIds; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticY.java similarity index 95% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticY.java index 647339bde..1d5f4742c 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsRunStatisticY.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -46,6 +46,8 @@ public class PmsRunStatisticY { private String onlineBusIds; + private String onlineBusMidIds; + private String runDevIds; private String runStationIds; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpD.java similarity index 71% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpD.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpD.java index 1dc651a25..70e8d86c8 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpD.java @@ -1,10 +1,13 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import java.io.Serializable; import java.time.LocalDate; + +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -16,17 +19,19 @@ import lombok.Setter; * @author cdf * @since 2024-05-09 */ -@Getter -@Setter +@Data @TableName("r_dim_bus_up_d") -public class RDimBusUpD extends BaseEntity { +public class RDimBusUpD { private static final long serialVersionUID = 1L; + @MppMultiId private LocalDate statisticDate; + @MppMultiId private String phasicType; + @MppMultiId private String busId; private String midBusId; @@ -35,9 +40,9 @@ public class RDimBusUpD extends BaseEntity { private String effectIds; - private String vlotageLevel; + private String voltageLevel; - private Integer v; + private Double v; private Integer allTime; @@ -203,4 +208,55 @@ public class RDimBusUpD extends BaseEntity { private Integer uharm50Overtime; + public RDimBusUpD() { + this.uharm2Overtime = 0; + this.uharm3Overtime = 0; + this.uharm4Overtime = 0; + this.uharm5Overtime = 0; + this.uharm6Overtime = 0; + this.uharm7Overtime = 0; + this.uharm8Overtime = 0; + this.uharm9Overtime = 0; + this.uharm10Overtime = 0; + this.uharm11Overtime = 0; + this.uharm12Overtime = 0; + this.uharm13Overtime = 0; + this.uharm14Overtime = 0; + this.uharm15Overtime = 0; + this.uharm16Overtime = 0; + this.uharm17Overtime = 0; + this.uharm18Overtime = 0; + this.uharm19Overtime = 0; + this.uharm20Overtime = 0; + this.uharm21Overtime = 0; + this.uharm22Overtime = 0; + this.uharm23Overtime = 0; + this.uharm24Overtime = 0; + this.uharm25Overtime = 0; + this.uharm26Overtime = 0; + this.uharm27Overtime = 0; + this.uharm28Overtime = 0; + this.uharm29Overtime = 0; + this.uharm30Overtime = 0; + this.uharm31Overtime = 0; + this.uharm32Overtime = 0; + this.uharm33Overtime = 0; + this.uharm34Overtime = 0; + this.uharm35Overtime = 0; + this.uharm36Overtime = 0; + this.uharm37Overtime = 0; + this.uharm38Overtime = 0; + this.uharm39Overtime = 0; + this.uharm40Overtime = 0; + this.uharm41Overtime = 0; + this.uharm42Overtime = 0; + this.uharm43Overtime = 0; + this.uharm44Overtime = 0; + this.uharm45Overtime = 0; + this.uharm46Overtime = 0; + this.uharm47Overtime = 0; + this.uharm48Overtime = 0; + this.uharm49Overtime = 0; + this.uharm50Overtime = 0; + } } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpM.java similarity index 94% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpM.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpM.java index 03669a997..5a77fcd03 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpM.java @@ -1,6 +1,7 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import java.io.Serializable; import java.time.LocalDate; @@ -22,10 +23,13 @@ public class RDimBusUpM extends BaseEntity { private static final long serialVersionUID = 1L; + @MppMultiId private LocalDate statisticDate; + @MppMultiId private String phasicType; + @MppMultiId private String busId; private String effectId; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpY.java similarity index 94% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpY.java rename to pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpY.java index 374f3b3de..d12539fbe 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RDimBusUpY.java @@ -1,6 +1,7 @@ -package com.njcn.prepare.harmonic.pojo.po; +package com.njcn.harmonic.pojo.po.upload; import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import com.njcn.db.bo.BaseEntity; import java.io.Serializable; import java.time.LocalDate; @@ -22,10 +23,13 @@ public class RDimBusUpY extends BaseEntity { private static final long serialVersionUID = 1L; + @MppMultiId private LocalDate statisticDate; + @MppMultiId private String phasicType; + @MppMultiId private String busId; private String effectId; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/DimBusBarVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/DimBusBarVO.java new file mode 100644 index 000000000..cc46dd8b6 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/DimBusBarVO.java @@ -0,0 +1,33 @@ +package com.njcn.harmonic.pojo.vo.upload; + +import lombok.Data; + +/** + * pqs + * + * @author cdf + * @date 2024/5/9 + */ +@Data +public class DimBusBarVO { + + private String astId; + private String busName; + private String busVoltageLevel; + private String busVoltageLevelName; + private String cityOrg; + private String cityOrgName; + private String deviceStatus; + private String maintCrew; + private String maintCrewName; + private String maintOrg; + private String maintOrgName; + private String operationDate; + private String psrId; + private String psrStateName; + private String stationId; + private String stationName; + private String stationType; + private String stationVoltageLevel; + private String stationVoltageLevelName; +} diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/PmsHttpResult.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/PmsHttpResult.java new file mode 100644 index 000000000..68627510b --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/upload/PmsHttpResult.java @@ -0,0 +1,30 @@ +package com.njcn.harmonic.pojo.vo.upload; + +import lombok.Data; + +/** + * pqs + * + * @author cdf + * @date 2024/5/9 + */ +@Data +public class PmsHttpResult { + private String msg; + + private Integer code; + + private T data; + + private String sucess; + + private String encrypt_data; + + private String other; + + + public PmsHttpResult(Integer code,T data){ + this.code = code; + this.data = data; + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java index 0f1854c6f..8cc3f7632 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDataController.java @@ -9,6 +9,9 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; +import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; +import com.njcn.harmonic.pojo.vo.upload.PmsHttpResult; import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; import com.njcn.harmonic.service.upload.IEvaluationDataService; import com.njcn.web.controller.BaseController; @@ -38,6 +41,7 @@ import org.springframework.web.bind.annotation.RestController; public class EvaluationDataController extends BaseController { private final IEvaluationDataService evaluationDataService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getEvaluationData") @ApiOperation("查询母线基准水平评估数据") @@ -60,4 +64,7 @@ public class EvaluationDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java new file mode 100644 index 000000000..024d2056d --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/EvaluationDownController.java @@ -0,0 +1,50 @@ +package com.njcn.harmonic.controller.upload; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; +import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; +import com.njcn.harmonic.pojo.vo.upload.PmsHttpResult; +import com.njcn.harmonic.service.upload.IEvaluationDataService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +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; + +/** + * pqs + * + * @author cdf + * @date 2024/5/10 + */ +@Slf4j +@RestController +@RequestMapping("/IndexAnalysis/BenchmarkLevelEva") +@Api(tags = "基准水平下穿查询") +@AllArgsConstructor +public class EvaluationDownController extends BaseController { + + private final IEvaluationDataService evaluationDataService; + + /** + * 接收总部基准水平评估在运母线数量详情下穿接口 + * @author cdf + * @date 2024/5/9 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getBaseEvaOnlineBusDetail") + @ApiOperation("国网上送-接收总部基准水平评估在运母线数量详情下穿接口") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public PmsHttpResult> getBaseEvaOnlineBusDetail(@RequestBody DimBusBarParam param) { + String methodDescribe = getMethodDescribe("getBaseEvaOnlineBusDetail"); + Page page = evaluationDataService.getBaseEvaOnlineBusDetail(param); + return new PmsHttpResult<>(0, page); + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RUploadEvaluationDataDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RUploadEvaluationDataDMapper.xml new file mode 100644 index 000000000..61501aec1 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RUploadEvaluationDataDMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticDMapper.java new file mode 100644 index 000000000..dd2a26957 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticDMapper.java @@ -0,0 +1,19 @@ +package com.njcn.harmonic.mapper.upload; + + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface PmsRunStatisticDMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticMMapper.java new file mode 100644 index 000000000..ae34fadb6 --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticMMapper.java @@ -0,0 +1,19 @@ +package com.njcn.harmonic.mapper.upload; + + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticM; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface PmsRunStatisticMMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticYMapper.java new file mode 100644 index 000000000..e9b9a3d0b --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/PmsRunStatisticYMapper.java @@ -0,0 +1,19 @@ +package com.njcn.harmonic.mapper.upload; + + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticY; + + +/** + *

+ * Mapper 接口 + *

+ * + * @author cdf + * @since 2024-04-17 + */ +public interface PmsRunStatisticYMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpDMapper.java new file mode 100644 index 000000000..38df187ce --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpDMapper.java @@ -0,0 +1,18 @@ +package com.njcn.harmonic.mapper.upload; + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpD; + + +/** + *

+ * 母线越限详情 Mapper 接口 + *

+ * + * @author cdf + * @since 2024-05-09 + */ +public interface RDimBusUpDMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpMMapper.java new file mode 100644 index 000000000..e5b331a8c --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpMMapper.java @@ -0,0 +1,18 @@ +package com.njcn.harmonic.mapper.upload; + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpM; + + +/** + *

+ * 母线越限详情 Mapper 接口 + *

+ * + * @author cdf + * @since 2024-05-09 + */ +public interface RDimBusUpMMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpYMapper.java new file mode 100644 index 000000000..a061f8e4d --- /dev/null +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RDimBusUpYMapper.java @@ -0,0 +1,18 @@ +package com.njcn.harmonic.mapper.upload; + + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpY; + + +/** + *

+ * 母线越限详情 Mapper 接口 + *

+ * + * @author cdf + * @since 2024-05-09 + */ +public interface RDimBusUpYMapper extends MppBaseMapper { + +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RUploadEvaluationDataDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RUploadEvaluationDataDMapper.java index 15c879f28..b1d387493 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RUploadEvaluationDataDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/upload/RUploadEvaluationDataDMapper.java @@ -1,7 +1,11 @@ package com.njcn.harmonic.mapper.upload; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; +import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,6 @@ import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; */ public interface RUploadEvaluationDataDMapper extends BaseMapper { + public Page getBaseEvaOnlineBusDetail(@Param("page") Page page, @Param("param") DimBusBarParam param); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java index 21a80f0c5..b6342aff6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IEvaluationDataService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; +import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; /** @@ -29,4 +31,6 @@ public interface IEvaluationDataService extends IService */ String uploadEvaluationData(UploadParam param); + Page getBaseEvaOnlineBusDetail(DimBusBarParam param); + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java index f6692fd66..f8afd0d1d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java @@ -5,18 +5,24 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; 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.upload.RUploadEvaluationDataDMapper; +import com.njcn.harmonic.mapper.upload.*; import com.njcn.harmonic.pojo.dto.upload.PqEvaluationCreateDTO; import com.njcn.harmonic.pojo.param.UploadDataParam; import com.njcn.harmonic.pojo.param.UploadParam; +import com.njcn.harmonic.pojo.param.upload.DimBusBarParam; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpD; import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD; +import com.njcn.harmonic.pojo.vo.upload.DimBusBarVO; import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo; import com.njcn.harmonic.service.upload.IEvaluationDataService; import com.njcn.system.api.DicDataFeignClient; @@ -33,10 +39,8 @@ import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.time.LocalDate; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -56,6 +60,19 @@ public class REvaluationDataServiceImpl extends ServiceImpl getEvaluationData(UploadDataParam param) { LambdaQueryWrapper lambdaQueryWrapper = this.getDeptLevel(param); @@ -63,19 +80,19 @@ public class REvaluationDataServiceImpl extends ServiceImpl page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper); List voList = BeanUtil.copyToList(page.getRecords(), UploadEvaluationDataVo.class); - if (CollectionUtil.isNotEmpty(voList)){ - voList = voList.stream().peek(item->{ - if (!Objects.equals(item.getAvgValue(),3.1415926)){ + if (CollectionUtil.isNotEmpty(voList)) { + voList = voList.stream().peek(item -> { + if (!Objects.equals(item.getAvgValue(), 3.1415926)) { BigDecimal four = BigDecimal.valueOf(item.getAvgValue()); - double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + double value = four.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); item.setAvgValue(value); - } else if (!Objects.equals(item.getStandardDeviation(),3.1415926)){ + } else if (!Objects.equals(item.getStandardDeviation(), 3.1415926)) { BigDecimal four = BigDecimal.valueOf(item.getStandardDeviation()); - double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + double value = four.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); item.setStandardDeviation(value); } BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate()); - double value = four.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + double value = four.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); item.setMonitorBusRate(value); }).collect(Collectors.toList()); } @@ -93,17 +110,17 @@ public class REvaluationDataServiceImpl extends ServiceImpl list; //指定数据上送,不管之前有没有上送,都重新上送一次 //(预防之前上送过,修改数据后需要再次上送) - if (CollUtil.isNotEmpty(param.getList())){ + if (CollUtil.isNotEmpty(param.getList())) { list = this.lambdaQuery() - .eq(RUploadEvaluationDataD::getComputeDate,param.getTime()) - .in(RUploadEvaluationDataD::getId,param.getList()) + .eq(RUploadEvaluationDataD::getComputeDate, param.getTime()) + .in(RUploadEvaluationDataD::getId, param.getList()) .list(); } //未指定数据上送,则上送省级数据(包含日、月数据) else { list = this.lambdaQuery() - .eq(RUploadEvaluationDataD::getComputeDate,param.getTime()) - .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3","4").collect(Collectors.toList())) + .eq(RUploadEvaluationDataD::getComputeDate, param.getTime()) + .in(RUploadEvaluationDataD::getStatisticalLevel, Stream.of("3", "4").collect(Collectors.toList())) .list(); } @@ -150,11 +167,107 @@ public class REvaluationDataServiceImpl extends ServiceImpl send = GwSendUtil.send(sp, GWSendEnum.EVALUATION); //获取返回结果 List l = dtoList.stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList()); - returnInformation(i,l,send); + returnInformation(i, l, send); } return "上送成功:成功数据" + list.size() + "条"; } + @Override + public Page getBaseEvaOnlineBusDetail(DimBusBarParam param) { + Dept dept = deptFeignClient.getRootDept().getData(); + List temBusIds = new ArrayList<>(); + + //统计类型不为空，则查询指定统计天数的数据 + if (StrUtil.isNotBlank(param.getStatType())) { + //判断日月年不为空时候对应参数不能为空 + if (StrUtil.isBlank(param.getStartTime()) || StrUtil.isBlank(param.getEndTime())) { + //TODO 需要抛出异常，抛异常格式需要和总部要求格式一致 + } + + if (StrUtil.isBlank(param.getNodeId())) { + //没有组织id则认为查询日的省级数据 + param.setNodeId(dept.getCode()); + } + List orgIds = deptFeignClient.getDepSonSelfCodetByCode(param.getNodeId()).getData(); + param.setOrgIds(orgIds); + + if (param.getStatType().equals("03")) { + LocalDate day = LocalDate.parse(param.getStartTime()); + //具体日期投运,监测台账查询 + LambdaQueryWrapper dayLam = new LambdaQueryWrapper<>(); + dayLam.eq(PmsRunStatisticD::getStatisticDate, day).in(PmsRunStatisticD::getDeptId, param.getNodeId()); + PmsRunStatisticD pmsRunStatisticD = pmsRunStatisticDMapper.selectOne(dayLam); + if (Objects.nonNull(pmsRunStatisticD)) { + if (StrUtil.isNotBlank(param.getDataSource())) { + temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticD.getOnlineBusMidIds().split(StrUtil.COMMA))); + } else { + temBusIds = new ArrayList<>(Arrays.asList(pmsRunStatisticD.getRunBusIds().split(StrUtil.COMMA))); + } + } + + //稳态指标条件筛选 + if (StrUtil.isNotBlank(param.getIndexType())) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + this.harmTarget(param, queryWrapper); + queryWrapper.eq("statistic_date", day); + List rDimBusUpDList = rDimBusUpDMapper.selectList(queryWrapper); + if (CollectionUtil.isEmpty(rDimBusUpDList)) { + return new Page<>(); + } + temBusIds = rDimBusUpDList.stream().map(RDimBusUpD::getMidBusId).distinct().collect(Collectors.toList()); + } + param.setOnlineBusIds(temBusIds); + + + } else if (param.getStatType().equals("02")) { + + } else if (param.getStatType().equals("01")) { + + } + } + + return this.baseMapper.getBaseEvaOnlineBusDetail(new Page<>(param.getPageNum(), param.getPageSize()), param); + + } + + + private void harmTarget(DimBusBarParam param, QueryWrapper queryWrapper) { + //稳态指标条件筛选 + String target = "", harmV = ""; + switch (param.getIndexType()) { + case "01": + target = "voltage_dev_overtime"; + break; + case "02": + target = "flicker_overtime"; + break; + case "03": + target = "ubalance_overtime"; + break; + case "04": + target = "uaberrance_overtime"; + break; + case "05": + target = "harm_v"; + break; + } + + + queryWrapper.select("statistic_date", "phasic_type", "bus_id", "mid_bus_id"); + + if (CollectionUtil.isNotEmpty(param.getSeqs())) { + queryWrapper.in("phasic_type", param.getSeqs()); + } + + if (param.getIndexType().equals("05")) { + harmV = "uharm_" + param.getHarmonicNum() + "_overtime"; + queryWrapper.gt(harmV, 0); + } else { + queryWrapper.gt(target, 0); + } + + } + /** * 获取当前单位的层级 @@ -191,7 +304,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl ids, Map send) { @@ -243,8 +356,8 @@ public class REvaluationDataServiceImpl extends ServiceImpl ids) { @@ -268,7 +382,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl { + + } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java index 32b0dc36a..0c481a26d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/PmsRunStatisticMapper.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java index 68bdfa95a..98957d240 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticDMapper.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java index 629069feb..0cd9ccccd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticMMapper.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticM; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java index acd7b76e5..ba2936d88 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/PmsRunStatisticYMapper.java @@ -3,7 +3,7 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticY; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpDMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpDMapper.java index f43c94684..9a6e08a8d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpDMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpDMapper.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpD; /** *

@@ -12,6 +12,6 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD; * @author cdf * @since 2024-05-09 */ -public interface RDimBusUpDMapper extends BaseMapper { +public interface RDimBusUpDMapper extends MppBaseMapper { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpMMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpMMapper.java index 4f005cd6c..ede65b1bd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpMMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpMMapper.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpM; /** *

@@ -12,6 +12,6 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM; * @author cdf * @since 2024-05-09 */ -public interface RDimBusUpMMapper extends BaseMapper { +public interface RDimBusUpMMapper extends MppBaseMapper { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpYMapper.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpYMapper.java index 1bb272c2b..fbea092dd 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpYMapper.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RDimBusUpYMapper.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.mapper.mysql.upload; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpY; /** *

@@ -12,6 +12,6 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY; * @author cdf * @since 2024-05-09 */ -public interface RDimBusUpYMapper extends BaseMapper { +public interface RDimBusUpYMapper extends MppBaseMapper { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java index 5575c4b13..1db3a273e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticMService.java @@ -2,7 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.upload; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticM; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java index 98adbb1a8..f0334f448 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticService.java @@ -2,7 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.upload; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java index 2aa74d42a..6cc51f38d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IPmsRunStatisticYService.java @@ -2,7 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.upload; import com.github.jeffreyning.mybatisplus.service.IMppService; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticY; /** *

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpDService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpDService.java index b189afafd..1bb195529 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpDService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpDService.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.service.mysql.upload; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD; +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpD; /** *

@@ -12,6 +12,8 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpD; * @author cdf * @since 2024-05-09 */ -public interface IRDimBusUpDService extends IService { +public interface IRDimBusUpDService extends IMppService { + + void handBusDay(String date); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpMService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpMService.java index 3a09f1fd3..b3cd02c78 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpMService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpMService.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.service.mysql.upload; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM; +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpM; /** *

@@ -12,6 +12,8 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM; * @author cdf * @since 2024-05-09 */ -public interface IRDimBusUpMService extends IService { +public interface IRDimBusUpMService extends IMppService { + + void handMonth(String date); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpYService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpYService.java index 107052733..62000e713 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpYService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRDimBusUpYService.java @@ -1,8 +1,8 @@ package com.njcn.prepare.harmonic.service.mysql.upload; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY; +import com.github.jeffreyning.mybatisplus.service.IMppService; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpY; /** *

@@ -12,6 +12,6 @@ import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY; * @author cdf * @since 2024-05-09 */ -public interface IRDimBusUpYService extends IService { +public interface IRDimBusUpYService extends IMppService { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java index 654e6fcb5..1bc6b6bae 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java @@ -7,10 +7,11 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.device.pms.pojo.po.PmsMidLedger; import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticDMapper; import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticMMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticM; import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticMService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -39,7 +40,7 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl poList = new ArrayList<>(); DateTime begin = DateUtil.beginOfMonth(DateUtil.parse(date)); - DateTime end = DateUtil.endOfMonth(DateUtil.parse(date)); + DateTime end = DateUtil.parse(date); ZoneId zoneId = ZoneId.systemDefault(); LocalDate localDate = begin.toInstant().atZone(zoneId).toLocalDate(); @@ -58,6 +59,7 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl pointOnlineSet = new HashSet<>(); Set busSet = new HashSet<>(); + Set busMidSet = new HashSet<>(); Set busRunSet = new HashSet<>(); Set stationSet = new HashSet<>(); @@ -74,6 +76,11 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl monitorList = pmsMonitorPOMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getMonitorState,dictData.getId()).eq(Monitor::getIsUpToGrid,DataStateEnum.ENABLE.getCode())); + List generatrixWireIds = monitorList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList()); + List generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId,generatrixWireIds)); + List statationStatList = pmsStatationStatMapper.selectList(new LambdaQueryWrapper().isNotNull(StatationStat::getMidStationId)); @@ -138,8 +144,11 @@ public class PmsRunStatisticServiceImpl extends MppServiceImplchildrenDept.contains(it.getSectionId())).map(PmsMidLedger::getId).distinct().collect(Collectors.joining(StrUtil.COMMA)); pmsRunStatisticD.setRunBusIds(temRunBusIds); - List runBusIds = monitorList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(Monitor::getLineId).distinct().collect(Collectors.toList()); - pmsRunStatisticD.setOnlineBusIds(String.join(StrUtil.COMMA, runBusIds)); + List onlineBusIds = monitorList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(Monitor::getLineId).distinct().collect(Collectors.toList()); + pmsRunStatisticD.setOnlineBusIds(String.join(StrUtil.COMMA, onlineBusIds)); + List onlineBusMidIds = generatrixWireList.stream().filter(it->onlineBusIds.contains(it.getId())).map(GeneratrixWire::getMidBusId).distinct().collect(Collectors.toList()); + pmsRunStatisticD.setOnlineBusMidIds(String.join(StrUtil.COMMA, onlineBusMidIds)); + List runStationIds = statationStatList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(StatationStat::getPowerId).distinct().collect(Collectors.toList()); pmsRunStatisticD.setOnlineStationIds(String.join(StrUtil.COMMA, runStationIds)); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java index f23dd1def..777671963 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java @@ -7,11 +7,9 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticDMapper; -import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticMMapper; import com.njcn.prepare.harmonic.mapper.mysql.upload.PmsRunStatisticYMapper; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticM; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticY; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticY; import com.njcn.prepare.harmonic.service.mysql.upload.IPmsRunStatisticYService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -43,7 +41,7 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl poList = new ArrayList<>(); DateTime begin = DateUtil.beginOfYear(DateUtil.parse(date)); - DateTime end = DateUtil.endOfYear(DateUtil.parse(date)); + DateTime end = DateUtil.parse(date); ZoneId zoneId = ZoneId.systemDefault(); LocalDate localDate = begin.toInstant().atZone(zoneId).toLocalDate(); @@ -62,6 +60,7 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl pointOnlineSet = new HashSet<>(); Set busSet = new HashSet<>(); + Set busMidSet = new HashSet<>(); Set busRunSet = new HashSet<>(); Set stationSet = new HashSet<>(); @@ -78,6 +77,11 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl * 母线越限详情 服务实现类 @@ -16,8 +42,88 @@ import org.springframework.stereotype.Service; * @since 2024-05-09 */ @Service -public class RDimBusUpDServiceImpl extends ServiceImpl implements IRDimBusUpDService { +@RequiredArgsConstructor +public class RDimBusUpDServiceImpl extends MppServiceImpl implements IRDimBusUpDService { - // void handBusDay(); + private final RStatIntegrityDMapper rStatIntegrityDMapper; + private final PmsMonitorPOMapper pmsMonitorPOMapper; + + private final DicDataFeignClient dicDataFeignClient; + + private final RStatLimitRateDMapper rStatLimitRateDMapper; + + private final GeneratrixWireMapper generatrixWireMapper; + + private final RStatDataVDMapper rStatDataVDMapper; + + + @Override + public void handBusDay(String date) { + LocalDate localDate = LocalDate.parse(date); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("time_id","line_index","real_time/due_time as integrityData","real_time","due_time"). + eq("time_id",localDate); + //.gt("integrityData",0.95); + + List rStatIntegrityDList = rStatIntegrityDMapper.selectList(queryWrapper); + //Map rStatIntegrityDMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex, Function.identity())); + + DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(), DicDataTypeEnum.LINE_STATE.getCode()).getData(); + List monitorList = pmsMonitorPOMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getIsUpToGrid,1).eq(Monitor::getMonitorState,dictData.getId())); + + List allMonitorIds = monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList()); + + List lineIds = monitorList.stream().map(Monitor::getLineId).distinct().collect(Collectors.toList()); + List generatrixWireList = generatrixWireMapper.selectList(new LambdaQueryWrapper().in(GeneratrixWire::getId,lineIds)); + Map generatrixWireMap = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity())); + + List rStatDataVDPOList = rStatDataVDMapper.selectList(new LambdaQueryWrapper().in(RStatDataVDPO::getLineId,allMonitorIds).eq(RStatDataVDPO::getTime,localDate).eq(RStatDataVDPO::getValueType,"AVG").in(RStatDataVDPO::getPhasicType, Stream.of("A","B","C").collect(Collectors.toList()))); + Map> vMap = rStatDataVDPOList.stream().collect(Collectors.groupingBy(RStatDataVDPO::getLineId)); + + Map> listMap = monitorList.stream().collect(Collectors.groupingBy(Monitor::getLineId)); + + List poList = new ArrayList<>(); + listMap.forEach((key,val)->{ + List monitorIds = val.stream().map(Monitor::getId).collect(Collectors.toList()); + List temIntegrity = rStatIntegrityDList.stream().filter(it->monitorIds.contains(it.getLineIndex())).collect(Collectors.toList()); + if(CollectionUtil.isNotEmpty(temIntegrity)){ + RStatIntegrityD maxR = temIntegrity.stream().max(Comparator.comparing(RStatIntegrityD::getIntegrityData)).orElse(null); + assert maxR != null; + List rStatLimitRateDPOList = rStatLimitRateDMapper.selectList( + new LambdaQueryWrapper().eq(RStatLimitRateDPO::getLineId,maxR.getLineIndex()) + .eq(RStatLimitRateDPO::getTime,localDate).in(RStatLimitRateDPO::getPhasicType,Stream.of("A","B","C").collect(Collectors.toList()))); + + GeneratrixWire generatrixWire = generatrixWireMap.get(key); + String effectIds = temIntegrity.stream().map(RStatIntegrityD::getLineIndex).collect(Collectors.joining(StrUtil.COMMA)); + + Double temAvg= 3.14159; + if(vMap.containsKey(maxR.getLineIndex())){ + List vList = vMap.get(maxR.getLineIndex()); + temAvg = vList.stream().mapToDouble(RStatDataVDPO::getRms).average().orElse(3.14159); + } + + for(RStatLimitRateDPO rStatLimitRateDPO: rStatLimitRateDPOList){ + RDimBusUpD rDimBusUpD = new RDimBusUpD(); + + BeanUtil.copyProperties(rStatLimitRateDPO,rDimBusUpD); + + + rDimBusUpD.setBusId(key); + rDimBusUpD.setMidBusId(generatrixWire.getMidBusId()); + rDimBusUpD.setStatisticDate(localDate); + rDimBusUpD.setEffectId(maxR.getLineIndex()); + rDimBusUpD.setEffectIds(effectIds); + rDimBusUpD.setVoltageLevel(generatrixWire.getScale()); + rDimBusUpD.setV(temAvg); + + poList.add(rDimBusUpD); + } + + } + }); + + this.saveOrUpdateBatchByMultiId(poList); + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java index b661b7c62..0c408098e 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpMServiceImpl.java @@ -1,9 +1,9 @@ package com.njcn.prepare.harmonic.service.mysql.upload.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.prepare.harmonic.mapper.mysql.upload.RDimBusUpMMapper; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpM; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpM; import com.njcn.prepare.harmonic.service.mysql.upload.IRDimBusUpMService; import org.springframework.stereotype.Service; @@ -16,6 +16,10 @@ import org.springframework.stereotype.Service; * @since 2024-05-09 */ @Service -public class RDimBusUpMServiceImpl extends ServiceImpl implements IRDimBusUpMService { +public class RDimBusUpMServiceImpl extends MppServiceImpl implements IRDimBusUpMService { + @Override + public void handMonth(String date) { + + } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java index 61c5cd4ff..157dbeb26 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RDimBusUpYServiceImpl.java @@ -1,9 +1,9 @@ package com.njcn.prepare.harmonic.service.mysql.upload.impl; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.prepare.harmonic.mapper.mysql.upload.RDimBusUpYMapper; -import com.njcn.prepare.harmonic.pojo.po.RDimBusUpY; +import com.njcn.harmonic.pojo.po.upload.RDimBusUpY; import com.njcn.prepare.harmonic.service.mysql.upload.IRDimBusUpYService; import org.springframework.stereotype.Service; @@ -16,6 +16,6 @@ import org.springframework.stereotype.Service; * @since 2024-05-09 */ @Service -public class RDimBusUpYServiceImpl extends ServiceImpl implements IRDimBusUpYService { +public class RDimBusUpYServiceImpl extends MppServiceImpl implements IRDimBusUpYService { } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java index 08dd7cca9..64b6bfb9d 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java @@ -19,7 +19,7 @@ import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper; import com.njcn.prepare.harmonic.mapper.mysql.line.PmsRunStatisticMapper; import com.njcn.prepare.harmonic.mapper.mysql.upload.RUploadPointStatisticalDataDMapper; import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; -import com.njcn.prepare.harmonic.pojo.po.PmsRunStatisticD; +import com.njcn.harmonic.pojo.po.upload.PmsRunStatisticD; import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient;