diff --git a/pqs-algorithm/pom.xml b/pqs-algorithm/pom.xml new file mode 100644 index 000000000..8608b4337 --- /dev/null +++ b/pqs-algorithm/pom.xml @@ -0,0 +1,20 @@ + + + + pqs + com.njcn + 1.0.0 + + 4.0.0 + + pqs-algorithm + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java index 4174afdce..d4e5aa778 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java @@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @author hany * @since 2022-10-26 @@ -13,69 +16,91 @@ import lombok.EqualsAndHashCode; public class PowerDistributionareaParam { @ApiModelProperty("台区编号") + @NotBlank(message = "台区编号不可为空") private String id; @ApiModelProperty(name = "name", value = "台区名称") + @NotBlank(message = "台区名称不可为空") private String name; @ApiModelProperty(name = "orgName", value = "组织机构名称") + @NotBlank(message = "组织机构名称不可为空") private String orgName; - @ApiModelProperty(name = "orgId", value = "组织机构ID") + @ApiModelProperty(name = "orgId", value = "组织机构编号") + @NotBlank(message = "组织机构编号不可为空") private String orgId; @ApiModelProperty(name = "operationName", value = "运维单位名称") + @NotBlank(message = "运维单位名称不可为空") private String operationName; - @ApiModelProperty(name = "operationId", value = "运维单位ID") + @ApiModelProperty(name = "operationId", value = "运维单位编号") + @NotBlank(message = "运维单位编号不可为空") private String operationId; @ApiModelProperty(name = "powerrName", value = "变电站名称") + @NotBlank(message = "变电站名称不可为空") private String powerrName; - @ApiModelProperty(name = "powerStationId", value = "电站ID") + @ApiModelProperty(name = "powerStationId", value = "电站编号") + @NotBlank(message = "电站编号不可为空") private String powerStationId; @ApiModelProperty(name = "lineName", value = "监测线路名称") + @NotBlank(message = "监测线路名称不可为空") private String lineName; - @ApiModelProperty(name = "lineId", value = "所属线路ID") + @ApiModelProperty(name = "lineId", value = "所属线路编号") + @NotBlank(message = "所属线路编号不可为空") private String lineId; @ApiModelProperty(name = "pCapacity", value = "配变容量") + @NotNull(message = "配变容量不可为空") private Float pCapacity; @ApiModelProperty(name = "regionalism", value = "地区特征") + @NotBlank(message = "地区特征不可为空") private String regionalism; @ApiModelProperty(name = "ifRuralPowerGrid", value = "是否农网：0-否；1：是") + @NotNull(message = "是否农网不可为空") private Integer ifRuralPowerGrid; @ApiModelProperty(name = "natureOfUse", value = "使用性质") + @NotBlank(message = "使用性质不可为空") private String natureOfUse; @ApiModelProperty(name = "powerSupplyRadius", value = "供电半径") + @NotNull(message = "供电半径不可为空") private Float powerSupplyRadius; @ApiModelProperty(name = "lineLength", value = "供电线路总长度") + @NotNull(message = "供电线路总长度不可为空") private Float lineLength; @ApiModelProperty(name = "state", value = "运行状态") + @NotBlank(message = "运行状态不可为空") private String state; @ApiModelProperty(name = "distributedPhotovoltaicNum", value = "分布式光伏用户数") + @NotNull(message = "分布式光伏用户数不可为空") private Integer distributedPhotovoltaicNum; @ApiModelProperty(name = "photovoltaicCapacity", value = "分布式光伏总装机容量") + @NotNull(message = "分布式光伏总装机容量不可为空") private Float photovoltaicCapacity; @ApiModelProperty(name = "ifBevAp", value = "是否有电动汽车接入：0-否；1：是") + @NotNull(message = "是否有电动汽车接入不可为空") private Integer ifBevAp; @ApiModelProperty(name = "apLoadType", value = "接入负荷类型") + @NotBlank(message = "接入负荷类型不可为空") private String apLoadType; @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是") + @NotNull(message = "是否是上送国网监测点不可为空") private Integer isUpToGrid; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevEvaluateDetailVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevEvaluateDetailVO.java index c7c34fb5f..7fea612e1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevEvaluateDetailVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RMpDevEvaluateDetailVO.java @@ -51,4 +51,7 @@ public class RMpDevEvaluateDetailVO implements Serializable { @ApiModelProperty(name = "assessment", value = "综合评价") private Double assessment; + + @ApiModelProperty(name = "devCount", value = "在运终端数量") + private Integer devCount; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java index 5ed506796..ae27fbbd9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RQualityParameterPollVO.java @@ -55,4 +55,10 @@ public class RQualityParameterPollVO implements Serializable { */ @ApiModelProperty(name = "problemYearOnYear", value = "存在数据质量问题监测点同比") private String problemYearOnYear; + + /** + * 数据类型,字典表（01：主网测点 02：配网测点） + */ + @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点 02：配网测点）") + private String dataType; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java index f419731a8..bfb0cdee2 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerClientController.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.controller.majornetwork; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -98,10 +99,19 @@ public class PowerClientController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPowerClientList") @ApiOperation("获取用电用户列表") - @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) - public HttpResult> getPowerClientList(@RequestBody BaseParam baseParam) { + public HttpResult> getPowerClientList() { String methodDescribe = getMethodDescribe("getPowerClientList"); - List result = iPowerClientService.getPowerClientList(baseParam); + List result = iPowerClientService.getPowerClientList(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getPowerClientPageList") + @ApiOperation("分页获取用电用户列表") + @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) + public HttpResult> getPowerClientPageList(@RequestBody BaseParam baseParam) { + String methodDescribe = getMethodDescribe("getPowerClientPageList"); + Page result = iPowerClientService.getPowerClientPageList(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java index 0c2f2828a..806993845 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.controller.majornetwork; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -98,10 +99,19 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPowerGenerationUserList") @ApiOperation("获取发电用户列表") - @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) - public HttpResult> getPowerGenerationUserList(@RequestBody BaseParam baseParam) { + public HttpResult> getPowerGenerationUserList() { String methodDescribe = getMethodDescribe("getPowerGenerationUserList"); - List result = iPowerGenerationUserService.getPowerGenerationUserList(baseParam); + List result = iPowerGenerationUserService.getPowerGenerationUserList(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getPowerGenerationUserPageList") + @ApiOperation("分页获取发电用户列表") + @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) + public HttpResult> getPowerGenerationUserPageList(@RequestBody BaseParam baseParam) { + String methodDescribe = getMethodDescribe("getPowerGenerationUserPageList"); + Page result = iPowerGenerationUserService.getPowerGenerationUserPageList(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java deleted file mode 100644 index 2cbeb64c0..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RmpEventDetailController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.njcn.device.pms.controller.majornetwork; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; -import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; -import com.njcn.device.pms.service.majornetwork.RmpEventDetailService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 暂态事件明细 - * - * @author yzh - * @date 2022/10/12 - */ - -@RestController -@RequestMapping("/rmpEventDetail") -@Api(tags = "暂态事件明细") -@RequiredArgsConstructor -public class RmpEventDetailController extends BaseController { - - private final RmpEventDetailService rmpEventDetailService; - - /** - * 获取暂态事件明细 - * - * @param param 前端传入参数 - * @return 暂态事件明细 - */ - @PostMapping("/getDetailsOfTransientEvents") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("获取区域暂态指标统计") - @ApiImplicitParam(name = "param", value = "前端参数", required = true) - public HttpResult> getRmpEventDetail(@RequestBody UniversalFrontEndParam param) { - String methodDescribe = getMethodDescribe("getRmpEventDetail"); - List list = rmpEventDetailService.getRmpEventDetail(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java index 2ee003689..1cc4994dc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RQualityParameterMapper.java @@ -19,15 +19,15 @@ public interface RQualityParameterMapper { /** * 获取主网数据质量-台账数据质量统计 * - * @param param 条件参数 - * @param deptIdList 单位id - * @param dataType 主网测点 + * @param param 条件参数 + * @param deptIdList 单位id + * @param distributionPoint 配网测点 * @return java.util.List * @author yzh * @date 2022/11/2 */ List getLedgerDataQualityStat(@Param("param") StatisticsBizBaseParam param, @Param("deptIdList") List deptIdList, - @Param("dataType") String dataType); + @Param("distributionPoint") String distributionPoint); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java index 7f80918e4..f5d5aaffb 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatAccountCheckDataMapper.java @@ -19,36 +19,42 @@ public interface RStatAccountCheckDataMapper { /** * 获取主网数据质量-台帐类数据质量核查（年） * - * @param param 条件参数 - * @param deptIdList 单位id + * @param param 条件参数 + * @param deptIdList 单位id + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getYearInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatAccountCheckDataYearInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); /** * 获取主网数据质量-台帐类数据质量核查（季） * - * @param param 条件参数 - * @param deptIdList 单位id + * @param param 条件参数 + * @param deptIdList 单位id + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getSeasonInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatAccountCheckDataSeasonInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); /** * 获取主网数据质量-台帐类数据质量核查（月） * - * @param param 单位id - * @param deptIdList 条件参数 + * @param param 单位id + * @param deptIdList 条件参数 + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getMonthInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatAccountCheckDataMonthInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java index 2bb66b516..a08b0915b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatTargetCheckDataMapper.java @@ -19,36 +19,42 @@ public interface RStatTargetCheckDataMapper { /** * 获取主网数据质量-台帐类数据质量核查（年） * - * @param param 条件参数 - * @param deptIdList 单位id + * @param param 条件参数 + * @param deptIdList 单位id + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getYearInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatTargetCheckDataYearInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); /** * 获取主网数据质量-台帐类数据质量核查（季） * - * @param param 条件参数 - * @param deptIdList 单位id + * @param param 条件参数 + * @param deptIdList 单位id + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getSeasonInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatTargetCheckDataSeasonInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); /** * 获取主网数据质量-台帐类数据质量核查（月） * - * @param param 条件参数 - * @param deptIdList 单位id + * @param param 条件参数 + * @param deptIdList 单位id + * @param mainnetPoint 主网字典id * @return java.util.List * @author yzh * @date 2022/11/2 */ - List getMonthInfo(@Param("param") StatisticsBizBaseParam param, - @Param("deptIdList") List deptIdList); + List getRStatTargetCheckDataMonthInfo(@Param("param") StatisticsBizBaseParam param, + @Param("deptIdList") List deptIdList, + @Param("mainnetPoint") String mainnetPoint); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml index 3144eeb24..a9a310e74 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RQualityParameterMapper.xml @@ -40,8 +40,8 @@ AND DATE_FORMAT(b.data_date, '%Y-%m-%d') <= DATE_FORMAT(#{param.endTime}, '%Y-%m-%d') - - AND b.data_type = #{dataType} + + AND b.data_type = #{distributionPoint} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml index 4f7578c92..de706433e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatAccountCheckDataMapper.xml @@ -30,6 +30,7 @@ #{item} + AND data_type = #{mainnetPoint} AND DATE_FORMAT(data_date, '%Y-%m-%d') >= DATE_FORMAT(#{param.startTime}, '%Y-%m-%d') @@ -39,7 +40,7 @@ - SELECT FROM r_stat_account_check_data_y @@ -48,7 +49,7 @@ - FROM r_stat_account_check_data_q WHERE @@ -56,7 +57,7 @@ - SELECT FROM r_stat_account_check_data_m diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetCheckDataMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetCheckDataMapper.xml index 0b57897a4..159b3e13d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetCheckDataMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/RStatTargetCheckDataMapper.xml @@ -32,6 +32,7 @@ #{item} + AND data_type = #{mainnetPoint} AND DATE_FORMAT( data_date,'%Y-%m-%d') >= DATE_FORMAT(#{param.startTime},'%Y-%m-%d') @@ -41,7 +42,7 @@ - SELECT FROM @@ -51,7 +52,7 @@ - SELECT FROM @@ -61,7 +62,7 @@ - SELECT FROM diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java index fd1f6bc22..9fa22f152 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwDataQualityDetailsServiceImpl.java @@ -135,7 +135,7 @@ public class PwDataQualityDetailsServiceImpl implements PwDataQualityDetailsServ vo.setPlatformAreaName("/"); } // TODO 地市公司 - vo.setCityCompany("南京"); + vo.setCityCompany(dataMap.get(vo.getMonitorId()).getOrgName()); return vo; }).collect(Collectors.toList()); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java index 927abe944..3a6f9e2ef 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRMpMonitorAlarmCountMServiceImpl.java @@ -76,10 +76,8 @@ implements PwRMpMonitorAlarmCountMService { if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } - //单位id集合 - List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取配网id String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java index acc8ee92f..d85279a4c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/PwRStatAreaAlarmCountMServiceImpl.java @@ -61,15 +61,15 @@ implements PwRStatAreaAlarmCountMService{ throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } //单位id集合 - List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取配网id String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData().getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime - lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatAreaAlarmCountM::getOrgNo, orgNoList) + lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgCodeList), RStatAreaAlarmCountM::getOrgNo, orgCodeList) .ge(StringUtils.isNotBlank(startTime), RStatAreaAlarmCountM::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), RStatAreaAlarmCountM::getDataDate, endTime) .eq(RStatAreaAlarmCountM::getDataType, dataType); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java index f7888dadb..cac125f9d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingIndexMServiceImpl.java @@ -56,9 +56,9 @@ public class RDnOperatingIndexMServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取监测点类别字典id String monitorSortOne = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData().getId(); // I类 @@ -66,7 +66,7 @@ public class RDnOperatingIndexMServiceImpl extends ServiceImpl condMap = new HashMap<>(); - condMap.put("orgIdList", orgNoList); + condMap.put("orgIdList", orgCodeList); condMap.put("startTime", startTime); condMap.put("endTime", endTime); condMap.put("monitorSortOne", monitorSortOne); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java index 6ef79bef4..a8a88681f 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java @@ -49,9 +49,9 @@ public class RDnOperatingYServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取监测点类别字典id String monitorSortOne = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData().getId(); // I类 @@ -59,7 +59,7 @@ public class RDnOperatingYServiceImpl extends ServiceImpl condMap = new HashMap<>(); - condMap.put("orgIdList", orgNoList); + condMap.put("orgIdList", orgCodeList); condMap.put("startTime", startTime); condMap.put("endTime", endTime); condMap.put("monitorSortOne", monitorSortOne); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java index 05378259e..b68fef1d8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java @@ -79,14 +79,14 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + //单位code集合 + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptNameMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, DeptDTO::getName)); + Map deptNameMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, DeptDTO::getName)); //设置数据库查询条件 Map condMap = new HashMap<>(); - condMap.put("orgIdList", orgNoList); + condMap.put("orgIdList", orgCodeList); condMap.put("startTime", startTime); condMap.put("endTime", endTime); List list = this.baseMapper.getRStatPwAlarmCountVOList(condMap); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java index 9fd8da52c..4a72a2b4a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerClientService.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.service.majornetwork; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.PowerClientParam; import com.njcn.device.pms.pojo.po.PowerClient; @@ -54,6 +55,14 @@ public interface IPowerClientService extends IService { */ PowerClient getPowerClientById(String powerClientId); + /** + * 查询用电用户列表 + * @author cdf + * @date 2022/10/25 + * @return boolean + */ + List getPowerClientList(); + /** * 查询用电用户列表 * @author cdf @@ -61,6 +70,6 @@ public interface IPowerClientService extends IService { * @param baseParam 基础参数 * @return boolean */ - List getPowerClientList(BaseParam baseParam); + Page getPowerClientPageList(BaseParam baseParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java index c199b1049..7fea9f575 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerGenerationUserService.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.service.majornetwork; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.PowerGenerationUserParam; import com.njcn.device.pms.pojo.po.PowerGenerationUser; @@ -57,9 +58,17 @@ public interface IPowerGenerationUserService extends IService getPowerGenerationUserList(); + + /** + * 分页查询发电用户列表 + * @author cdf + * @date 2022/10/25 * @param baseParam 基础参数 * @return boolean */ - List getPowerGenerationUserList(BaseParam baseParam); + Page getPowerGenerationUserPageList(BaseParam baseParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java deleted file mode 100644 index 9cc40b8c0..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/RmpEventDetailService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.device.pms.service.majornetwork; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; -import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; - -import java.util.List; - -/** - * 暂态事件明细 - * - * @author yzh - * @date 2022/10/12 - */ - -public interface RmpEventDetailService extends IService { - - /** - * 获取暂态事件明细 - * @param param 前端参数 - * @return 暂态事件明细 - */ - List getRmpEventDetail(UniversalFrontEndParam param); -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java index ee2f59b24..40e7c21bd 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityCheckServiceImpl.java @@ -11,6 +11,8 @@ import com.njcn.device.pms.pojo.vo.RStatAccountCheckDataVO; import com.njcn.device.pms.pojo.vo.RStatTargetCheckDataVO; import com.njcn.device.pms.service.majornetwork.DataQualityCheckService; import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataEnum; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -38,6 +40,8 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService { private final RStatTargetCheckDataMapper rStatTargetCheckDataMapper; + private final DicDataFeignClient dicDataFeignClient; + /** * 获取主网数据质量-台帐类数据质量核查 * @@ -56,19 +60,21 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService { List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); // 创建集合封装查询数据 List result = new ArrayList<>(); + // 获取主网字典id + String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); // 获取主网数据质量-台帐类数据质量核查 switch (param.getType()) { // 年 case 1: - result = rStatAccountCheckDataMapper.getYearInfo(param, deptIdList); + result = rStatAccountCheckDataMapper.getRStatAccountCheckDataYearInfo(param, deptIdList, mainnetPoint); break; // 季 case 2: - result = rStatAccountCheckDataMapper.getSeasonInfo(param, deptIdList); + result = rStatAccountCheckDataMapper.getRStatAccountCheckDataSeasonInfo(param, deptIdList, mainnetPoint); break; // 月 case 3: - result = rStatAccountCheckDataMapper.getMonthInfo(param, deptIdList); + result = rStatAccountCheckDataMapper.getRStatAccountCheckDataMonthInfo(param, deptIdList, mainnetPoint); break; default: break; @@ -99,21 +105,23 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService { return Collections.emptyList(); } List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); + // 获取主网字典id + String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); // 创建集合封装数据 List result = new ArrayList<>(); // 获取主网数据质量-台帐类数据质量核查 switch (param.getType()) { // 年 case 1: - result = rStatTargetCheckDataMapper.getYearInfo(param, deptIdList); + result = rStatTargetCheckDataMapper.getRStatTargetCheckDataYearInfo(param, deptIdList, mainnetPoint); break; // 季 case 2: - result = rStatTargetCheckDataMapper.getSeasonInfo(param, deptIdList); + result = rStatTargetCheckDataMapper.getRStatTargetCheckDataSeasonInfo(param, deptIdList, mainnetPoint); break; // 月 case 3: - result = rStatTargetCheckDataMapper.getMonthInfo(param, deptIdList); + result = rStatTargetCheckDataMapper.getRStatTargetCheckDataMonthInfo(param, deptIdList, mainnetPoint); break; default: break; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java index 21be3bbd9..cc2f4c53d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java @@ -75,8 +75,6 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService public List getQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param) { // 获取单位下的子单位信息 List data = getDeptInfo(param); - //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); if (CollUtil.isEmpty(data)) { return Collections.emptyList(); } @@ -99,13 +97,10 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService .stream() .map(RStatMeasurementAccountDetailPO::getMeasurementPointId) .collect(Collectors.toList())); - List monitorInfoDTOS = iMonitorService.getMonitorInfo(pmsMonitorInfoParam); - // //将单位信息转为map集合 key: 单位id value: 单位实体 - Map monitorInfoMap = monitorInfoDTOS - .stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, PmsMonitorInfoDTO -> PmsMonitorInfoDTO)); + List monitorInfoList = iMonitorService.getMonitorInfo(pmsMonitorInfoParam); // 属性赋值 for (RStatMeasurementAccountDetailPO po : pos) { - for (PmsMonitorInfoDTO monitorInfoDTO : monitorInfoDTOS) { + for (PmsMonitorInfoDTO monitorInfoDTO : monitorInfoList) { if (po.getMeasurementPointId().equals(monitorInfoDTO.getMonitorId())) { RStatMeasurementAccountDetailVO vo = new RStatMeasurementAccountDetailVO(); vo.setOrgId(dto.getIndex()); @@ -147,7 +142,7 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService if (CollUtil.isEmpty(tractionStationInfo)) { return Collections.emptyList(); } - //将单位信息转为map集合 key: 单位id value: 单位实体 + // 将单位信息转为map集合 key: 单位id value: 单位实体 Map tractionStationInfoMap = getDataMap(tractionStationInfo); // 获取主网数据质量-台账类数据指标核查详情-牵引站台账数据质量问题 List pos = rStatTractionStationAccountDetailMapper.getTractionPlatformAccountDataQualityProblem(param, @@ -219,7 +214,7 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService vo.setMonitorName(pmsMonitorInfoMap.get(vo.getMonitorId()).getMonitorName()); vo.setMonitorVoltageLevel(pmsMonitorInfoMap.get(vo.getMonitorId()).getMonitorVoltageLevel()); // TODO 地市公司 - vo.setCityCompany("南京"); + vo.setCityCompany(pmsMonitorInfoMap.get(vo.getMonitorId()).getOrgName()); return vo; }).collect(Collectors.toList()); } @@ -232,7 +227,6 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService pmsDeviceInfoParam.setDeptIndex(param.getId()); pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); - } /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java index 321598763..c71285ff6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityStatServiceImpl.java @@ -64,7 +64,7 @@ public class DataQualityStatServiceImpl implements DataQualityStatService { if (CollUtil.isEmpty(data)) { return Collections.emptyList(); } - // 获取配网字典id + // 获取主网字典id String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); // 获取主网数据质量-台账数据质量统计 List pos = rQualityParameterMapper.getLedgerDataQualityStat( @@ -152,7 +152,7 @@ public class DataQualityStatServiceImpl implements DataQualityStatService { return Collections.emptyList(); } List deptIdList = data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()); - // 获取配网字典id + // 获取主网字典id String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); // 获取主网数据质量-监测指标数据质量问题汇总统计 List pos = rQualityParameterMapper.getLedgerDataQualityStat(param, deptIdList, mainnetPoint); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 17cf6d313..782c81976 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -218,13 +218,13 @@ public class MonitorServiceImpl extends ServiceImpl impl private void checkOther(MonitorParam monitorParam,Monitor monitor,boolean update){ //校验组织机构 - Dept dept = deptFeignClient.getDeptById(monitorParam.getOrgId()).getData(); + Dept dept = deptFeignClient.getDeptByCode(monitorParam.getOrgId()).getData(); if(Objects.isNull(dept)){ throw new BusinessException(PmsDeviceResponseEnum.ORG_ITEM_EMPTY); } //校验运维单位 - Dept deptOp = deptFeignClient.getDeptById(monitorParam.getOperationId()).getData(); + Dept deptOp = deptFeignClient.getDeptByCode(monitorParam.getOperationId()).getData(); if(Objects.isNull(deptOp)){ throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java index 5caf95221..f1adcf886 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerClientServiceImpl.java @@ -1,10 +1,15 @@ package com.njcn.device.pms.service.majornetwork.impl; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.device.pms.mapper.majornetwork.PowerClientMapper; import com.njcn.device.pms.pojo.param.PowerClientParam; import com.njcn.device.pms.pojo.po.PowerClient; import com.njcn.device.pms.service.majornetwork.IPowerClientService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -48,7 +53,21 @@ public class PowerClientServiceImpl extends ServiceImpl getPowerClientList(BaseParam baseParam) { - return this.list(); + public List getPowerClientList() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime).eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode()); + return this.list(lambdaQueryWrapper); + } + + + @Override + public Page getPowerClientPageList(BaseParam baseParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime) + .eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode()) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,baseParam.getSearchValue()); + return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java index 45cfe0180..04064adc6 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java @@ -55,7 +55,8 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); } @@ -79,12 +80,12 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl getPowerGenerationUserList(BaseParam baseParam) { - return this.list(); + public List getPowerGenerationUserList() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode()); + return this.list(lambdaQueryWrapper); } + + @Override + public Page getPowerGenerationUserPageList(BaseParam baseParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode()) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerGenerationUser::getOrgName,baseParam.getSearchValue()); + return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); + } + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java index 3d384ed1b..e98ef49ab 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpDevEvaluateDetailServiceImpl.java @@ -24,6 +24,7 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -73,14 +74,12 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + //单位code集合 + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询单位下的终端数据 LambdaQueryWrapper terminalWrapper = new LambdaQueryWrapper<>(); - terminalWrapper.in(PmsTerminal::getOrgId, orgNoList); + terminalWrapper.in(PmsTerminal::getOrgId, orgCodeList); List terminalList = iTerminalService.list(terminalWrapper); if (CollUtil.isEmpty(terminalList)) { return new ArrayList<>(); @@ -89,7 +88,7 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl terminalIdList = terminalList.stream().map(PmsTerminal::getId).collect(Collectors.toList()); //将终端信息转为map集合 key: 终端id value: 终端实体 Map terminalMap = terminalList.stream().collect(Collectors.toMap(PmsTerminal::getId, terminal -> terminal)); - //将终端信息按单位分组 key：单位id value：终端集合 + //将终端信息按单位分组 key：单位id(字段是id实际数据是单位code) value：终端集合 Map> terminalListMapByOrgId = terminalList.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); //查询终端评价详情表数据【r_mp_dev_evaluate_detail】 @@ -100,12 +99,13 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl list = this.list(businessWrapper); //封装返回数据 + DecimalFormat df = new DecimalFormat("###.00"); List resultList = new ArrayList<>(); terminalListMapByOrgId.forEach((key, terminalListByOrg) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); rMpDevEvaluateDetailVO.setDataDate(startTime); //日期(前端传递的时间) - rMpDevEvaluateDetailVO.setOrgId(key); //单位id + rMpDevEvaluateDetailVO.setOrgId(key); //单位id(字段是id实际数据是单位code) rMpDevEvaluateDetailVO.setOrgName(terminalListByOrg.get(0).getOrgName()); //单位名称 //终端有效接入率 @@ -121,7 +121,10 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl terminalWrapper = new LambdaQueryWrapper<>(); terminalWrapper.in(CollUtil.isNotEmpty(manufactureIdList), PmsTerminal::getManufacture, manufactureIdList) .isNotNull(CollUtil.isEmpty(manufactureIdList), PmsTerminal::getManufacture) - .in(CollUtil.isEmpty(deviceModelIdList), PmsTerminal::getDeviceModel, deviceModelIdList); + .in(CollUtil.isNotEmpty(deviceModelIdList), PmsTerminal::getDeviceModel, deviceModelIdList); List terminalList = iTerminalService.list(terminalWrapper); if (CollUtil.isEmpty(terminalList)) { @@ -171,6 +174,7 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl list = this.list(businessWrapper); //封装返回数据 + DecimalFormat df = new DecimalFormat("###.00"); List resultList = new ArrayList<>(); terminalListMapByManufacture.forEach((key, terminalListByManufacture) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); @@ -191,7 +195,10 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl terminalWrapper = new LambdaQueryWrapper<>(); - terminalWrapper.in(CollUtil.isEmpty(deviceModelIdList), PmsTerminal::getDeviceModel, deviceModelIdList); + terminalWrapper.in(CollUtil.isNotEmpty(deviceModelIdList), PmsTerminal::getDeviceModel, deviceModelIdList); List terminalList = iTerminalService.list(terminalWrapper); if (CollUtil.isEmpty(terminalList)) { @@ -236,6 +243,7 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl list = this.list(businessWrapper); //封装返回数据 + DecimalFormat df = new DecimalFormat("###.00"); List resultList = new ArrayList<>(); terminalListMapByModel.forEach((key, terminalListByModel) -> { RMpDevEvaluateDetailVO rMpDevEvaluateDetailVO = new RMpDevEvaluateDetailVO(); @@ -256,7 +264,10 @@ public class RMpDevEvaluateDetailServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询单位下的终端数据 LambdaQueryWrapper terminalWrapper = new LambdaQueryWrapper<>(); - terminalWrapper.in(PmsTerminal::getOrgId, orgNoList); + terminalWrapper.in(PmsTerminal::getOrgId, orgCodeList); List terminalList = iTerminalService.list(terminalWrapper); //提取终端id List terminalIdList = terminalList.stream().map(PmsTerminal::getId).collect(Collectors.toList()); @@ -79,7 +77,7 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl(); } - //将终端信息按单位分组 key：单位id value：终端集合 + //将终端信息按单位分组 key：单位id(字段是org_id实际数据存的是单位表的org_code) value：终端集合 Map> terminalListMapByOrgId = terminalList.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); //查询终端消缺数据 @@ -161,7 +159,7 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl(); } - //将终端信息按厂商分组 key：单位id value：终端集合 + //将终端信息按厂商分组 key：厂商id value：终端集合 Map> terminalListMapByManufacture = terminalList.stream().collect(Collectors.groupingBy(PmsTerminal::getManufacture)); //查询终端消缺数据 @@ -216,6 +214,13 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl + */ @Override public List getTypeRMpDevSolveList(RMpDevAbnormalManageParam rMpDevAbnormalManageParam) { //提取参数 @@ -278,6 +283,14 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl + */ @Override public List getRMpDevSolveDetailList(RMpDevSolveDetailParam rMpDevSolveDetailParam) { //提取参数 @@ -294,11 +307,11 @@ public class RMpDevSolveDetailServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询单位下的终端数据 LambdaQueryWrapper terminalWrapper = new LambdaQueryWrapper<>(); - terminalWrapper.in(PmsTerminal::getOrgId, orgNoList) //单位id + terminalWrapper.in(PmsTerminal::getOrgId, orgCodeList) //单位id .in(CollUtil.isNotEmpty(manufactureIdList), PmsTerminal::getManufacture, manufactureIdList); //厂家 List terminalList = iTerminalService.list(terminalWrapper); if (CollUtil.isEmpty(terminalList)) { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java index 725a74c79..2a3c4a867 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RMpMonitorAlarmCountMServiceImpl.java @@ -72,10 +72,10 @@ implements RMpMonitorAlarmCountMService { if (CollUtil.isEmpty(deptDTOList)) { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } - //单位id集合 - List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + //单位code集合 + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位code value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取电压等级的字典 List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); @@ -90,7 +90,7 @@ implements RMpMonitorAlarmCountMService { //根据条件查询单位下面的所有监测点 LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); - monitorLambdaQueryWrapper.in(Monitor::getOrgId, orgNoList) //单位id + monitorLambdaQueryWrapper.in(Monitor::getOrgId, orgCodeList) //单位code .eq(StringUtils.isNotBlank(monitorObjectType), Monitor::getMonitorObjectType, monitorObjectType) //监测点对象类型id .in(CollUtil.isNotEmpty(voltageLevelParamList), Monitor::getVoltageLevel, voltageLevelParamList) //电压等级id .like(StringUtils.isNotBlank(monitorName), Monitor::getName, monitorName); //监测点名称 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java index e33f833ac..87b78d282 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexMServiceImpl.java @@ -47,14 +47,14 @@ public class ROperatingIndexMServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + //单位code集合 + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //将单位信息转为map集合 key: 单位code value: 单位实体 + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //组装查询条件 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(ROperatingIndexM::getOrgNo, orgNoList) + lambdaQueryWrapper.in(ROperatingIndexM::getOrgNo, orgCodeList) .ge(StringUtils.isNotBlank(startTime), ROperatingIndexM::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), ROperatingIndexM::getDataDate, endTime); //查询数据 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java index a04f9e9f8..548a58423 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/ROperatingIndexYServiceImpl.java @@ -48,13 +48,13 @@ public class ROperatingIndexYServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //组装查询条件 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(ROperatingIndexY::getOrgNo, orgNoList) + lambdaQueryWrapper.in(ROperatingIndexY::getOrgNo, orgCodeList) .ge(StringUtils.isNotBlank(startTime), ROperatingIndexY::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), ROperatingIndexY::getDataDate, endTime); //查询数据 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java index 977450a49..2b6383700 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatAreaAlarmCountMServiceImpl.java @@ -61,15 +61,15 @@ implements RStatAreaAlarmCountMService{ throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } //单位id集合 - List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); //获取主网id String dataType = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime - lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatAreaAlarmCountM::getOrgNo, orgNoList) + lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgCodeList), RStatAreaAlarmCountM::getOrgNo, orgCodeList) .ge(StringUtils.isNotBlank(startTime), RStatAreaAlarmCountM::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), RStatAreaAlarmCountM::getDataDate, endTime) .eq(RStatAreaAlarmCountM::getDataType, dataType); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java index 681b2bbd8..53e3f07e3 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java @@ -13,6 +13,8 @@ import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO; import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO; +import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; +import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -37,9 +39,9 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); + List data = iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); if (CollUtil.isEmpty(data)) { return Collections.emptyList(); } @@ -97,7 +99,7 @@ public class RStatBusbarHarmonicServiceImpl extends ServiceImpl busbarIds = result.stream().map(RStatBusbarHarmonicYVO::getBusbarId).collect(Collectors.toList()); PmsGeneratrixParam pmsGeneratrixParam = new PmsGeneratrixParam(); pmsGeneratrixParam.setGeneratrixIds(busbarIds); - List dtoS = pmsGeneratrixClient.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam).getData(); + List dtoS = pmsGeneratrixService.getGeneratrixAndPowerStationInfo(pmsGeneratrixParam); for (GeneratrixAndPowerStationDTO dto : dtoS) { for (RStatBusbarHarmonicYVO vo : result) { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java index 9edaf53e7..0bd5e05ff 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatDevSignalDServiceImpl.java @@ -57,11 +57,11 @@ public class RStatDevSignalDServiceImpl extends ServiceImpl orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //查询终端数据 LambdaQueryWrapper terminalWrapper = new LambdaQueryWrapper<>(); - terminalWrapper.in(PmsTerminal::getOrgId, orgNoList).like(StringUtils.isNotBlank(deviceName), PmsTerminal::getName, deviceName); + terminalWrapper.in(PmsTerminal::getOrgId, orgCodeList).like(StringUtils.isNotBlank(deviceName), PmsTerminal::getName, deviceName); List terminalList = iTerminalService.list(terminalWrapper); //提取终端id List terminalIdList = terminalList.stream().map(PmsTerminal::getId).collect(Collectors.toList()); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java index 4e78b8817..ae49ce401 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatZwAlarmCountWServiceImpl.java @@ -78,13 +78,13 @@ implements RStatZwAlarmCountWService { throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在"); } //单位id集合 - List orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List orgCodeList = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //将单位信息转为map集合 key: 单位id value: 单位实体 - Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO)); + Map deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, deptDTO -> deptDTO)); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); //条件组装: where org_no in (orgNoList) and data_date >= startTime and data_date <= endTime - lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgNoList), RStatZwAlarmCountW::getOrgNo, orgNoList) + lambdaQueryWrapper.in(CollUtil.isNotEmpty(orgCodeList), RStatZwAlarmCountW::getOrgNo, orgCodeList) .ge(StringUtils.isNotBlank(startTime), RStatZwAlarmCountW::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), RStatZwAlarmCountW::getDataDate, endTime); //查询告警统计(周)集合 @@ -141,15 +141,20 @@ implements RStatZwAlarmCountWService { LambdaQueryWrapper monitorLambdaQueryWrapper = new LambdaQueryWrapper<>(); monitorLambdaQueryWrapper.eq(Monitor::getOrgId, id); List orgMeasurementPointIdList = iMonitorService.list(monitorLambdaQueryWrapper).stream().map(Monitor::getId).collect(Collectors.toList()); - //以周为时间段，查询告警超过四次的监测点信息 todo + //如果单位下没有监测点，直接返回空集合 + if (CollUtil.isEmpty(orgMeasurementPointIdList)) { + return new ArrayList<>(); + } + //以周为时间段，查询告警超过四次的监测点信息 LambdaQueryWrapper targetWarnWrapper = new LambdaQueryWrapper<>(); targetWarnWrapper.select(RMpTargetWarnD::getMeasurementPointId) .in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTime) .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTime) .groupBy(RMpTargetWarnD::getMeasurementPointId) - .or() //拼接or条件 - .eq(RMpTargetWarnD::getIsEffective, 1) //是否是有效接入监测点(0:否 1:是) + //拼接or条件 + .or(qw -> + qw.eq(RMpTargetWarnD::getIsEffective, 1) //是否是有效接入监测点(0:否 1:是) .eq(RMpTargetWarnD::getIsHarmonic, 1) //是否是稳态超标监测点(0:否 1:是) .eq(RMpTargetWarnD::getIsEvent, 1) //是否是发生暂态的监测点(0:否 1:是) .eq(RMpTargetWarnD::getIsWarn, 1) //是否是告警监测点数(0:否 1:是) @@ -160,6 +165,7 @@ implements RStatZwAlarmCountWService { .eq(RMpTargetWarnD::getIsFlickerWarn, 1) //闪变是否告警(0:否 1:是) .eq(RMpTargetWarnD::getIsSagWarn, 1) //电压暂降是否告警(0:否 1:是) .eq(RMpTargetWarnD::getIsInterruptWarn, 1) //短时中断是否告警(0:否 1:是) + ) .having("count(measurement_point_id) >= {0}", 4); // LambdaQueryWrapper alarmDetailWrapper = new LambdaQueryWrapper<>(); @@ -186,17 +192,14 @@ implements RStatZwAlarmCountWService { int monthDay = Month.of(DateUtil.month(date)).getLastDay(DateUtil.isLeapYear(DateUtil.year(date))); //根据单位下监测点idList、月份条件查询监测点告警信息 - List targetWarnDList; //告警超过四次 - if (CollUtil.isEmpty(measurementPointIdList)) { - targetWarnDList = new ArrayList<>(); - } else { - targetWarnWrapper.clear(); - //组装查询条件： - targetWarnWrapper.in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) - .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTimeOfMonth) - .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTimeOfMonth); - targetWarnDList = rMpTargetWarnDService.list(targetWarnWrapper); - } + List targetWarnDList; + + targetWarnWrapper.clear(); + //组装查询条件： + targetWarnWrapper.in(RMpTargetWarnD::getMeasurementPointId, orgMeasurementPointIdList) + .ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTimeOfMonth) + .le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTimeOfMonth); + targetWarnDList = rMpTargetWarnDService.list(targetWarnWrapper); //使用stream的分组方法（Collectors.partitioningBy()）对告警记录和没有告警的记录进行分组 true：有告警的记录 false：没有告警的记录 // Map> booleanListMap = targetWarnDList.stream().collect(Collectors.groupingBy( diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java deleted file mode 100644 index 7bad6a777..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RmpEventDetailServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.device.pms.service.majornetwork.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.mapper.majornetwork.RmpEventDetailMapper; -import com.njcn.device.pms.pojo.param.UniversalFrontEndParam; -import com.njcn.device.pms.pojo.vo.RmpEventDetailVO; -import com.njcn.device.pms.service.majornetwork.RmpEventDetailService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 暂态事件明细 - * - * @author yzh - * @date 2022/10/12 - */ -@Service -@Slf4j -@RequiredArgsConstructor -public class RmpEventDetailServiceImpl extends ServiceImpl implements RmpEventDetailService { - - private final RmpEventDetailMapper rmpEventDetailMapper; - - /** - * 获取暂态事件明细 - * - * @param param 前端参数 - * @return 暂态事件明细 - */ - @Override - public List getRmpEventDetail(UniversalFrontEndParam param) { - return null; - } -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java index ea6a3be0e..ab6e70395 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java @@ -78,12 +78,12 @@ public class TerminalServiceImpl extends ServiceImpl voltageLevels; @ApiModelProperty(name = "powerrIds",value = "变电站id") @@ -31,7 +31,7 @@ public class RStatOrgParam extends StatisticsBizBaseParam { @ApiModelProperty(name = "monitorSort", value = "监测点类别") private List monitorSort; - @ApiModelProperty(name = "voltageLevels", value = "电压等级") - private List voltageLevels; +// @ApiModelProperty(name = "voltageLevels", value = "电压等级") +// private List voltageLevels; } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java index ef11f1c86..2f7b1d340 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java @@ -40,6 +40,12 @@ public class RStatSubstationOrgVO implements Serializable { @ApiModelProperty(name = "orgName", value = "单位名称") private String orgName; + /** + * 监测点类别ID、监测对象类型ID + */ + @ApiModelProperty(name = "measurement_type_class", value = "监测点类别ID、监测对象类型ID") + private String measurementTypeClass; + /** * 生成数据的时间,每年统计一次 */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java index eb0571928..1edda35de 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatOrgController.java @@ -77,7 +77,7 @@ public class PwRStatOrgController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态指标超标明细表") @ApiImplicitParam(name = "param", value = "超标明细参数", required = true) - public HttpResult> getPwRMpPartHarmonicDetail(@RequestBody StatSubstationBizBaseParam param) { + public HttpResult> getPwRMpPartHarmonicDetail(@RequestBody RStatOrgParam.PwRStatOrgParam param) { String methodDescribe = getMethodDescribe("getPwRMpPartHarmonicDetail"); List rMpPartHarmonicDetail = pwRStatOrgService.getRMpPartHarmonicDetail(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpPartHarmonicDetail, methodDescribe); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml index 8e4044d63..3b61cd45c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml @@ -7,7 +7,7 @@ select org_no, data_date, - measurement_type_class, + measurement_type_class as monitorSort, all_count, effective_measurement_average, effective_measurement_accrued, @@ -25,6 +25,12 @@ #{item} + + AND measurement_type_class IN + + #{item} + + AND data_date >= #{param.startTime} @@ -37,7 +43,7 @@ select org_no, data_date, - measurement_type_class, + measurement_type_class as monitorSort, all_count, effective_measurement_average, effective_measurement_accrued, @@ -55,6 +61,12 @@ #{item} + + AND measurement_type_class IN + + #{item} + + AND data_date >= #{param.startTime} @@ -67,12 +79,12 @@ select org_no, data_date, - measurement_type_class, + measurement_type_class as monitorSort, all_count, effective_measurement_average, effective_measurement_accrued, - harmonic_measurement_average, - harmonic_measurement_accrued, + harmonic_measurement_average as overLimitMeasurementAverage, + harmonic_measurement_accrued as overLimitMeasurementAccrued, harmonic_measurement_ratio_average, TRUNCATE(harmonic_measurement_accrued / effective_measurement_accrued ,2) as harmonicMeasurementRatioAccrued, TRUNCATE(over_day_accrued / effective_measurement_accrued ,2) as averageOverDay @@ -85,6 +97,12 @@ #{item} + + AND measurement_type_class IN + + #{item} + + AND data_date >= #{param.startTime} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java index 3529aa31f..09f7bd5aa 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java @@ -1,7 +1,11 @@ package com.njcn.harmonic.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicD; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +17,16 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicD; */ public interface RStatHarmonicDMapper extends BaseMapper { + /** + * 查询全部 + * @param param + * @param dataType + * @param measurementId + * @param harmonicId + * @return + */ + List selectInfoList(@Param("param") StatSubstationBizBaseParam param, + @Param("dataType") String dataType, + @Param("measurementId") String measurementId, + @Param("harmonicId") String harmonicId); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicMMapper.java index e93cdc5d0..a14af1eae 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicMMapper.java @@ -1,7 +1,11 @@ package com.njcn.harmonic.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicM; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,5 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicM; */ public interface RStatHarmonicMMapper extends BaseMapper { - + /** + * 查询监测点 + * @param param + * @param dataType + * @return + */ + List selectInfoList(@Param("param") StatSubstationBizBaseParam param, + @Param("dataType") String dataType); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java index 852a29e13..29290d210 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java @@ -1,7 +1,11 @@ package com.njcn.harmonic.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicQ; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicQ; */ public interface RStatHarmonicQMapper extends BaseMapper { + /** + * 查询监测点 + * @param param + * @param dataType + * @return + */ + List selectInfoList(@Param("param") StatSubstationBizBaseParam param, + @Param("dataType") String dataType); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java index 232b7c879..c52debf9f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java @@ -1,7 +1,12 @@ package com.njcn.harmonic.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM; +import com.njcn.harmonic.pojo.po.RStatHarmonicY; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +18,16 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM; */ public interface RStatHarmonicVoltageMMapper extends BaseMapper { + /** + * 监测点数据查询 + * @param param + * @param dataType + * @param measurementId + * @param harmonicId + * @return + */ + List selectInfoList(@Param("param") StatSubstationBizBaseParam param, + @Param("dataType") String dataType, + @Param("measurementId") String measurementId, + @Param("harmonicId") String harmonicId); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java index d9924203f..11a904bd3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java @@ -1,7 +1,11 @@ package com.njcn.harmonic.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicY; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -13,4 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicY; */ public interface RStatHarmonicYMapper extends BaseMapper { + /** + * 监测点数据查询 + * @param param + * @param dataType + * @return + */ + List selectInfoList(@Param("param") StatSubstationBizBaseParam param, + @Param("dataType") String dataType); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java index 6ceee48d7..f11979180 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgMMapper.java @@ -27,6 +27,7 @@ public interface RStatOrgMMapper extends BaseMapper { * @return */ List getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param, + @Param("deptIds") List deptIds, @Param("dataType") String dataType); /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java index 9a4f19787..c0bbb1398 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgQMapper.java @@ -27,6 +27,7 @@ public interface RStatOrgQMapper extends BaseMapper { * @return */ List getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param, + @Param("deptIds") List deptIds, @Param("dataType") String dataType); /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java index 8f359be89..ffc6173ff 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatOrgYMapper.java @@ -23,10 +23,12 @@ public interface RStatOrgYMapper extends BaseMapper { /** * 区域稳态指标超标分类统计表--年表数据 * @param param + * @param deptIds * @param dataType * @return */ List getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param, + @Param("deptIds") List deptIds, @Param("dataType") String dataType); /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml index 908d3e072..f8748199f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicDMapper.xml @@ -12,5 +12,36 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml index 53cea839d..3e04130ab 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml @@ -15,5 +15,35 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml index 58aae73ac..7988a9bfd 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml @@ -15,5 +15,35 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicVoltageMMapper.xml index d9ddc3419..d3f5c8673 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicVoltageMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicVoltageMMapper.xml @@ -16,5 +16,39 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml index 2878d9075..47397e240 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml @@ -15,5 +15,35 @@ + diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml index ba405679f..798d46699 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml @@ -29,6 +29,7 @@ select org_no, - measurement_type_class, + measurement_type_class as monitorSort, effective_measurement_accrued as allCount, freq_pass_rate, v_dev_pass_rate, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml index c04d48141..e447eeb9e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml @@ -29,6 +29,7 @@ select org_no, - measurement_type_class, + measurement_type_class as monitorSort, effective_measurement_accrued as allCount, freq_pass_rate, v_dev_pass_rate, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml index 684b14d06..f2ae6580e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml @@ -29,6 +29,7 @@ select org_no, - measurement_type_class, + measurement_type_class as monitorSort, effective_measurement_accrued as allCount, freq_pass_rate, v_dev_pass_rate, diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java index cb89f2895..822871fc5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/PwRStatOrgService.java @@ -55,5 +55,5 @@ public interface PwRStatOrgService extends IService { * @param param * @return */ - List getRMpPartHarmonicDetail(StatSubstationBizBaseParam param); + List getRMpPartHarmonicDetail(RStatOrgParam.PwRStatOrgParam param); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java index e23ccdd9d..585528d73 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelMServiceImpl.java @@ -19,7 +19,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java index 2714280bb..d5adccd2e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelQServiceImpl.java @@ -11,7 +11,6 @@ import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.harmonic.mapper.distribution.PwRMpBenchmarkLevelQMapper; import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; import com.njcn.harmonic.service.distribution.PwRMpBenchmarkLevelQService; @@ -20,7 +19,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java index f9548ecf7..67cbff0fb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRMpBenchmarkLevelYServiceImpl.java @@ -11,7 +11,6 @@ import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.harmonic.mapper.distribution.PwRMpBenchmarkLevelYMapper; import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY; import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; import com.njcn.harmonic.service.distribution.PwRMpBenchmarkLevelYService; @@ -20,7 +19,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java index aaa7dd800..1ad518f9e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/PwRStatOrgServiceImpl.java @@ -19,6 +19,9 @@ import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.dto.DeptDTO; +import com.njcn.web.utils.RequestUtil; +import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.compress.utils.Lists; import org.springframework.stereotype.Service; @@ -51,18 +54,16 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRStatHarmonicAll(StatSubstationBizBaseParam param) { + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(param.getId()); - pwPmsMonitorParam.setMonitorSort(param.getIds()); - List data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - //获取部门id集合 - List deptIds = data.stream().map(PwPmsMonitorDTO::getOrgId).collect(Collectors.toList()); - Map deptMap = data.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getOrgId, Function.identity())); //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); List info = new ArrayList<>(); @@ -89,9 +90,8 @@ public class PwRStatOrgServiceImpl extends ServiceImpl { if (deptMap.containsKey(key)) { for (RStatOrgVO.PwRStatOrgVO org : value) { - PwPmsMonitorDTO deptDTO = deptMap.get(key); - org.setOrgName(deptDTO.getOrgName()); - org.setMonitorSort(deptDTO.getMonitorSort()); + DeptDTO deptDTO = deptMap.get(key); + org.setOrgName(deptDTO.getName()); newList.add(org); } } @@ -104,16 +104,19 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRStatOrgIndex(StatSubstationBizBaseParam param) { // 获取当前用户的部门的子部门信息 - PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(param.getId()); - pwPmsMonitorParam.setMonitorSort(param.getIds()); - List data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); +// PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); +// pwPmsMonitorParam.setOrgId(param.getId()); +// pwPmsMonitorParam.setMonitorSort(param.getIds()); +// List data = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); + + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); List info=new ArrayList<>(); - if (CollectionUtil.isNotEmpty(data)) { + if (CollectionUtil.isNotEmpty(deptDTOList)) { // 过滤出部门id - List deptIds = data.stream().map(PwPmsMonitorDTO::getOrgId).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); // 类型（1年 2季度 3月份 4日 @@ -135,12 +138,10 @@ public class PwRStatOrgServiceImpl extends ServiceImpl monitorDTOList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); Map monitorDTOMap = monitorDTOList.stream().collect( - Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity())); + Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(key1,key2) ->key2)); if (CollectionUtil.isNotEmpty(monitorDTOList)) { //获取最新过滤的监测点id @@ -222,42 +223,33 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRStatSubstationOrg(StatSubstationBizBaseParam param) { - PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); - //部门id - pwPmsMonitorParam.setOrgId(param.getId()); - //监测点类别 - pwPmsMonitorParam.setMonitorSort(param.getIds()); - //获取配网监测点信息 - List monitorDTOList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - Map monitorDTOMap = monitorDTOList.stream().collect( - Collectors.toMap(PwPmsMonitorDTO::getOrgId, Function.identity())); - + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //初始化 List info = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(monitorDTOList)) { + if (CollectionUtil.isNotEmpty(deptDTOList)) { // 根据暂态指标枚举查询暂态指标 List steadyStatis = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.STEADY_STATIS.getCode()).getData(); List temp = new ArrayList<>(); - // 过滤出部门id - List deptIds = monitorDTOList.stream().map(PwPmsMonitorDTO::getOrgId).collect(Collectors.toList()); - param.setIds(deptIds); - //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); - + //选择数据时间范围 switch (param.getType().toString()) { case BizParamConstant.STAT_BIZ_YEAR: // 获取年区域暂态指标分类统计表 - temp = rStatOrgYMapper.getYearRStatHarmonicOrgInfo(param, distributionData.getId()); + temp = rStatOrgYMapper.getYearRStatHarmonicOrgInfo(param,deptIds, distributionData.getId()); break; case BizParamConstant.STAT_BIZ_QUARTER: // 获取季区域暂态指标分类统计表 - temp = rStatOrgQMapper.getQuarterRStatHarmonicOrgInfo(param, distributionData.getId()); + temp = rStatOrgQMapper.getQuarterRStatHarmonicOrgInfo(param,deptIds,distributionData.getId()); break; case BizParamConstant.STAT_BIZ_MONTH: // 获取月区域暂态指标分类统计表 - temp = rStatOrgMMapper.getMonthRStatHarmonicOrgInfo(param, distributionData.getId()); + temp = rStatOrgMMapper.getMonthRStatHarmonicOrgInfo(param,deptIds,distributionData.getId()); break; default: break; @@ -267,12 +259,12 @@ public class PwRStatOrgServiceImpl extends ServiceImpl { RStatSubstationOrg2VO.PwRStatSubstationOrgVO vo = new RStatSubstationOrg2VO.PwRStatSubstationOrgVO(); //获取部门信息 - if (monitorDTOMap.containsKey(key)) { - PwPmsMonitorDTO pwPmsMonitorDTO = monitorDTOMap.get(key); - vo.setOrgName(pwPmsMonitorDTO.getOrgName()); - vo.setMonitorSort(pwPmsMonitorDTO.getMonitorSort()); + if (deptMap.containsKey(key)) { + DeptDTO deptDTO = deptMap.get(key); + vo.setOrgName(deptDTO.getName()); } vo.setOrgNo(value.get(0).getOrgNo()); + vo.setMonitorSort(value.get(0).getMeasurementTypeClass()); vo.setDataDate(value.get(0).getDataDate()); vo.setEffectiveMeasurementAverage(value.get(0).getEffectiveMeasurementAverage()); vo.setEffectiveMeasurementAccrued(value.get(0).getEffectiveMeasurementAccrued()); @@ -396,16 +388,20 @@ public class PwRStatOrgServiceImpl extends ServiceImpl getRMpPartHarmonicDetail(StatSubstationBizBaseParam param) { + public List getRMpPartHarmonicDetail(RStatOrgParam.PwRStatOrgParam param) { PwPmsMonitorParam pwPmsMonitorParam=new PwPmsMonitorParam(); //部门id pwPmsMonitorParam.setOrgId(param.getId()); + //电压等级 + pwPmsMonitorParam.setVoltageLevels(param.getVoltageLevels()); //监测点类别 - pwPmsMonitorParam.setMonitorSort(param.getIds()); + pwPmsMonitorParam.setMonitorSort(param.getMonitorSort()); + //监测点名称 + pwPmsMonitorParam.setMonitorName(param.getMonitorName()); //获取配网监测点信息 List pwPmsMonitorDTOS = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); Map pwPmsMonitorDTOMap = pwPmsMonitorDTOS.stream().collect( - Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity())); + Collectors.toMap(PwPmsMonitorDTO::getMonitorId,Function.identity(),(key1, key2) -> key2)); if (CollectionUtil.isNotEmpty(pwPmsMonitorDTOS)) { //获取监测点id diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java index 9439bb8df..79c892fa8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/distribution/impl/RStatPwPermeabilityMServiceImpl.java @@ -17,7 +17,6 @@ import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java index d5e2bfef6..aa3162ae1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java @@ -233,7 +233,7 @@ public class HistoryResultServiceImpl implements HistoryResultService { default: break; } - if (Integer.parseInt(contion) != 60 || Integer.parseInt(contion) != 61 || Integer.parseInt(contion) != 62) { + if (!Integer.valueOf(contion).equals(60) && !Integer.valueOf(contion).equals(61) && !Integer.valueOf(contion).equals(62)) { stringBuilder.append(" and ").append(InfluxDBPublicParam.VALUETYPE + "='").append(valueTypeName).append("'"); } String sql = ""; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java index fa56247ef..e90d8c895 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelMServiceImpl.java @@ -8,7 +8,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; @@ -48,8 +47,6 @@ implements RMpBenchmarkLevelMService { private final MonitorClient monitorClient; - private final PwMonitorClient pwMonitorClient; - @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { //提取查询条件 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java index c67f89444..ec8338f6f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelQServiceImpl.java @@ -8,7 +8,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; @@ -48,8 +47,6 @@ implements RMpBenchmarkLevelQService { private final MonitorClient monitorClient; - private final PwMonitorClient pwMonitorClient; - @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { //提取查询条件 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java index 4fcb9985e..8a9f7f6d0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RMpBenchmarkLevelYServiceImpl.java @@ -8,7 +8,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; @@ -48,8 +47,6 @@ implements RMpBenchmarkLevelYService { private final MonitorClient monitorClient; - private final PwMonitorClient pwMonitorClient; - @Override public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { //提取查询条件 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java index 1f6c058d4..721301277 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java @@ -6,13 +6,13 @@ import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.mapper.majornetwork.RStatHarmonicDMapper; import com.njcn.harmonic.mapper.majornetwork.RStatHarmonicMMapper; import com.njcn.harmonic.mapper.majornetwork.RStatHarmonicVoltageMMapper; import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicD; import com.njcn.harmonic.pojo.po.RStatHarmonicM; import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM; @@ -28,7 +28,6 @@ import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -78,15 +77,13 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicMMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicM::getOrgNo,deptIds) - .eq(RStatHarmonicM::getDataType, mainnetData.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicM::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicM::getDataDate, param.getEndTime())); + List list = rStatHarmonicMMapper.selectInfoList(baseParam,mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); @@ -157,9 +154,9 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl getRStatHarmonicIconVoltage(RStatHarmonicMParam param) { //干扰数据类型（监测对象） - DictData measurementDate = null; + DictData measurementDate; //指标对象类型属性 - DictData harmonicDate = null; + DictData harmonicDate; //判断是是否传入检测点信息值（电压） if (StrUtil.isBlank(param.getStasisID()) && StrUtil.isBlank(param.getMonitorID())) { //干扰数据类型（监测对象） @@ -196,17 +193,15 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - List rStatHarmonicVoltageMS = rStatHarmonicVoltageMMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicVoltageM::getOrgNo,deptIds) - .eq(RStatHarmonicVoltageM::getDataType, mainnetData.getId()) - .eq(RStatHarmonicVoltageM::getMeasurementTypeClass, measurementDate.getId()) - .eq(RStatHarmonicVoltageM::getHarmonicType, harmonicDate.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicVoltageM::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicVoltageM::getDataDate, param.getEndTime()) - ); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); + //数据库查询 + List rStatHarmonicVoltageMS = rStatHarmonicVoltageMMapper + .selectInfoList(baseParam,mainnetData.getId(), measurementDate.getId(),harmonicDate.getId()); + //将数据转换为map进行便利 Map voltageMMap = rStatHarmonicVoltageMS.stream() .collect(Collectors.toMap(RStatHarmonicVoltageM::getVoltageType, Function.identity())); @@ -230,6 +225,20 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl notMeasurementList = devVoltageData.stream().filter(r -> !voltageMMap.containsKey(r.getId())) + .collect(Collectors.toList()); + for (DictData notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0f); + iconVO.setOverLimitMeasurementRatioAccrued(0f); + iconVO.setAverageOverDay(0f); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -271,17 +280,15 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - List rStatHarmonicVoltageMS = rStatHarmonicDMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicD::getOrgNo,deptIds) - .eq(RStatHarmonicD::getDataType, mainnetData.getId()) - .eq(RStatHarmonicD::getMeasurementTypeClass, measurementDate.getId()) - .eq(RStatHarmonicD::getHarmonicType, harmonicDate.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicD::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicD::getDataDate, param.getEndTime()) - ); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); + //数据库查询 + List rStatHarmonicVoltageMS = rStatHarmonicDMapper + .selectInfoList(baseParam,mainnetData.getId(), measurementDate.getId(),harmonicDate.getId()); + Map> collect = rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate)); @@ -339,15 +346,13 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicMMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicM::getOrgNo,deptIds) - .eq(RStatHarmonicM::getDataType, distributionData.getId()) - .ge(param.getStartTime() != null, RStatHarmonicM::getDataDate, param.getStartTime()) - .le(param.getEndTime() != null, RStatHarmonicM::getDataDate, param.getEndTime())); + List list = rStatHarmonicMMapper.selectInfoList(baseParam,distributionData.getId()); //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicM::getHarmonicType)); @@ -437,17 +442,15 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); - List rStatHarmonicVoltageMS = rStatHarmonicDMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicD::getOrgNo,deptIds) - .eq(RStatHarmonicD::getDataType, distributionData.getId()) - .eq(RStatHarmonicD::getMeasurementTypeClass, measurementDate.getId()) - .eq(RStatHarmonicD::getHarmonicType, harmonicDate.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicD::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicD::getDataDate, param.getEndTime()) - ); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); + //数据库查询 + List rStatHarmonicVoltageMS = rStatHarmonicDMapper + .selectInfoList(baseParam,distributionData.getId(), measurementDate.getId(),harmonicDate.getId()); + Map> collect = rStatHarmonicVoltageMS.stream().collect(Collectors.groupingBy(RStatHarmonicD::getDataDate)); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java index c892367b6..0b0740674 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java @@ -198,6 +198,20 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -341,6 +355,20 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java index e164d2d21..44b607f66 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java @@ -191,6 +191,20 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -327,6 +341,20 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java index 900010a58..0144249f6 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java @@ -192,6 +192,20 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -328,6 +342,20 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl notMeasurementList = deptDTOList.stream().filter(r -> !voltageMMap.containsKey(r.getCode())) + .collect(Collectors.toList()); + for (DeptDTO notData : notMeasurementList) { + RIconVO iconVO = new RIconVO(); + iconVO.setRowName(notData.getName()); + iconVO.setSort(notData.getSort()); + iconVO.setOverLimitMeasurementAverage(0); + iconVO.setOverLimitMeasurementAccrued(0); + iconVO.setOverLimitMeasurementRatioAverage(0.0F); + iconVO.setOverLimitMeasurementRatioAccrued(0.0F); + iconVO.setAverageOverDay(0.0F); + arrayVOList.add(iconVO); + } arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java index bfe6affcb..d8e5109a1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java @@ -2,11 +2,10 @@ package com.njcn.harmonic.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.mapper.majornetwork.RStatHarmonicQMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicQ; import com.njcn.harmonic.pojo.vo.RArrayVO; import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO; @@ -17,7 +16,6 @@ import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -59,15 +57,13 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicQMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicQ::getOrgNo,deptIds) - .eq(RStatHarmonicQ::getDataType, mainnetData.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicQ::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicQ::getDataDate, param.getEndTime())); + List list = rStatHarmonicQMapper.selectInfoList(baseParam,mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); @@ -153,15 +149,13 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicQMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicQ::getOrgNo,deptIds ) - .eq(RStatHarmonicQ::getDataType, distributionData.getId()) - .ge(param.getStartTime() != null, RStatHarmonicQ::getDataDate, param.getStartTime()) - .le(param.getEndTime() != null, RStatHarmonicQ::getDataDate, param.getEndTime())); + List list = rStatHarmonicQMapper.selectInfoList(baseParam,distributionData.getId()); //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicQ::getHarmonicType)); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java index 0dce136f1..d2631e8b3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java @@ -2,11 +2,10 @@ package com.njcn.harmonic.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.mapper.majornetwork.RStatHarmonicYMapper; +import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatHarmonicY; import com.njcn.harmonic.pojo.vo.RArrayVO; import com.njcn.harmonic.pojo.vo.RStatHarmonicMVO; @@ -58,20 +57,17 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicYMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicY::getOrgNo,deptIds) - .eq(RStatHarmonicY::getDataType, mainnetData.getId()) - .ge(StrUtil.isNotBlank(param.getStartTime()), RStatHarmonicY::getDataDate, param.getStartTime()) - .le(StrUtil.isNotBlank(param.getEndTime()), RStatHarmonicY::getDataDate, param.getEndTime())); + List list = rStatHarmonicYMapper.selectInfoList(baseParam,mainnetData.getId()); //初始化指标类型（横向） List arrayVOList = new ArrayList<>(); - List rm = new ArrayList<>(); for (DictData lineTypeDatum : interferenceSourceTypeData) { RStatHarmonicMVO r = new RStatHarmonicMVO(); @@ -93,7 +89,9 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl> MeasurementTypeClassMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType)); + Map> MeasurementTypeClassMap = list.stream().collect( + Collectors.groupingBy(RStatHarmonicY::getHarmonicType)); + //重新生成数据结构 MeasurementTypeClassMap.forEach((key, value) -> { if (lineTypeMap.containsKey(key)) { @@ -112,7 +110,6 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl linkedHashMap = new LinkedHashMap<>(); for (RStatHarmonicMVO harmonicMVO : b) { @@ -154,15 +151,14 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + StatSubstationBizBaseParam baseParam=BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); + baseParam.setIds(deptIds); //数据库查询 - List list = rStatHarmonicYMapper.selectList(new LambdaQueryWrapper() - .in(RStatHarmonicY::getOrgNo, deptIds) - .eq(RStatHarmonicY::getDataType, distributionData.getId()) - .ge(param.getStartTime() != null, RStatHarmonicY::getDataDate, param.getStartTime()) - .le(param.getEndTime() != null, RStatHarmonicY::getDataDate, param.getEndTime())); + List list = rStatHarmonicYMapper.selectInfoList(baseParam,distributionData.getId()); + //根据稳态指标分组 Map> measurementMap = list.stream().collect(Collectors.groupingBy(RStatHarmonicY::getHarmonicType)); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java index 3a6ff98eb..24773d6ca 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLoadTypeServiceImpl.java @@ -81,57 +81,63 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl> map = temp - .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo)); - map.forEach((key, value) -> { - RArrayVO arrayVO = new RArrayVO(); - arrayVO.setRowName(value.get(0).getOrgName()); - //属性赋值监测点名称 - for (DictData dictDatum : dictData) { - for (RStatLoadTypeVO rStatLoadTypeVO : value) { - if (dictDatum.getId().equals(rStatLoadTypeVO.getLoadType())) { - rStatLoadTypeVO.setLoadName(dictDatum.getName()); - rStatLoadTypeVO.setSort(dictDatum.getSort()); + if(CollectionUtil.isNotEmpty(temp)){ + // 匹配单位名称 + for (DeptDTO dto : data) { + for (RStatLoadTypeVO vo : temp) { + if (dto.getCode().equals(vo.getOrgNo())) { + vo.setOrgName(dto.getName()); + vo.setSort(dto.getSort()); } } } - //获取差集（数据在字典里面没有的集合） - Map> listMap = value.stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getLoadType)); - List differenceList = dictData.stream().filter(r -> !listMap.containsKey(r.getId())) - .collect(Collectors.toList()); - for (DictData data4 : differenceList) { - RStatLoadTypeVO vo = new RStatLoadTypeVO(); - vo.setSort(data4.getSort()); - vo.setOrgNo(key); - vo.setOrgName(value.get(0).getOrgName()); - vo.setLoadType(data4.getId()); - vo.setLoadName(data4.getName()); - vo.setVAverage(0.0f); - vo.setVAccrued(0.0f); - vo.setIAverage(0.0f); - vo.setIAccrued(0.0f); - vo.setUnbalanceAverage(0.0f); - vo.setUnbalanceAccrued(0.0f); - vo.setINegAverage(0.0f); - vo.setINegAccrued(0.0f); - vo.setFlickerAverage(0.0f); - vo.setFlickerAccrued(0.0f); - value.add(vo); - } - value.sort(Comparator.comparing(r -> r.getSort())); - arrayVO.setColumns(value); - info.add(arrayVO); - }); + //根据部门id进行分组 + Map> map = temp + .stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getOrgNo)); + map.forEach((key, value) -> { + RArrayVO arrayVO = new RArrayVO(); + arrayVO.setRowName(value.get(0).getOrgName()); + arrayVO.setSort(value.get(0).getSort()); + //属性赋值监测点名称 + for (DictData dictDatum : dictData) { + for (RStatLoadTypeVO rStatLoadTypeVO : value) { + if (dictDatum.getId().equals(rStatLoadTypeVO.getLoadType())) { + rStatLoadTypeVO.setLoadName(dictDatum.getName()); + rStatLoadTypeVO.setSort(dictDatum.getSort()); + + } + } + } + //获取差集（数据在字典里面没有的集合） + Map> listMap = value.stream().collect(Collectors.groupingBy(RStatLoadTypeVO::getLoadType)); + List differenceList = dictData.stream().filter(r -> !listMap.containsKey(r.getId())) + .collect(Collectors.toList()); + for (DictData data4 : differenceList) { + RStatLoadTypeVO vo = new RStatLoadTypeVO(); + vo.setSort(data4.getSort()); + vo.setOrgNo(key); + vo.setOrgName(value.get(0).getOrgName()); + vo.setLoadType(data4.getId()); + vo.setLoadName(data4.getName()); + vo.setVAverage(0.0f); + vo.setVAccrued(0.0f); + vo.setIAverage(0.0f); + vo.setIAccrued(0.0f); + vo.setUnbalanceAverage(0.0f); + vo.setUnbalanceAccrued(0.0f); + vo.setINegAverage(0.0f); + vo.setINegAccrued(0.0f); + vo.setFlickerAverage(0.0f); + vo.setFlickerAccrued(0.0f); + value.add(vo); + } + value.sort(Comparator.comparing(r -> r.getSort())); + arrayVO.setColumns(value); + info.add(arrayVO); + }); + } + info.sort(Comparator.comparing(r -> r.getSort())); } return info; } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java index 14b05ca38..0433ba43b 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java @@ -122,7 +122,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); - baseParam.setIds(deptIds); + //获取主网id信息 DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); @@ -130,150 +130,153 @@ public class RStatOrgYServiceImpl extends ServiceImpl> map = temp - .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo)); - map.forEach((key, value) -> { - RStatSubstationOrg2VO vo = new RStatSubstationOrg2VO(); - vo.setOrgNo(value.get(0).getOrgNo()); - vo.setOrgName(value.get(0).getOrgName()); - vo.setDataDate(value.get(0).getDataDate()); - vo.setEffectiveMeasurementAverage(value.get(0).getEffectiveMeasurementAverage()); - vo.setEffectiveMeasurementAccrued(value.get(0).getEffectiveMeasurementAccrued()); - vo.setHarmonicMeasurementAverage(value.get(0).getHarmonicMeasurementAverage()); - vo.setHarmonicMeasurementAccrued(value.get(0).getHarmonicMeasurementAccrued()); - vo.setHarmonicMeasurementRatioAverage(value.get(0).getHarmonicMeasurementRatioAverage()); - vo.setHarmonicMeasurementRatioAccrued(value.get(0).getHarmonicMeasurementRatioAccrued()); - //遍历赋值 - for (RStatSubstationOrgVO orgVO : value) { - for (DictData eventStati : eventStatis) { - if (eventStati.getId().equals(orgVO.getHarmonicType())) { - if (eventStati.getCode().equals(RStatSubstationOrg2VO.FREQUENCY_DEV)) { - vo.setTAverage(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage(orgVO.getChainAverage()); - vo.setChainAccrued(orgVO.getChainAccrued()); - vo.setSameAverage(orgVO.getSameAverage()); - vo.setSameAccrued(orgVO.getSameAccrued()); - vo.setAverageOverDay(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.VOLTAGE_DEV)) { - vo.setTAverage1(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued1(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage1(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued1(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage1(orgVO.getChainAverage()); - vo.setChainAccrued1(orgVO.getChainAccrued()); - vo.setSameAverage1(orgVO.getSameAverage()); - vo.setSameAccrued1(orgVO.getSameAccrued()); - vo.setAverageOverDay1(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.FLICKER)) { - vo.setTAverage2(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued2(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage2(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued2(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage2(orgVO.getChainAverage()); - vo.setChainAccrued2(orgVO.getChainAccrued()); - vo.setSameAverage2(orgVO.getSameAverage()); - vo.setSameAccrued2(orgVO.getSameAccrued()); - vo.setAverageOverDay2(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_VOLTAGE)) { - vo.setTAverage3(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued3(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage3(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued3(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage3(orgVO.getChainAverage()); - vo.setChainAccrued3(orgVO.getChainAccrued()); - vo.setSameAverage3(orgVO.getSameAverage()); - vo.setSameAccrued3(orgVO.getSameAccrued()); - vo.setAverageOverDay3(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_CURRENT)) { - vo.setTAverage4(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued4(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage4(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued4(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage4(orgVO.getChainAverage()); - vo.setChainAccrued4(orgVO.getChainAccrued()); - vo.setSameAverage4(orgVO.getSameAverage()); - vo.setSameAccrued4(orgVO.getSameAccrued()); - vo.setAverageOverDay4(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.INTERHARMONIC_VOLTAGE)) { - vo.setTAverage5(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued5(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage5(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued5(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage5(orgVO.getChainAverage()); - vo.setChainAccrued5(orgVO.getChainAccrued()); - vo.setSameAverage5(orgVO.getSameAverage()); - vo.setSameAccrued5(orgVO.getSameAccrued()); - vo.setAverageOverDay5(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.PHASE_VOLTAGE)) { - vo.setTAverage6(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued6(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage6(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued6(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage6(orgVO.getChainAverage()); - vo.setChainAccrued6(orgVO.getChainAccrued()); - vo.setSameAverage6(orgVO.getSameAverage()); - vo.setSameAccrued6(orgVO.getSameAccrued()); - vo.setAverageOverDay6(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.NEG_CURRENT)) { - vo.setTAverage7(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued7(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage7(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued7(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage7(orgVO.getChainAverage()); - vo.setChainAccrued7(orgVO.getChainAccrued()); - vo.setSameAverage7(orgVO.getSameAverage()); - vo.setSameAccrued7(orgVO.getSameAccrued()); - vo.setAverageOverDay7(orgVO.getAverageOverDay()); - } - if (eventStati.getCode().equals(RStatSubstationOrg2VO.TOTAL_INDICATOR)) { - vo.setTAverage8(orgVO.getOverLimitMeasurementAverage()); - vo.setTAccrued8(orgVO.getOverLimitMeasurementAccrued()); - vo.setOAverage8(orgVO.getOverLimitMeasurementRatioAverage()); - vo.setOAccrued8(orgVO.getOverLimitMeasurementRatioAccrued()); - vo.setChainAverage8(orgVO.getChainAverage()); - vo.setChainAccrued8(orgVO.getChainAccrued()); - vo.setSameAverage8(orgVO.getSameAverage()); - vo.setSameAccrued8(orgVO.getSameAccrued()); - vo.setAverageOverDay8(orgVO.getAverageOverDay()); + if(CollUtil.isNotEmpty(temp)){ + Map> map = temp + .stream().collect(Collectors.groupingBy(RStatSubstationOrgVO::getOrgNo)); + map.forEach((key, value) -> { + RStatSubstationOrg2VO vo = new RStatSubstationOrg2VO(); + vo.setOrgNo(value.get(0).getOrgNo()); + vo.setOrgName(value.get(0).getOrgName()); + vo.setDataDate(value.get(0).getDataDate()); + vo.setEffectiveMeasurementAverage(value.get(0).getEffectiveMeasurementAverage()); + vo.setEffectiveMeasurementAccrued(value.get(0).getEffectiveMeasurementAccrued()); + vo.setHarmonicMeasurementAverage(value.get(0).getHarmonicMeasurementAverage()); + vo.setHarmonicMeasurementAccrued(value.get(0).getHarmonicMeasurementAccrued()); + vo.setHarmonicMeasurementRatioAverage(value.get(0).getHarmonicMeasurementRatioAverage()); + vo.setHarmonicMeasurementRatioAccrued(value.get(0).getHarmonicMeasurementRatioAccrued()); + //遍历赋值 + for (RStatSubstationOrgVO orgVO : value) { + for (DictData eventStati : eventStatis) { + if (eventStati.getId().equals(orgVO.getHarmonicType())) { + if (eventStati.getCode().equals(RStatSubstationOrg2VO.FREQUENCY_DEV)) { + vo.setTAverage(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage(orgVO.getChainAverage()); + vo.setChainAccrued(orgVO.getChainAccrued()); + vo.setSameAverage(orgVO.getSameAverage()); + vo.setSameAccrued(orgVO.getSameAccrued()); + vo.setAverageOverDay(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.VOLTAGE_DEV)) { + vo.setTAverage1(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued1(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage1(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued1(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage1(orgVO.getChainAverage()); + vo.setChainAccrued1(orgVO.getChainAccrued()); + vo.setSameAverage1(orgVO.getSameAverage()); + vo.setSameAccrued1(orgVO.getSameAccrued()); + vo.setAverageOverDay1(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.FLICKER)) { + vo.setTAverage2(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued2(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage2(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued2(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage2(orgVO.getChainAverage()); + vo.setChainAccrued2(orgVO.getChainAccrued()); + vo.setSameAverage2(orgVO.getSameAverage()); + vo.setSameAccrued2(orgVO.getSameAccrued()); + vo.setAverageOverDay2(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_VOLTAGE)) { + vo.setTAverage3(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued3(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage3(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued3(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage3(orgVO.getChainAverage()); + vo.setChainAccrued3(orgVO.getChainAccrued()); + vo.setSameAverage3(orgVO.getSameAverage()); + vo.setSameAccrued3(orgVO.getSameAccrued()); + vo.setAverageOverDay3(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.HARMONIC_CURRENT)) { + vo.setTAverage4(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued4(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage4(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued4(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage4(orgVO.getChainAverage()); + vo.setChainAccrued4(orgVO.getChainAccrued()); + vo.setSameAverage4(orgVO.getSameAverage()); + vo.setSameAccrued4(orgVO.getSameAccrued()); + vo.setAverageOverDay4(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.INTERHARMONIC_VOLTAGE)) { + vo.setTAverage5(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued5(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage5(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued5(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage5(orgVO.getChainAverage()); + vo.setChainAccrued5(orgVO.getChainAccrued()); + vo.setSameAverage5(orgVO.getSameAverage()); + vo.setSameAccrued5(orgVO.getSameAccrued()); + vo.setAverageOverDay5(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.PHASE_VOLTAGE)) { + vo.setTAverage6(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued6(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage6(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued6(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage6(orgVO.getChainAverage()); + vo.setChainAccrued6(orgVO.getChainAccrued()); + vo.setSameAverage6(orgVO.getSameAverage()); + vo.setSameAccrued6(orgVO.getSameAccrued()); + vo.setAverageOverDay6(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.NEG_CURRENT)) { + vo.setTAverage7(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued7(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage7(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued7(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage7(orgVO.getChainAverage()); + vo.setChainAccrued7(orgVO.getChainAccrued()); + vo.setSameAverage7(orgVO.getSameAverage()); + vo.setSameAccrued7(orgVO.getSameAccrued()); + vo.setAverageOverDay7(orgVO.getAverageOverDay()); + } + if (eventStati.getCode().equals(RStatSubstationOrg2VO.TOTAL_INDICATOR)) { + vo.setTAverage8(orgVO.getOverLimitMeasurementAverage()); + vo.setTAccrued8(orgVO.getOverLimitMeasurementAccrued()); + vo.setOAverage8(orgVO.getOverLimitMeasurementRatioAverage()); + vo.setOAccrued8(orgVO.getOverLimitMeasurementRatioAccrued()); + vo.setChainAverage8(orgVO.getChainAverage()); + vo.setChainAccrued8(orgVO.getChainAccrued()); + vo.setSameAverage8(orgVO.getSameAverage()); + vo.setSameAccrued8(orgVO.getSameAccrued()); + vo.setAverageOverDay8(orgVO.getAverageOverDay()); + } + } } - } - } - info.add(vo); - }); - // 匹配单位名称 - for (DeptDTO dto : data) { - for (RStatSubstationOrg2VO vo : info) { - if (dto.getId().equals(vo.getOrgNo())) { - vo.setOrgName(dto.getName()); + info.add(vo); + }); + // 匹配单位名称 + for (DeptDTO dto : data) { + for (RStatSubstationOrg2VO vo : info) { + if (dto.getCode().equals(vo.getOrgNo())) { + vo.setOrgName(dto.getName()); + } } } } + } return info; } @@ -297,8 +300,18 @@ public class RStatOrgYServiceImpl extends ServiceImpl pmsMonitorDTOS = monitorClient.getMonitorInfoListByCond(dto).getData(); - Map pmsMonitorDTOMap = pmsMonitorDTOS.stream() - .collect(Collectors.toMap(PmsMonitorDTO::getPowerrId, Function.identity())); + + //用于临时存储TestValue的getPowerrId(解决去重失效问题) + List infoIds = new ArrayList<>(); + Map pmsMonitorDTOMap = pmsMonitorDTOS.stream().filter( + v -> { + if(infoIds.contains(v.getPowerrId())){ + return false; + }else { + infoIds.add(v.getPowerrId()); + return true; + } + }).collect(Collectors.toMap(PmsMonitorDTO::getPowerrId, Function.identity())); if (CollUtil.isNotEmpty(pmsMonitorDTOS)) { //获取最新过滤的变电站id @@ -374,8 +387,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl rSubstationIconVO = new ArrayList<>(); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); //根据id进行筛选 - baseParam.setIds(this.powerrIdList(RequestUtil.getDeptIndex())); + baseParam.setIds(this.powerrIdList(param.getId())); String string = param.getType().toString(); switch (string) { //查询变电站稳态指标平均超标天数-年数据 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java index d2e0d93be..db8175bfb 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java @@ -5,9 +5,13 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM; import com.njcn.harmonic.mapper.majornetwork.RStatSubstationVoltageMMapper; +import com.njcn.harmonic.pojo.vo.RIconVO; import com.njcn.harmonic.pojo.vo.RVoltageIconVO; import com.njcn.harmonic.service.majornetwork.RStatSubstationVoltageMService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.web.utils.RequestUtil; @@ -16,6 +20,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -32,14 +38,34 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl getStatSubstationIcon(StatisticsBizBaseParam param) { //获取当前部门下所有部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); - return rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam); + //获取电压信息 + List devVoltageData = dicDataFeignClient.getDicDataByTypeCode( + DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); + + //查询数据库 + List statSubstationIcon = rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam); + Map devVoltageMap = statSubstationIcon.stream() + .collect(Collectors.toMap(RVoltageIconVO::getSubstationVoltage, Function.identity())); + + //处理主节点不存在的集合 + List notMeasurementList = devVoltageData.stream().filter(r -> !devVoltageMap.containsKey(r.getId())) + .collect(Collectors.toList()); + for (DictData notData : notMeasurementList) { + RVoltageIconVO iconVO = new RVoltageIconVO(); + iconVO.setSubstationVoltage(notData.getId()); + iconVO.setSubstationCount(0); + iconVO.setHarmonicCount(0); + statSubstationIcon.add(iconVO); + } + return statSubstationIcon; } } diff --git a/pqs-job/job-executor/src/main/resources/bootstrap.yml b/pqs-job/job-executor/src/main/resources/bootstrap.yml index b25768c57..36c48ef4d 100644 --- a/pqs-job/job-executor/src/main/resources/bootstrap.yml +++ b/pqs-job/job-executor/src/main/resources/bootstrap.yml @@ -46,7 +46,7 @@ logging: xxl: job: admin: - addresses: http://198.120.100.195:10217/job-admin + addresses: http://@service.server.url@:10217/job-admin # addresses: http://192.168.1.29:10217/job-admin #执行器通讯TOKEN [选填]：非空时启用； accessToken: diff --git a/pqs-process/process-boot/pom.xml b/pqs-process/process-boot/pom.xml index b83816598..ac86c0a17 100644 --- a/pqs-process/process-boot/pom.xml +++ b/pqs-process/process-boot/pom.xml @@ -91,38 +91,38 @@ - - com.spotify - docker-maven-plugin - 1.0.0 - - - build-image - ${docker.operate} - - build - - - - - - http://${docker.repostory} - - ${docker.repostory}/${docker.registry.name}/${project.artifactId} - - latest - - ${docker.url} - ${basedir}/ - - - /ROOT - ${project.build.directory} - ${project.build.finalName}.jar - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pqs.ipr b/pqs.ipr index 01b3d6fec..c7a2059db 100644 --- a/pqs.ipr +++ b/pqs.ipr @@ -329,7 +329,12 @@ + + + + +