diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java index 57eb82b78..d83b55fa3 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java @@ -5,10 +5,13 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; +import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pq.pojo.po.Overlimit; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java index 491670efc..ae52c5d06 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java @@ -6,7 +6,9 @@ import com.njcn.device.pms.api.fallback.PmsGeneratrixClientFallbackFactory; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java index 53b2bf98b..1e67fd790 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java @@ -2,10 +2,12 @@ package com.njcn.device.pms.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.api.fallback.PwMonitorClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java index 828de5018..75154a1bb 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java @@ -4,8 +4,11 @@ import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.fallback.StatationStatClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; + import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; +import com.njcn.device.pms.pojo.po.StatationStat; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -29,4 +32,16 @@ public interface StatationStatClient { @PostMapping("/getStatationStat") HttpResult> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam pmsStatationStatInfoParam); + /** + * 获取变电站信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/21 + */ + @PostMapping("/getPowerInfo") + HttpResult> getPowerInfo(@RequestBody PmsStatationStatInfoParam param); + + } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java index fb1c45a89..fb8c13e91 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java @@ -2,6 +2,7 @@ package com.njcn.device.pms.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.pms.api.fallback.MonitorClientFallbackFactory; import com.njcn.device.pms.api.fallback.TractionStationClientFallbackFactory; import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; import com.njcn.device.pms.pojo.param.PmsTractionStationParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java index 7c90fa753..2858680d8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java @@ -6,8 +6,10 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; +import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import com.njcn.device.pq.pojo.po.Overlimit; import feign.hystrix.FallbackFactory; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java index 42b0bd97c..d4e054124 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java @@ -3,9 +3,12 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; import com.njcn.device.pms.api.PmsGeneratrixClient; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java index 093fc1141..786d59feb 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java @@ -3,12 +3,14 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.PwMonitorClient; import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; +import org.checkerframework.checker.units.qual.C; import org.springframework.stereotype.Component; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java index 57ca95961..4f3ca0a79 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.device.pms.api.StatationStatClient; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.utils.PmsDeviceEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -37,6 +38,12 @@ public class StatationStatClientFallbackFactory implements FallbackFactory> getPowerInfo(PmsStatationStatInfoParam param) { + log.error("{}异常，降级处理，异常为：{}", "获取变电站信息", throwable.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java index fe8af37b2..82b8f3302 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java @@ -3,6 +3,7 @@ package com.njcn.device.pms.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.api.TractionStationClient; import com.njcn.device.pms.pojo.dto.PmsTractionStationDTO; import com.njcn.device.pms.pojo.param.PmsTractionStationParam; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java index b06ff193f..d466d3896 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java @@ -20,7 +20,10 @@ public enum PmsDeviceResponseEnum { VOLTAGE_EMPTY("A00362","未查询到指定母线"), LINE_EMPTY("A00363","未查询到指定线路"), NO_USER_TYPE("A00364","未查询字典用户类型"), + NO_STATION("A00365","未查询指定电站信息"), + GENERATRIXWIRE_NAME_REPEAT("A00368","同一母线下存在相同名称线路"), + GENERATRIX_NAME_REPEAT("A00369","同一电站下存在相同名称母线"), diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java index cee6950a9..13015877e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java @@ -1,7 +1,10 @@ package com.njcn.device.pms.pojo.dto; +import com.njcn.device.pms.pojo.po.Generatrix; +import com.njcn.device.pq.pojo.po.Voltage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.math3.analysis.function.Power; import java.io.Serializable; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java index d55906e28..af5e41e32 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java @@ -1,8 +1,11 @@ package com.njcn.device.pms.pojo.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * 母线信息 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java index 478c12800..cc2490942 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java @@ -1,7 +1,10 @@ package com.njcn.device.pms.pojo.dto; import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.HashCodeExclude; +import java.util.Date; import java.io.Serializable; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java index 808bae39d..7fa5020e8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java @@ -14,6 +14,10 @@ import javax.validation.constraints.NotBlank; */ @Data public class GeneratrixParam { + @ApiModelProperty(value = "母线id",required = true) + @NotBlank(message = "母线id不可为空") + private String generatrixId; + @ApiModelProperty(value = "母线名称",required = true) @NotBlank(message = "母线名称不可为空") private String generatrixName; @@ -26,12 +30,7 @@ public class GeneratrixParam { @NotBlank(message = "母线电压等级不可为空") private String scale; - @Data - @EqualsAndHashCode(callSuper = true) - public static class UpdateGeneratrixParam extends GeneratrixParam { - @ApiModelProperty(value = "母线id",required = true) - @NotBlank(message = "母线id不可为空") - private String generatrixId; - } + + } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java index 189648a00..9040eeffa 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java @@ -2,6 +2,7 @@ package com.njcn.device.pms.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java index e9ab2c05f..e3e17c1d8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java @@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; /** * pms-device diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java index d2a12bffc..193e8d693 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java @@ -2,11 +2,14 @@ package com.njcn.device.pms.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.biz.enums.LineFlagEnum; +import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Range; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java index f67ff2b5f..412b69730 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java index 1c0431f96..8725fc288 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java @@ -37,4 +37,7 @@ public class PmsMonitorParam { @ApiModelProperty(name = "powerrIds",value = "变电站id") private List powerrIds; + + @ApiModelProperty(name = "powerrName",value = "变电站名称") + private String powerrName; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java index f48003883..705318b8d 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java @@ -18,11 +18,16 @@ import java.util.List; @NoArgsConstructor public class PmsStatationStatInfoParam { + /** + * 单位code集合 + */ + @ApiModelProperty(name = "orgIds",value = "单位code集合") + private List orgIds; + /** * 变电站id集合 */ @ApiModelProperty(name = "powerIds",value = "变电站id集合") - @NotNull(message = "变电站id集合不可为空") private List powerIds; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java index 2c480a282..f1f6143b3 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java @@ -1,7 +1,12 @@ package com.njcn.device.pms.pojo.param; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * @author hany @@ -11,57 +16,75 @@ import lombok.Data; public class PmsTerminalParam { @ApiModelProperty(name = "id",value = "终端编号") + @NotNull(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") + @NotBlank(message = "组织机构ID不能为空") private String orgId; @ApiModelProperty(name = "operationName", value = "运维单位名称") + @NotBlank(message = "运维单位名称不能为空") private String operationName; @ApiModelProperty(name = "operationId", value = "运维单位ID") + @NotBlank(message = "运维单位ID不能为空") private String operationId; @ApiModelProperty(name = "powerrName", value = "变电站名称") + @NotBlank(message = "变电站名称不能为空") private String powerrName; @ApiModelProperty(name = "powerStationId", value = "所属电站ID") + @NotBlank(message = "所属电站ID不能为空") private String powerStationId; @ApiModelProperty(name = "terminalState", value = "终端状态") + @NotBlank(message = "终端状态不能为空") private String terminalState; @ApiModelProperty(name = "terminalLevel", value = "终端级别") + @NotBlank(message = "终端级别不能为空") private String terminalLevel; @ApiModelProperty(name = "deviceModel", value = "装置型号") + @NotBlank(message = "装置型号不能为空") private String deviceModel; @ApiModelProperty(name = "manufacture", value = "生产厂家") + @NotBlank(message = "生产厂家不能为空") private String manufacture; @ApiModelProperty(name = "verificationDate", value = "检定日期") + @NotBlank(message = "检定日期不能为空") private String verificationDate; @ApiModelProperty(name = "useDate", value = "投用日期") + @NotBlank(message = "投用日期不能为空") private String useDate; @ApiModelProperty(name = "inputType", value = "测量信号输入形式") + @NotBlank(message = "测量信号输入形式不能为空") private String inputType; @ApiModelProperty(name = "ip", value = "IP地址") + @NotBlank(message = "IP地址不能为空") private String ip; @ApiModelProperty(name = "port", value = "通信端口") + @NotBlank(message = "通信端口不能为空") private String port; @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/param/PmsTractionStationParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java index b32afe79b..d7d5bd1a4 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java @@ -1,9 +1,11 @@ package com.njcn.device.pms.pojo.param; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; 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 ca4db1313..4174afdce 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 @@ -12,79 +12,70 @@ import lombok.EqualsAndHashCode; @Data public class PowerDistributionareaParam { - @ApiModelProperty("id") + @ApiModelProperty("台区编号") private String id; - @ApiModelProperty(name = "Name", value = "台区名称") - private String Name; + @ApiModelProperty(name = "name", value = "台区名称") + private String name; - @ApiModelProperty(name = "OrgName", value = "组织机构名称") - private String OrgName; + @ApiModelProperty(name = "orgName", value = "组织机构名称") + private String orgName; - @ApiModelProperty(name = "OrgId", value = "组织机构ID") - private String OrgId; + @ApiModelProperty(name = "orgId", value = "组织机构ID") + private String orgId; - @ApiModelProperty(name = "OperationName", value = "运维单位名称") - private String OperationName; + @ApiModelProperty(name = "operationName", value = "运维单位名称") + private String operationName; - @ApiModelProperty(name = "OperationId", value = "运维单位ID") - private String OperationId; + @ApiModelProperty(name = "operationId", value = "运维单位ID") + private String operationId; - @ApiModelProperty(name = "PowerrName", value = "变电站名称") - private String PowerrName; + @ApiModelProperty(name = "powerrName", value = "变电站名称") + private String powerrName; - @ApiModelProperty(name = "PowerStationId", value = "电站ID") - private String PowerStationId; + @ApiModelProperty(name = "powerStationId", value = "电站ID") + private String powerStationId; - @ApiModelProperty(name = "LineName", value = "监测线路名称") - private String LineName; + @ApiModelProperty(name = "lineName", value = "监测线路名称") + private String lineName; - @ApiModelProperty(name = "LineId", value = "所属线路ID") - private String LineId; + @ApiModelProperty(name = "lineId", value = "所属线路ID") + private String lineId; - @ApiModelProperty(name = "PCapacity", value = "配变容量") - private Float PCapacity; + @ApiModelProperty(name = "pCapacity", value = "配变容量") + private Float pCapacity; - @ApiModelProperty(name = "Regionalism", value = "地区特征") - private String Regionalism; + @ApiModelProperty(name = "regionalism", value = "地区特征") + private String regionalism; - @ApiModelProperty(name = "IfRuralPowerGrid", value = "是否农网：0-否；1：是") - private Integer IfRuralPowerGrid; + @ApiModelProperty(name = "ifRuralPowerGrid", value = "是否农网：0-否；1：是") + private Integer ifRuralPowerGrid; - @ApiModelProperty(name = "NatureOfUse", value = "使用性质") - private String NatureOfUse; + @ApiModelProperty(name = "natureOfUse", value = "使用性质") + private String natureOfUse; - @ApiModelProperty(name = "PowerSupplyRadius", value = "供电半径") - private Float PowerSupplyRadius; + @ApiModelProperty(name = "powerSupplyRadius", value = "供电半径") + private Float powerSupplyRadius; - @ApiModelProperty(name = "LineLength", value = "供电线路总长度") - private Float LineLength; + @ApiModelProperty(name = "lineLength", value = "供电线路总长度") + private Float lineLength; - @ApiModelProperty(name = "State", value = "运行状态") - private String State; + @ApiModelProperty(name = "state", value = "运行状态") + private String state; - @ApiModelProperty(name = "DistributedPhotovoltaicNum", value = "分布式光伏用户数") - private Integer DistributedPhotovoltaicNum; + @ApiModelProperty(name = "distributedPhotovoltaicNum", value = "分布式光伏用户数") + private Integer distributedPhotovoltaicNum; - @ApiModelProperty(name = "PhotovoltaicCapacity", value = "分布式光伏总装机容量") - private Float PhotovoltaicCapacity; + @ApiModelProperty(name = "photovoltaicCapacity", value = "分布式光伏总装机容量") + private Float photovoltaicCapacity; - @ApiModelProperty(name = "IfBevAp", value = "是否有电动汽车接入：0-否；1：是") - private Integer IfBevAp; + @ApiModelProperty(name = "ifBevAp", value = "是否有电动汽车接入：0-否；1：是") + private Integer ifBevAp; - @ApiModelProperty(name = "ApLoadType", value = "接入负荷类型") - private String ApLoadType; + @ApiModelProperty(name = "apLoadType", value = "接入负荷类型") + private String apLoadType; - @ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是") - private Integer IsUpToGrid; + @ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是") + private Integer isUpToGrid; - /** - * 查询数据实体 - */ - @Data - @EqualsAndHashCode(callSuper = true) - public static class QueryParam extends BaseParam { - - private Integer Status; - } } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java index 568473f6b..0f099e7ff 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.io.Serializable; import java.util.List; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java index 18775c20a..bc9c83cc9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java @@ -26,4 +26,9 @@ public class RStatPwAlarmDetailParam extends StatisticsBizBaseParam { //监测点名称 @ApiModelProperty(name = "monitorName", value = "监测点名称") private String monitorName; + + @ApiModelProperty("页码") + private Integer pageNum; + @ApiModelProperty("页面尺寸") + private Integer pageSize; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java index 9a029f400..182cb3dff 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java @@ -1,7 +1,17 @@ package com.njcn.device.pms.pojo.param; +import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.common.pojo.param.StatisticsBizBaseParam; +import com.njcn.web.pojo.annotation.DateTimeStrValid; +import com.njcn.web.pojo.param.BaseParam; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; /** * 主网-告警统计(周)查询参数实体 @@ -10,4 +20,4 @@ import lombok.Data; @Data public class RStatZwAlarmCountWParam extends StatisticsBizBaseParam { -} +} \ 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/UniversalFrontEndParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java index d4dbeed3b..381d8cc89 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java @@ -4,7 +4,9 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Range; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java index 9b89a54f2..187c122b1 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java @@ -2,10 +2,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java index 09863a86b..af40c5c42 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java @@ -1,7 +1,9 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import jdk.nashorn.internal.ir.IdentNode; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,12 +20,15 @@ public class Generatrix extends BaseEntity { private static final long serialVersionUID = 1L; + @TableId private String generatrixId; private String generatrixName; private String statationId; + private String statationName; + private String scale; private Integer status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java index 9a5e3ac73..9f6c2f3a8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; @@ -25,5 +26,7 @@ public class GeneratrixWire extends BaseEntity { private String generatrixId; + private String generatrixName; + private Integer status; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java index 669e11da8..511cf31c4 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java @@ -2,14 +2,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; /** *

- * + * *

* * @author hongawen @@ -73,7 +76,7 @@ public class HarmonicGeneralManagement extends BaseEntity { private String plannedState; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java index bca410d00..804166464 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java @@ -1,14 +1,18 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java index 9637e7b0a..e4b9a102c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java @@ -2,6 +2,8 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java index 5bf582282..d1ce9c837 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java @@ -2,10 +2,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java index 8923b9705..5effdd223 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java @@ -2,10 +2,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java index ad5c5f89e..ecd216f76 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java @@ -2,10 +2,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; /** *

@@ -137,25 +140,6 @@ public class PowerDistributionarea extends BaseEntity { */ private Integer status; - /** - * 创建用户 - */ - private String createBy; - - /** - * 创建时间 - */ - private LocalDateTime createTime; - - /** - * 更新用户 - */ - private String updateBy; - - /** - * 更新时间 - */ - private LocalDateTime updateTime; } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java index 270b9f294..877285b55 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java @@ -2,10 +2,14 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDate; +import lombok.Getter; +import lombok.Setter; /** *

diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java index 3724c6d1e..34ec6e99c 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java @@ -1,13 +1,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; import java.time.LocalDateTime; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java index af5913303..3fe4121bb 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java @@ -1,12 +1,11 @@ package com.njcn.device.pms.pojo.po; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** - * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 + * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 * @TableName r_dn_operating_index_m */ @Data @@ -77,4 +76,4 @@ public class RDnOperatingIndexM implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java index 0b2f0beca..3c802b341 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 配网运行指标统计-月表,配网监测指标数据质量统计-月表 (RDnOperatingIndexM)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java index bcab6f65e..094d94f53 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java @@ -1,9 +1,8 @@ package com.njcn.device.pms.pojo.po; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** * 配网运行指标统计-年表,配网监测指标数据质量统计-年表 @@ -77,4 +76,4 @@ public class RDnOperatingY implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java index c2022148c..7b69e19ca 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + /** * @author jianghf * 监测点告警统计-月表 @@ -117,4 +117,4 @@ public class RMpMonitorAlarmCountM implements Serializable { */ private Integer eventTypeGrade; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java index 8468f60e6..daa9286ff 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + /** * 告警明细-日表 * @TableName r_mp_pw_alarm_detail_d @@ -46,4 +46,4 @@ public class RMpPwAlarmDetailD implements Serializable { */ private Integer isCreateProblem; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java index bf7ee1f2e..ac0c53e18 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + /** * 监测点指标告警明细日表 * @TableName r_mp_target_warn_d @@ -79,4 +79,4 @@ public class RMpTargetWarnD implements Serializable { private Integer isInterruptWarn; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java index 12ff4ab4f..423d53055 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java @@ -1,12 +1,11 @@ package com.njcn.device.pms.pojo.po; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** - * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 + * 主网运行指标统计-月表,主网监测指标数据质量统计-月表 * @TableName r_operating_index_m */ @Data @@ -77,4 +76,4 @@ public class ROperatingIndexM implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java index 3cb395d5d..e599f80cd 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java @@ -3,8 +3,8 @@ package com.njcn.device.pms.pojo.po; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 主网运行指标统计实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java index 023a32124..aba287969 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java @@ -1,12 +1,11 @@ package com.njcn.device.pms.pojo.po; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** - * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 + * 主网运行指标统计-年表,主网监测指标数据质量统计-年表 * @TableName r_operating_index_y */ @Data @@ -77,4 +76,4 @@ public class ROperatingIndexY implements Serializable { private Integer isUnusual; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java index 1a32d0ea9..4fd5285e2 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 台账类数据质量核查-年表(RStatAccountCheckDataY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java index 1f3872335..5ca6f4f6b 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java @@ -1,11 +1,11 @@ package com.njcn.device.pms.pojo.po; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + /** * 区域告警统计(月) * @TableName r_stat_area_alarm_count_m @@ -112,4 +112,4 @@ public class RStatAreaAlarmCountM implements Serializable { private Integer eventTypeGrade; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java index 58f98b121..4b3036f16 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * (RStatBusbarHarmonicY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java index 4c8c6a837..ce55c9a11 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 监测点台账数据质量问题-核查详情(RStatMeasurementAccountDetail)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java index 5f89ecd6b..0766b6d80 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 区域分类统计年表(RStatOrgY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java index 68f1e8096..fad3e9b39 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java @@ -1,9 +1,8 @@ package com.njcn.device.pms.pojo.po; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** * @author jianghf @@ -34,4 +33,4 @@ public class RStatPwAlarmCountW implements Serializable { */ private Integer alarmMonitorCount; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java index 2077ab718..7b9790247 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * (RStatSubstationY)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java index e29450301..f0b99072f 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java @@ -2,8 +2,8 @@ package com.njcn.device.pms.pojo.po; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; /** * 指标类数据质量问题查询-核查详情(RStatTargetDetail)实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java index ab2b03184..b649697a9 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java @@ -16,6 +16,20 @@ import java.util.Date; @ApiModel("牵引站台账数据质量问题-核查详情") public class RStatTractionStationAccountDetailPO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 其他 + */ + public static String other = "0"; + /** + * 高铁 + */ + public static String highSpeedRail = "1"; + /** + * 普通 + */ + public static String ordinaryRailway = "2"; + + /** * 时间 */ diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java index 1643fc6a4..87230c2b7 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java @@ -2,12 +2,13 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; /** - * + * * @TableName r_stat_zw_alarm_count_w */ @Data @@ -41,4 +42,4 @@ public class RStatZwAlarmCountW implements Serializable { */ private Integer monitorGradeCount; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java index 09e8b425f..b936bb6bf 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java @@ -2,16 +2,19 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen @@ -110,7 +113,7 @@ public class SourceManagement extends BaseEntity { private LocalDate filingDate; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java index 8e366803c..55ecb90ba 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java @@ -1,9 +1,15 @@ package com.njcn.device.pms.pojo.po; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** *

@@ -23,6 +29,7 @@ public class StatationStat extends BaseEntity { /** * 电站编号 */ + @TableId private String powerId; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java index 61f4e97f2..6254db509 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java @@ -2,14 +2,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; /** *

- * + * *

* * @author hongawen @@ -88,7 +91,7 @@ public class StatisticsRunMonitor extends BaseEntity { private LocalDateTime dataDate; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Boolean status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java index d56575b0b..9c107414e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java @@ -1,13 +1,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; import java.time.LocalDateTime; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java index 925c0ed48..5ccdb1ce6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java @@ -2,14 +2,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; /** *

- * + * *

* * @author hongawen @@ -113,7 +116,7 @@ public class TractionStation extends BaseEntity { private Integer isUpToGrid; /** - * 数据状态：0-删除；1-正常； + * 数据状态：0-删除；1-正常； */ private Integer status; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java index bf9d17357..99178f0ca 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java @@ -1,13 +1,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; import java.time.LocalDate; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java index cbce4158d..e1a63f5a0 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java @@ -1,13 +1,17 @@ package com.njcn.device.pms.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; import java.time.LocalDateTime; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + /** *

- * + * *

* * @author hongawen diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java index 94bbec71e..e7f7184ff 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java @@ -1,13 +1,13 @@ package com.njcn.device.pms.pojo.vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + /** - * + * * @TableName pms_monitor */ @Data diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java index 7e58df637..6179df3df 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java index 8e2f98d81..558939945 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java @@ -4,8 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; import java.util.Date; +import java.io.Serializable; import java.util.List; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java index c2da1f7b3..cd89d5074 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 区域分类统计表(RStatOrgY)实体类 @@ -83,4 +84,4 @@ public class RStatOrgVO implements Serializable { @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数") private Integer eventCount; -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java index 2bc43fdc5..76e6ed277 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 变电站指标统计表实体类 diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java index caf1733aa..5bffbf679 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java @@ -1,7 +1,9 @@ package com.njcn.device.pms.pojo.vo; +import com.njcn.device.pms.pojo.po.RStatZwAlarmCountW; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import java.io.Serializable; import java.util.Date; @@ -41,4 +43,4 @@ public class RStatZwAlarmCountWVO implements Serializable { -} +} \ No newline at end of file diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java index 1a5ee7b5e..523796929 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java @@ -11,45 +11,25 @@ public class StatationStatVO implements Serializable { private static final long serialVersionUID = 1L; - @ApiModelProperty(name = "PowerId", value = "电站编号") - private String PowerId; + @ApiModelProperty(name = "powerId", value = "电站编号") + private String powerId; - @ApiModelProperty(name = "PowerName", value = "电站名称") - private String PowerName; + @ApiModelProperty(name = "powerName", value = "电站名称") + private String powerName; - @ApiModelProperty(name = "OrgId", value = "单位id") - private String OrgId; + @ApiModelProperty(name = "orgId", value = "单位id") + private String orgId; - @ApiModelProperty(name = "ShouldBeNum", value = "应设点数量") - private Integer ShouldBeNum; + @ApiModelProperty(name = "orgId", value = "单位id") + private String orgName; - @ApiModelProperty(name = "VoltageLevel", value = "电压等级") - private String VoltageLevel; + @ApiModelProperty(name = "shouldBeNum", value = "应设点数量") + private Integer shouldBeNum; - @ApiModelProperty(name = "status", value = "数据状态：0-删除；1-正常；") - private Integer status; + @ApiModelProperty(name = "voltageLevel", value = "电压等级") + private String voltageLevel; - /** - * 创建用户 - */ - @ApiModelProperty(name = "createBy", value = "创建用户") - private String createBy; - /** - * 创建时间 - */ - @ApiModelProperty(name = "createTime", value = "创建时间") - private Date createTime; - /** - * 更新用户 - */ - @ApiModelProperty(name = "updateBy", value = "更新用户") - private String updateBy; - /** - * 更新时间 - */ - @ApiModelProperty(name = "updateTime", value = "更新时间") - private Date updateTime; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java index 72cfbf676..de3604871 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.controller.distribution; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -56,9 +57,9 @@ public class RStatPwAlarmCountWController extends BaseController { @PostMapping("getAlarmDetailList") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("告警明细查看") - public HttpResult> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { + public HttpResult> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { String methodDescribe = getMethodDescribe("getAlarmDetailList"); - List list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam); + Page list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java index b01d810cc..81b992c70 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java @@ -57,13 +57,13 @@ public class DistributionMonitorController extends BaseController { /** - * 获取指定组装下的发电用电用户 + * 获取指定组织下的发电用电用户 * @author cdf * @date 2022/11/15 */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getDoubleUserByDept") - @ApiOperation("获取指定组装下的发电用电用户") + @ApiOperation("获取指定组织下的发电用电用户") @ApiImplicitParam(name = "orgId", value = "组装机构编号", required = true) public HttpResult> getDoubleUserByDept(@RequestParam("orgId")String orgId) { String methodDescribe = getMethodDescribe("getDoubleUserByDept"); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java deleted file mode 100644 index 788cb97c8..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.njcn.device.pms.controller.majornetwork; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.OperateType; -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.GeneratrixWireParam; -import com.njcn.device.pms.pojo.po.GeneratrixWire; -import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; -import com.njcn.web.controller.BaseController; -import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.validation.constraints.NotEmpty; -import java.util.List; -import java.util.Objects; - -/** - * pms-device - * - * @author cdf - * @date 2022/10/26 - */ -@RestController -@RequestMapping("/pms/GeneratrixWireWire") -@Slf4j -@Api(tags = "台账-线路") -@RequiredArgsConstructor -public class GeneratrixWireController extends BaseController { - - private final IGeneratrixWireService iGeneratrixWireService; - - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) - @PostMapping("/addGeneratrixWire") - @ApiOperation("新增线路") - @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true) - public HttpResult addGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) { - String methodDescribe = getMethodDescribe("addGeneratrixWire"); - boolean result = iGeneratrixWireService.addGeneratrixWire(generatrixWireParam); - if(result){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE) - @PostMapping("/updateGeneratrixWire") - @ApiOperation("修改线路") - @ApiImplicitParam(name = "generatrixWireParam", value = "线路实体", required = true) - public HttpResult updateGeneratrixWire(@RequestBody GeneratrixWireParam generatrixWireParam) { - String methodDescribe = getMethodDescribe("updateGeneratrixWire"); - boolean result = iGeneratrixWireService.updateGeneratrixWire(generatrixWireParam); - if(result){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE) - @DeleteMapping("/delGeneratrixWire") - @ApiOperation("删除线路") - @ApiImplicitParam(name = "generatrixWireIds", value = "线路ids", required = true) - public HttpResult delGeneratrixWire(@RequestBody @NotEmpty(message = "线路id不可为空") List generatrixWireIds) { - String methodDescribe = getMethodDescribe("delGeneratrixWire"); - boolean result = iGeneratrixWireService.delGeneratrixWire(generatrixWireIds); - if(result){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @GetMapping("/getGeneratrixWireById") - @ApiOperation("根据线路id获取线路") - @ApiImplicitParam(name = "generatrixWireId", value = "线路id", required = true) - public HttpResult getGeneratrixWireById(@RequestParam("generatrixWireId") String generatrixWireId) { - String methodDescribe = getMethodDescribe("getGeneratrixWireById"); - GeneratrixWire result = iGeneratrixWireService.getGeneratrixWireById(generatrixWireId); - if(Objects.nonNull(result)){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - - } - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getGeneratrixWireList") - @ApiOperation("获取线路列表") - @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) - public HttpResult> getGeneratrixWireList(@RequestBody BaseParam baseParam) { - String methodDescribe = getMethodDescribe("getGeneratrixWireList"); - List result = iGeneratrixWireService.getGeneratrixWireList(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/MonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java index 6dbe839b4..ca377eacc 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java @@ -39,7 +39,7 @@ import java.util.List; @RestController @RequestMapping("/pms/monitor") @Slf4j -@Api(tags = "主网监测点信息") +@Api(tags = "台账-主网监测点信息") @RequiredArgsConstructor public class MonitorController extends BaseController { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java index 166e6b9fc..4e064b8eb 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; +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; @@ -35,7 +36,7 @@ import java.util.Objects; @RestController @RequestMapping("/pmsGeneratrix") @Slf4j -@Api(tags = "获取母线信息") +@Api(tags = "台账-母线信息") @RequiredArgsConstructor public class PmsGeneratrixController extends BaseController { @@ -101,7 +102,7 @@ public class PmsGeneratrixController extends BaseController { @PostMapping("/updateGeneratrix") @ApiOperation("修改母线") @ApiImplicitParam(name = "generatrixParam", value = "母线实体", required = true) - public HttpResult updateGeneratrix(@RequestBody GeneratrixParam.UpdateGeneratrixParam generatrixParam) { + public HttpResult updateGeneratrix(@RequestBody GeneratrixParam generatrixParam) { String methodDescribe = getMethodDescribe("updateGeneratrix"); boolean result = pmsGeneratrixService.updateGeneratrix(generatrixParam); if (result) { @@ -141,11 +142,21 @@ public class PmsGeneratrixController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getGeneratrixList") - @ApiOperation("获取母线列表") - @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) - public HttpResult> getGeneratrixList(@RequestBody BaseParam baseParam) { + @ApiOperation("获取所有母线下拉框使用") + public HttpResult> getGeneratrixList() { String methodDescribe = getMethodDescribe("getGeneratrixList"); - List result = pmsGeneratrixService.getGeneratrixList(baseParam); + List result = pmsGeneratrixService.getGeneratrixList(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getGeneratrixPageList") + @ApiOperation("分页获取母线列表") + @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) + public HttpResult> getGeneratrixPageList(@RequestBody BaseParam baseParam) { + String methodDescribe = getMethodDescribe("getGeneratrixPageList"); + Page result = pmsGeneratrixService.getGeneratrixPageList(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/PowerDistributionareaController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java index aafe3f8b7..50f2eead1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java @@ -13,6 +13,7 @@ import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; +import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -47,14 +48,15 @@ public class PowerDistributionareaController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("getPowerDistributionAreaList") @ApiOperation("查询台区所有信息") - @ApiImplicitParam(name = "queryParam",value = "查询台区信息",required = true) - public HttpResult> getList(@RequestBody @Validated PowerDistributionareaParam.QueryParam queryParam){ + @ApiImplicitParam(name = "baseParam",value = "查询台区信息",required = true) + public HttpResult> getList(@RequestBody @Validated BaseParam baseParam){ String methodDescribe = getMethodDescribe("getList"); - LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); - Page res = iPowerDistributionareaService.getList(queryParam); + LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam); + Page res = iPowerDistributionareaService.getList(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe); } + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/getPowerDistributionAreaById") @ApiOperation("根据ID查询台区数据") 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 12594563e..0c2f2828a 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 @@ -41,8 +41,8 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) @PostMapping("/addPowerGenerationUser") - @ApiOperation("新增母线") - @ApiImplicitParam(name = "powerGenerationUserParam", value = "母线实体", required = true) + @ApiOperation("新增发电用户") + @ApiImplicitParam(name = "powerGenerationUserParam", value = "发电用户实体", required = true) public HttpResult addPowerGenerationUser(@RequestBody PowerGenerationUserParam powerGenerationUserParam) { String methodDescribe = getMethodDescribe("addPowerGenerationUser"); boolean result = iPowerGenerationUserService.addPowerGenerationUser(powerGenerationUserParam); @@ -55,8 +55,8 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE) @PostMapping("/updatePowerGenerationUser") - @ApiOperation("修改母线") - @ApiImplicitParam(name = "powerGenerationUserParam", value = "母线实体", required = true) + @ApiOperation("修改发电用户") + @ApiImplicitParam(name = "powerGenerationUserParam", value = "发电用户实体", required = true) public HttpResult updatePowerGenerationUser(@RequestBody PowerGenerationUserParam powerGenerationUserParam) { String methodDescribe = getMethodDescribe("updatePowerGenerationUser"); boolean result = iPowerGenerationUserService.updatePowerGenerationUser(powerGenerationUserParam); @@ -69,9 +69,9 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE) @DeleteMapping("/delPowerGenerationUser") - @ApiOperation("删除母线") - @ApiImplicitParam(name = "powerGenerationUserIds", value = "母线ids", required = true) - public HttpResult delPowerGenerationUser(@RequestBody @NotEmpty(message = "母线id不可为空") List powerGenerationUserIds) { + @ApiOperation("删除发电用户") + @ApiImplicitParam(name = "powerGenerationUserIds", value = "发电用户ids", required = true) + public HttpResult delPowerGenerationUser(@RequestBody @NotEmpty(message = "发电用户id不可为空") List powerGenerationUserIds) { String methodDescribe = getMethodDescribe("delPowerGenerationUser"); boolean result = iPowerGenerationUserService.delPowerGenerationUser(powerGenerationUserIds); if(result){ @@ -83,8 +83,8 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/getPowerGenerationUserById") - @ApiOperation("根据母线id获取母线") - @ApiImplicitParam(name = "powerGenerationUserId", value = "母线id", required = true) + @ApiOperation("根据发电用户id获取发电用户") + @ApiImplicitParam(name = "powerGenerationUserId", value = "发电用户id", required = true) public HttpResult getPowerGenerationUserById(@RequestParam("powerGenerationUserId") String powerGenerationUserId) { String methodDescribe = getMethodDescribe("getPowerGenerationUserById"); PowerGenerationUser result = iPowerGenerationUserService.getPowerGenerationUserById(powerGenerationUserId); @@ -97,7 +97,7 @@ public class PowerGenerationUserController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getPowerGenerationUserList") - @ApiOperation("获取母线列表") + @ApiOperation("获取发电用户列表") @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) public HttpResult> getPowerGenerationUserList(@RequestBody BaseParam baseParam) { String methodDescribe = getMethodDescribe("getPowerGenerationUserList"); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java index 91d8d5ab3..9b04d4694 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller.majornetwork; +package com.njcn.device.pms.controller.majornetwork; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java index 09fc556b4..156f66faf 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java @@ -1,6 +1,7 @@ package com.njcn.device.pms.controller.majornetwork; import cn.hutool.core.collection.CollectionUtil; +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; @@ -11,11 +12,13 @@ import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.StatationStatParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.vo.StatationStatVO; import com.njcn.device.pms.service.majornetwork.IStatationStatService; import com.njcn.web.controller.BaseController; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -28,7 +31,7 @@ import java.util.Objects; /** *

- * 电站监测点设置信息 + * 电站监测点设置信息 *

* * @author hongawen @@ -42,18 +45,19 @@ import java.util.Objects; public class StatationStatController extends BaseController { private final IStatationStatService statationStatService; + /** * 获取监测点信息 */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getStatationStat") @ApiOperation("获取指定的变电站信息") -// @ApiImplicitParams({ -// @ApiImplicitParam(name = "pmsStatationStatInfoParam", value = "获取指定的变电站信息条件", required = true) -// }) - public HttpResult> getStatationStatInfo(@RequestBody @Validated PmsStatationStatInfoParam pmsStatationStatInfoParam) { + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "获取指定的变电站信息条件", required = true) + }) + public HttpResult> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam param) { String methodDescribe = getMethodDescribe("getStatationStatInfo"); - List monitorInfo = statationStatService.getStatationStatInfo(pmsStatationStatInfoParam); + List monitorInfo = statationStatService.getStatationStatInfo(param); if (CollectionUtil.isEmpty(monitorInfo)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); } else { @@ -61,46 +65,44 @@ public class StatationStatController extends BaseController { } } - - /*台账部分***************************/ - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) @PostMapping("/addstatationStat") @ApiOperation("新增电站") @ApiImplicitParam(name = "statationStatParam", value = "电站实体", required = true) public HttpResult addstatationStat(@RequestBody StatationStatParam statationStatParam) { String methodDescribe = getMethodDescribe("addstatationStat"); boolean result = statationStatService.addStatationStat(statationStatParam); - if(result){ + if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) @PostMapping("/updatestatationStat") @ApiOperation("修改电站") @ApiImplicitParam(name = "statationStatParam", value = "电站实体", required = true) public HttpResult updatestatationStat(@RequestBody StatationStatParam statationStatParam) { String methodDescribe = getMethodDescribe("updatestatationStat"); boolean result = statationStatService.updateStatationStat(statationStatParam); - if(result){ + if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE) + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE) @DeleteMapping("/delstatationStat") @ApiOperation("删除电站") @ApiImplicitParam(name = "statationStatIds", value = "电站ids", required = true) public HttpResult delstatationStat(@RequestBody @NotEmpty(message = "电站id不可为空") List statationStatIds) { String methodDescribe = getMethodDescribe("delstatationStat"); boolean result = statationStatService.delStatationStat(statationStatIds); - if(result){ + if (result) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); @@ -114,7 +116,7 @@ public class StatationStatController extends BaseController { public HttpResult getstatationStatById(@RequestParam("statationStatId") String statationStatId) { String methodDescribe = getMethodDescribe("getstatationStatById"); StatationStat result = statationStatService.getStatationStatById(statationStatId); - if(Objects.nonNull(result)){ + if (Objects.nonNull(result)) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); @@ -124,13 +126,45 @@ public class StatationStatController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getstatationStatList") @ApiOperation("获取电站列表") - @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) - public HttpResult> getstatationStatList(@RequestBody BaseParam baseParam) { + public HttpResult> getstatationStatList() { String methodDescribe = getMethodDescribe("getstatationStatList"); - List result = statationStatService.getStatationStatList(baseParam); + List result = statationStatService.getStatationStatList(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getStatationStatPageList") + @ApiOperation("分页获取电站列表") + @ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true) + public HttpResult> getStatationStatPageList(@RequestBody BaseParam baseParam) { + String methodDescribe = getMethodDescribe("getStatationStatPageList"); + Page result = statationStatService.getStatationStatPageList(baseParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + + /** + * 获取变电站信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/21 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getPowerInfo") + @ApiOperation("获取变电站信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "param", value = "条件参数", required = true) + }) + public HttpResult> getPowerInfo(@RequestBody PmsStatationStatInfoParam param) { + String methodDescribe = getMethodDescribe("getStatationStatInfo"); + List powerInfo = statationStatService.getPowerInfo(param); + if (CollectionUtil.isEmpty(powerInfo)) { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe); + } else { + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe); + } + } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java deleted file mode 100644 index bb2626781..000000000 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java +++ /dev/null @@ -1,132 +0,0 @@ -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; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.common.utils.LogUtil; -import com.njcn.device.pms.pojo.param.PmsTerminalParam; -import com.njcn.device.pms.pojo.po.PmsTerminal; -import com.njcn.device.pms.pojo.vo.PmsTerminalVO; -import com.njcn.device.pms.service.majornetwork.ITerminalService; -import com.njcn.web.pojo.param.BaseParam; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import com.njcn.web.controller.BaseController; - -import java.util.List; -import java.util.Objects; - -/** - *

- * 监测终端台账增删改查 - *

- * - * @author hongawen - * @since 2022-10-14 - */ -@Slf4j -@RestController -@RequestMapping("/pms/terminal") -@Api(tags = "监测终端台账") -@RequiredArgsConstructor -@Validated -public class TerminalController extends BaseController { - - private final ITerminalService iTerminalService; - - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("getTerminalList") - @ApiOperation("查询监测终端台账所有信息") - @ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true) - public HttpResult> getTerminalList(@RequestBody @Validated BaseParam baseParam){ - String methodDescribe = getMethodDescribe("getTerminalList"); - LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam); - Page res = iTerminalService.getTerminalList(baseParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe); - } - - @OperateInfo(info = LogEnum.SYSTEM_COMMON) - @GetMapping("/getTerminalById") - @ApiOperation("根据ID查询监测终端台账数据") - @ApiImplicitParam(name = "id",value = "id",required = true) - public HttpResult getTerminalById(@RequestParam("id") String id){ - String methodDescribe = getMethodDescribe("getTerminalById"); - PmsTerminal pmsTerminal = iTerminalService.getTerminalById(id); - if (Objects.nonNull(pmsTerminal)){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pmsTerminal, methodDescribe); - } - else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } - } - - /** - * 新增监测终端台账信息 - * @author hany - * @date 2022/10/26 - */ - @PostMapping("/addTerminal") - @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType= OperateType.ADD) - @ApiOperation("新增监测终端台账信息") - @ApiImplicitParam(name = "terminalParam", value = "新增实体", required = true) - public HttpResult add(@RequestBody @Validated PmsTerminalParam terminalParam){ - String methodDescribe = getMethodDescribe("add"); - boolean result = iTerminalService.add(terminalParam); - if (result) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } - - /** - * 修改监测终端台账信息 - * @author hany - * @date 2022/10/27 - */ - @PostMapping("/updateTerminal") - @OperateInfo(info = LogEnum.SYSTEM_COMMON,operateType = OperateType.UPDATE) - @ApiOperation("修改监测终端台账信息") - @ApiImplicitParam(name = "updateParam", value = "更新实体", required = true) - public HttpResult update(@RequestBody @Validated PmsTerminalParam updateParam){ - String methodDescribe = getMethodDescribe("update"); - boolean result = iTerminalService.update(updateParam); - if (result) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } - - /** - * 删除监测终端台账信息 - * @param ids id - * @author hany - * @date 2022/10/27 - */ - @PostMapping("/deleteTerminal") - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) - @ApiOperation("删除监测终端台账信息") - @ApiImplicitParam(name = "ids", value = "ID索引", required = true) - public HttpResult delete(@RequestBody List ids){ - String methodDescribe = getMethodDescribe("delete"); - boolean result = iTerminalService.delete(ids); - if(result){ - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - }else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } -} - diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java index 2e7363457..44e2818af 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java @@ -2,9 +2,12 @@ package com.njcn.device.pms.mapper.majornetwork; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.vo.StatationStatVO; +import com.njcn.web.pojo.param.BaseParam; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +29,15 @@ public interface StatationStatMapper extends BaseMapper { * @return 指定的变电站信息 */ List getStatationStatInfo(@Param("pmsStatationStatInfoParam") PmsStatationStatInfoParam pmsStatationStatInfoParam); + + + + /** + * 分页查询电站信息 + * @author cdf + * @date 2022/11/18 + */ + Page getStatationStatPageList(Page page,@Param("baseParam") BaseParam baseParam); + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml index 17ab14787..d12bc41e1 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml @@ -20,13 +20,22 @@ WHERE pm.Status = 1 AND pss.Status = 1 - AND pm.Powerr_Id IN - - #{item} - + + AND pm.Powerr_Id IN + + #{item} + + + + AND pm.Org_Id IN + + #{item} + + AND pss.Voltage_Level IN - + #{item} @@ -35,4 +44,22 @@ + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java index 386714cc7..4b8a42c5b 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java @@ -1,5 +1,6 @@ package com.njcn.device.pms.service.distribution; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.param.RStatPwAlarmCountWParam; import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam; @@ -18,5 +19,5 @@ public interface RStatPwAlarmCountWService extends IService List getAllRStatPwAlarmCountList(RStatPwAlarmCountWParam rStatPwAlarmCountWParam); - List getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam); + Page getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java index bd5f708b2..41e2cb840 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java @@ -56,11 +56,11 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { .filter(deptDTO -> deptDTO.getId().equals(pwPmsMonitorParam.getOrgId())) .collect(Collectors.toList()); //获取monitor详细数据 - pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getId()), pwPmsMonitorParam); + pwPmsMonitorDTOS = pwMonitorMapper.getPwMonitorDataList(Collections.singletonList(dept.get(0).getCode()), pwPmsMonitorParam); if (CollUtil.isEmpty(pwPmsMonitorDTOS)) { PwPmsMonitorDTO pwPmsMonitorDTO = new PwPmsMonitorDTO(); - pwPmsMonitorDTO.setOrgId(dept.get(0).getId()); + pwPmsMonitorDTO.setOrgId(dept.get(0).getCode()); pwPmsMonitorDTO.setOrgName(dept.get(0).getArea()); pwPmsMonitorDTOS.add(pwPmsMonitorDTO); } @@ -73,10 +73,10 @@ public class IPwMonitorServiceImpl implements IPwMonitorService { .collect(Collectors.toList()); //形成需要查询监测点的部门索引 List deptIdList = descendantDeptDTO.stream() - .map(DeptDTO::getId) + .map(DeptDTO::getCode) .distinct() .collect(Collectors.toList()); - deptIdList.add(deptDTO.getId()); + deptIdList.add(deptDTO.getCode()); List pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptIdList, pwPmsMonitorParam); pwPmsMonitorDTOS.addAll(pwMonitorDataList); } 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 8d43a9d99..05378259e 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 @@ -2,6 +2,7 @@ package com.njcn.device.pms.service.distribution.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -26,9 +27,11 @@ 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.factory.PageFactory; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.*; @@ -104,7 +107,7 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl */ @Override - public List getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { + public Page getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) { //提取查询条件 String id = rStatPwAlarmDetailParam.getId(); //单位id if (StringUtils.isBlank(id)) { @@ -113,6 +116,8 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl alarmTypeList = StringUtils.isNotBlank(rStatPwAlarmDetailParam.getAlarmType()) ? Arrays.asList(rStatPwAlarmDetailParam.getAlarmType().split(",")) : null; //监测点类型 @@ -122,23 +127,6 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl lineSortDict = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData(); Map lineSortIdMap = lineSortDict.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId)); - //获取所有子部门信息 - List deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData(); - 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)); - - //monitor表自身信息(后面I类监测点设置信息要用到) - PmsMonitorParam pmsMonitorParam = new PmsMonitorParam(); - pmsMonitorParam.setOrgIds(orgNoList); - pmsMonitorParam.setMonitorName(monitorName); - List mainMonitorList = iMonitorService.getMonitorInfoListByCond(pmsMonitorParam); - Map mainMonitorMap = mainMonitorList.stream().collect(Collectors.toMap(PmsMonitorDTO::getId, monitor -> monitor)); - //根据条件查询单位下面的所有配网监测点 PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); pwPmsMonitorParam.setOrgId(id); //单位id @@ -149,7 +137,7 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); if (CollUtil.isEmpty(monitorIdList)) { - return new ArrayList<>(); + return new Page<>(); } //监测点map key:监测点id value:监测点实体 Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); @@ -160,9 +148,9 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl alarmDetailList = rMpPwAlarmDetailDService.list(alarmDetailWrapper); + Page alarmDetailListPage = rMpPwAlarmDetailDService.page(new Page<>(pageNum, pageSize), alarmDetailWrapper); - List resultList = alarmDetailList.stream().map(item -> { + List resultList = alarmDetailListPage.getRecords().stream().map(item -> { RStatPwAlarmDetailVO rStatPwAlarmDetailVO = new RStatPwAlarmDetailVO(); rStatPwAlarmDetailVO.setAlarmType(item.getAlarmType()); //告警类型 rStatPwAlarmDetailVO.setAlarmInfo(item.getAlarmInfo()); //告警描述 @@ -216,7 +204,11 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl resultPage = new Page<>(); + BeanUtils.copyProperties(alarmDetailListPage, resultPage); + resultPage.setRecords(resultList); + + return resultPage; } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java index 21009a5d0..7f5a983f5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.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.GeneratrixWireParam; import com.njcn.device.pms.pojo.po.GeneratrixWire; @@ -58,6 +59,17 @@ public interface IGeneratrixWireService extends IService { * @param baseParam 基础参数 * @return boolean */ - List getGeneratrixWireList(BaseParam baseParam); + List getGeneratrixWireList(); + + /** + * 分页查询线路列表 + * @author cdf + * @date 2022/10/25 + * @param baseParam 基础参数 + * @return boolean + */ + Page getGeneratrixWirePageList(BaseParam baseParam); + + } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java index 39bc684f0..00136bac9 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.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.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; @@ -43,7 +44,7 @@ public interface IPmsGeneratrixService extends IService { * @author cdf * @date 2022/10/25 */ - boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam); + boolean updateGeneratrix(GeneratrixParam generatrixParam); /** * 删除母线 @@ -65,6 +66,15 @@ public interface IPmsGeneratrixService extends IService { */ Generatrix getGeneratrixById(String generatrixId); + /** + * 查询母线列表 + * + * @return boolean + * @author cdf + * @date 2022/10/25 + */ + List getGeneratrixList(); + /** * 查询母线列表 * @@ -73,7 +83,7 @@ public interface IPmsGeneratrixService extends IService { * @author cdf * @date 2022/10/25 */ - List getGeneratrixList(BaseParam baseParam); + Page getGeneratrixPageList(BaseParam baseParam); /** * 获取母线与电站关联信息 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java index 44bdd4862..928b7cd55 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java @@ -8,6 +8,7 @@ import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; import com.njcn.system.pojo.param.EventTemplateParam; import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateVO; +import com.njcn.web.pojo.param.BaseParam; import java.util.List; @@ -23,10 +24,9 @@ public interface IPowerDistributionareaService extends IService getList(PowerDistributionareaParam.QueryParam queryParam); + Page getList(BaseParam baseParam); /** * 根据id查询 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java index 38e0a3d39..74a8ca20a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java @@ -1,11 +1,13 @@ 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.dto.PmsStatationStatInfoDTO; import com.njcn.device.pms.pojo.param.StatationStatParam; import com.njcn.device.pms.pojo.param.PmsStatationStatInfoParam; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.vo.StatationStatVO; import com.njcn.web.pojo.param.BaseParam; import java.util.List; @@ -28,50 +30,72 @@ public interface IStatationStatService extends IService { */ List getStatationStatInfo(PmsStatationStatInfoParam pmsStatationStatInfoParam); - - /** * 新增电站 - * @author cdf - * @date 2022/10/25 + * * @param statationStatParam 电站 * @return boolean + * @author cdf + * @date 2022/10/25 */ boolean addStatationStat(StatationStatParam statationStatParam); /** * 修改电站 - * @author cdf - * @date 2022/10/25 + * * @param statationStatParam 电站 * @return boolean + * @author cdf + * @date 2022/10/25 */ boolean updateStatationStat(StatationStatParam statationStatParam); /** * 删除电站 - * @author cdf - * @date 2022/10/25 + * * @param statationStatIds 电站 * @return boolean + * @author cdf + * @date 2022/10/25 */ boolean delStatationStat(List statationStatIds); /** * 查询电站 - * @author cdf - * @date 2022/10/25 + * * @param statationStatId 电站id * @return boolean + * @author cdf + * @date 2022/10/25 */ StatationStat getStatationStatById(String statationStatId); /** * 查询电站列表 + * + * @return boolean * @author cdf * @date 2022/10/25 + */ + List getStatationStatList(); + + /** + * 查询电站列表 + * * @param baseParam 基础参数 * @return boolean + * @author cdf + * @date 2022/10/25 */ - List getStatationStatList(BaseParam baseParam); + Page getStatationStatPageList(BaseParam baseParam); + + /** + * 获取变电站信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/21 + */ + List getPowerInfo(PmsStatationStatInfoParam param); } 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 c725c3ed3..21be3bbd9 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 @@ -23,6 +23,7 @@ import com.njcn.device.pms.service.majornetwork.DataQualityDetailsService; import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; import com.njcn.device.pms.service.majornetwork.ITractionStationService; +import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; @@ -60,6 +61,8 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService private final RStatTargetDetailMapper rStatTargetDetailMapper; + private final DeptFeignClient deptFeignClient; + /** * 获取主网数据质量-台账类数据指标核查详情-监测点台账数据质量问题 * @@ -72,6 +75,8 @@ 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(); } @@ -163,8 +168,10 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService .get(vo.getSubstationId()) .getRailwayLineId() .substring(0, tractionStationInfoMap.get(vo.getSubstationId()).getRailwayLineId().length() - 1); - if (!railwayLineId.equals("1") && !railwayLineId.equals("2")) { - vo.setTypeOfRailway("0"); + if (!railwayLineId.equals(RStatTractionStationAccountDetailPO.highSpeedRail) + && + !railwayLineId.equals(RStatTractionStationAccountDetailPO.ordinaryRailway)) { + vo.setTypeOfRailway(RStatTractionStationAccountDetailPO.other); } else { vo.setTypeOfRailway(railwayLineId); } @@ -172,8 +179,6 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService }).collect(Collectors.toList()); } - - /** * 获取主网数据质量-稳态指标类数据质量问题查询 * @@ -219,7 +224,6 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService }).collect(Collectors.toList()); } - /** * 获取单位下的子单位信息 */ @@ -230,6 +234,7 @@ public class DataQualityDetailsServiceImpl implements DataQualityDetailsService return iPmsGeneralDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam); } + /** * 将单位信息转为map集合 key: 单位id value: 单位实体 */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index 3bf16f8ec..fc4fabbb0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -1,17 +1,27 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.db.bo.BaseEntity; +import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.mapper.majornetwork.GeneratrixWireMapper; +import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; +import com.njcn.device.pms.pojo.po.Generatrix; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; +import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * pms-device @@ -23,18 +33,32 @@ import java.util.List; @RequiredArgsConstructor public class GeneratrixWireImpl extends ServiceImpl implements IGeneratrixWireService { + private final PmsGeneratrixMapper pmsGeneratrixMapper; + @Override public boolean addGeneratrixWire(GeneratrixWireParam generatrixWireParam) { + checkName(generatrixWireParam,false); + Generatrix generatrix = pmsGeneratrixMapper.selectById(generatrixWireParam.getGeneratrixId()); + if(Objects.isNull(generatrix)){ + throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY); + } GeneratrixWire generatrixWire = new GeneratrixWire(); BeanUtils.copyProperties(generatrixWireParam, generatrixWire); + generatrixWire.setGeneratrixName(generatrix.getGeneratrixName()); generatrixWire.setStatus(DataStateEnum.ENABLE.getCode()); return this.save(generatrixWire); } @Override public boolean updateGeneratrixWire(GeneratrixWireParam generatrixWireParam) { + checkName(generatrixWireParam,true); + Generatrix generatrix = pmsGeneratrixMapper.selectById(generatrixWireParam.getGeneratrixId()); + if(Objects.isNull(generatrix)){ + throw new BusinessException(PmsDeviceResponseEnum.VOLTAGE_EMPTY); + } GeneratrixWire generatrixWire = new GeneratrixWire(); BeanUtils.copyProperties(generatrixWireParam, generatrixWire); + generatrixWire.setGeneratrixName(generatrix.getGeneratrixName()); return this.updateById(generatrixWire); } @@ -49,7 +73,37 @@ public class GeneratrixWireImpl extends ServiceImpl getGeneratrixWireList(BaseParam baseParam) { - return this.list(); + public List getGeneratrixWireList() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByAsc(GeneratrixWire::getCreateTime); + return this.list(lambdaQueryWrapper); + } + + @Override + public Page getGeneratrixWirePageList(BaseParam baseParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getGeneratrixName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),GeneratrixWire::getWireName,baseParam.getSearchValue()) + .orderByAsc(GeneratrixWire::getCreateTime); + return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); + } + + + private void checkName(GeneratrixWireParam generatrixWireParam,Boolean updateFlag){ + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(GeneratrixWire::getGeneratrixName,generatrixWireParam.getWireName()) + .eq(GeneratrixWire::getGeneratrixId,generatrixWireParam.getGeneratrixId()) + .eq(GeneratrixWire::getStatus,DataStateEnum.ENABLE.getCode()); + + if(updateFlag){ + //更新 + lambdaQueryWrapper.ne(GeneratrixWire::getWireId,generatrixWireParam.getWireId()); + } + int count = this.count(lambdaQueryWrapper); + if(count > 0){ + throw new BusinessException(PmsDeviceResponseEnum.GENERATRIXWIRE_NAME_REPEAT); + } } } 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 06f1b0cf5..17cf6d313 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 @@ -98,6 +98,7 @@ public class MonitorServiceImpl extends ServiceImpl impl .like(StringUtils.isNotBlank(pmsMonitorParam.getMonitorName()), Monitor::getName, pmsMonitorParam.getMonitorName()) .in(CollUtil.isNotEmpty(pmsMonitorParam.getVoltageLevels()), Monitor::getVoltageLevel, pmsMonitorParam.getVoltageLevels()) .in(CollUtil.isNotEmpty(pmsMonitorParam.getPowerrIds()),Monitor::getPowerrId,pmsMonitorParam.getPowerrIds()) + .like(StringUtils.isNotBlank(pmsMonitorParam.getPowerrName()), Monitor::getPowerrName, pmsMonitorParam.getPowerrName()) .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorType()), Monitor::getMonitorType, pmsMonitorParam.getMonitorType()) .eq(StringUtils.isNotBlank(pmsMonitorParam.getMonitorState()), Monitor::getMonitorState, pmsMonitorParam.getMonitorState()); List list = this.list(lambdaQueryWrapper); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java index a78815af1..6e2fccd60 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java @@ -47,7 +47,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { List dept = deptInfos.stream() .filter(deptDTO -> deptDTO.getId().equals(pmsDeviceInfoParam.getDeptIndex())) .collect(Collectors.toList()); - deviceInfos.add(getPmsGeneralDeviceInfo(dept.get(0), Collections.singletonList(pmsDeviceInfoParam.getDeptIndex()), pmsDeviceInfoParam)); + deviceInfos.add(getPmsGeneralDeviceInfo(dept.get(0), Collections.singletonList(dept.get(0).getCode()), pmsDeviceInfoParam)); }else{ for (DeptDTO deptDTO : directDeptInfos) { //筛选上级部门pids包含该id的所有部门 @@ -56,10 +56,10 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { .collect(Collectors.toList()); //形成需要查询监测点的部门索引 List deptIdList = descendantDeptDTO.stream() - .map(DeptDTO::getId) + .map(DeptDTO::getCode) .distinct() .collect(Collectors.toList()); - deptIdList.add(deptDTO.getId()); + deptIdList.add(deptDTO.getCode()); deviceInfos.add(getPmsGeneralDeviceInfo(deptDTO, deptIdList, pmsDeviceInfoParam)); } } @@ -69,7 +69,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { @Override public List getPmsPowerrInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) { List deptInfos = deptFeignClient.getDeptDescendantIndexes(pmsDeviceInfoParam.getDeptIndex(), Stream.of(0,1).collect(Collectors.toList())).getData(); - List orgIdList = deptInfos.stream().map(deptDTO -> deptDTO.getId()).collect(Collectors.toList()); + List orgIdList = deptInfos.stream().map(deptDTO -> deptDTO.getCode()).collect(Collectors.toList()); return monitorService.getPmsPowerrInfoWithInOrg(orgIdList,pmsDeviceInfoParam); } @@ -86,7 +86,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { List dept = deptInfos.stream() .filter(deptDTO -> deptDTO.getId().equals(pmsDeviceInfoParam.getDeptIndex())) .collect(Collectors.toList()); - deviceInfos.add(getPmsGeneralDeviceInfoByOrg(dept.get(0), Collections.singletonList(pmsDeviceInfoParam.getDeptIndex()), pmsDeviceInfoParam)); + deviceInfos.add(getPmsGeneralDeviceInfoByOrg(dept.get(0), Collections.singletonList(dept.get(0).getCode()), pmsDeviceInfoParam)); }else{ for (DeptDTO deptDTO : directDeptInfos) { //筛选上级部门pids包含该id的所有部门 @@ -95,10 +95,10 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { .collect(Collectors.toList()); //形成需要查询监测点的部门索引 List deptIdList = descendantDeptDTO.stream() - .map(DeptDTO::getId) + .map(DeptDTO::getCode) .distinct() .collect(Collectors.toList()); - deptIdList.add(deptDTO.getId()); + deptIdList.add(deptDTO.getCode()); deviceInfos.add(getPmsGeneralDeviceInfoByOrg(deptDTO, deptIdList, pmsDeviceInfoParam)); } } @@ -113,7 +113,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { */ private PmsGeneralDeviceDTO getPmsGeneralDeviceInfo(DeptDTO deptDTO, List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { PmsGeneralDeviceDTO pmsGeneralDeviceDTO = new PmsGeneralDeviceDTO(); - pmsGeneralDeviceDTO.setIndex(deptDTO.getId()); + pmsGeneralDeviceDTO.setIndex(deptDTO.getCode()); if (deptDTO.getType() == 0) { pmsGeneralDeviceDTO.setName(deptDTO.getArea()); } else { @@ -137,7 +137,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService { */ private PmsGeneralDeviceDTO getPmsGeneralDeviceInfoByOrg(DeptDTO deptDTO, List deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { PmsGeneralDeviceDTO pmsGeneralDeviceDTO = new PmsGeneralDeviceDTO(); - pmsGeneralDeviceDTO.setIndex(deptDTO.getId()); + pmsGeneralDeviceDTO.setIndex(deptDTO.getCode()); if (deptDTO.getType() == 0) { pmsGeneralDeviceDTO.setName(deptDTO.getArea()); } else { diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java index 70f056584..f429b2ea8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java @@ -1,15 +1,26 @@ package com.njcn.device.pms.service.majornetwork.impl; 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.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.common.pojo.enums.common.DataStateEnum; +import com.njcn.common.pojo.exception.BusinessException; +import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; +import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; import com.njcn.device.pms.pojo.param.GeneratrixParam; +import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; import com.njcn.device.pms.pojo.po.Generatrix; +import com.njcn.device.pms.pojo.po.GeneratrixWire; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; +import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,6 +28,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @author yzh @@ -29,6 +41,8 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl getGeneratrixList(BaseParam baseParam) { - return this.list(); + public List getGeneratrixList() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime); + return this.list(lambdaQueryWrapper); + } + + @Override + public Page getGeneratrixPageList(BaseParam baseParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getGeneratrixName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getStatationName,baseParam.getSearchValue()) + .orderByAsc(Generatrix::getCreateTime); + return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); } /** @@ -84,4 +123,22 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) { return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param); } + + + private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){ + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(Generatrix::getGeneratrixName,generatrixParam.getGeneratrixName()) + .eq(Generatrix::getGeneratrixId,generatrixParam.getStatationId()) + .eq(Generatrix::getStatus, DataStateEnum.ENABLE.getCode()); + + if(updateFlag){ + //更新 + lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId()); + } + int count = this.count(lambdaQueryWrapper); + if(count > 0){ + throw new BusinessException(PmsDeviceResponseEnum.GENERATRIX_NAME_REPEAT); + } + } } 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 57a3267e2..45cfe0180 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 @@ -1,5 +1,6 @@ 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.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,14 +10,23 @@ import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.mapper.majornetwork.PowerDistributionareaMapper; import com.njcn.device.pms.pojo.param.PowerDistributionareaParam; import com.njcn.device.pms.pojo.po.PowerDistributionarea; +import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO; +import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.pms.service.majornetwork.IStatationStatService; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.po.Dept; import com.njcn.web.factory.PageFactory; +import com.njcn.web.pojo.param.BaseParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** *

@@ -27,18 +37,27 @@ import java.util.List; * @since 2022-10-14 */ @Service +@RequiredArgsConstructor public class PowerDistributionareaServiceImpl extends ServiceImpl implements IPowerDistributionareaService { + private final DeptFeignClient deptFeignClient; + + private final IStatationStatService iStatationStatService; + + private final IGeneratrixWireService iGeneratrixWireService; + + private DicDataFeignClient dicDataFeignClient; @Override - public Page getList(PowerDistributionareaParam.QueryParam queryParam) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("pms_power_distributionarea.status", DataStateEnum.DELETED.getCode()); - if (queryParam.getStatus().equals(1)){ - queryWrapper.eq("pms_power_distributionarea.status",1); - } + public Page getList(BaseParam baseParam) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getPowerrName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerDistributionarea::getOrgName,baseParam.getSearchValue()); //初始化分页数据 - return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); + return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); } /** @@ -59,6 +78,23 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl - * 服务实现类 + * 服务实现类 *

* * @author hongawen @@ -39,7 +43,6 @@ public class StatationStatServiceImpl extends ServiceImpl getStatationStatList(BaseParam baseParam) { - return this.list(); + public List getStatationStatList() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.orderByDesc(StatationStat::getCreateTime); + return this.list(lambdaQueryWrapper); + } + + @Override + public Page getStatationStatPageList(BaseParam baseParam) { + return this.baseMapper.getStatationStatPageList(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), baseParam); + } + + /** + * 获取变电站信息 + * + * @param param 条件参数 + * @return com.njcn.common.pojo.response.HttpResult> + * @author yzh + * @date 2022/11/21 + */ + @Override + public List getPowerInfo(PmsStatationStatInfoParam param) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(param.getOrgIds() != null, StatationStat::getOrgId,param.getOrgIds()); + lqw.in(param.getPowerIds() != null, StatationStat::getPowerId,param.getPowerIds()); + lqw.like(param.getPowerName()!=null,StatationStat::getPowerName,param.getPowerName()); + lqw.in(param.getPowerVoltageLevel() != null, StatationStat::getVoltageLevel,param.getPowerVoltageLevel()); + return this.list(lqw); } } 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 5dba48a52..ea6a3be0e 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 @@ -1,21 +1,30 @@ 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.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; +import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; import com.njcn.device.pms.mapper.majornetwork.TerminalMapper; import com.njcn.device.pms.pojo.param.PmsTerminalParam; import com.njcn.device.pms.pojo.po.PmsTerminal; +import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.service.majornetwork.IStatationStatService; import com.njcn.device.pms.service.majornetwork.ITerminalService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.po.Dept; import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** *

@@ -26,12 +35,25 @@ import java.util.List; * @since 2022-10-14 */ @Service +@RequiredArgsConstructor public class TerminalServiceImpl extends ServiceImpl implements ITerminalService { + private final DeptFeignClient deptFeignClient; + + private final IStatationStatService iStatationStatService; + + private DicDataFeignClient dicDataFeignClient; + @Override public Page getTerminalList(BaseParam baseParam) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode()).like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getOrgName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())) + .like(StrUtil.isNotBlank(baseParam.getSearchValue()),PmsTerminal::getPowerrName,baseParam.getSearchValue()) + .or(StrUtil.isNotBlank(baseParam.getSearchValue())).orderByDesc(PmsTerminal::getCreateTime); //初始化分页数据 return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); @@ -55,8 +77,29 @@ public class TerminalServiceImpl extends ServiceImpl - * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java index a7cb37926..8cf5e73e2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPartHarmonicDetailM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java index be7e9c8b7..6a88e1312 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java index daedff7f6..5e1206950 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateQ.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java index be8b96ace..57482b04f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPassRateY.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java index fa636994d..b0cf41b74 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailD.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java index 1afdd593d..f89784c4e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpSurplusHarmonicDetailM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java index bf7c7ae41..2e9e57c85 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpVThd.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/10/10 19:59【需求编号】 @@ -20,7 +20,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 谐波畸变率排名 */ @@ -59,4 +58,4 @@ public class RMpVThd implements Serializable { private Double vThd; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java index 86533a72b..17d01b63a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java index eef08d127..927dca5d3 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeQ.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java index b6c6b18ac..ae5ff048b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatLoadTypeY.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java index 48bb2f195..cb1e48b93 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java index 35db0cf34..2f873023e 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageQ.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java index 72ef74ce0..ba331eb7a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgBusbarVoltageY.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java index 86738b70e..988796a9b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java @@ -1,16 +1,15 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDateTime; - /** *

* 区域分类统计月表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java index 956a8a997..8d8e8ea2a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java @@ -1,16 +1,15 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDateTime; - /** *

* 区域分类统计季表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java index a29604a8f..7956b9ed2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java @@ -1,16 +1,15 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDateTime; - /** *

* 区域分类统计年表 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java index 82d5eecae..8b95e6cb1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgDPO.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:27【需求编号】 @@ -20,7 +20,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 单位污区图统计日表 */ @@ -59,4 +58,4 @@ public class RStatPollutionOrgDPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java index 6106d18ee..dd25158ce 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgMPO.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/3 10:18【需求编号】 @@ -20,7 +20,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 单位污区图统计月表 */ @@ -59,4 +58,4 @@ public class RStatPollutionOrgMPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java index eb651db42..34a71fa21 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgQPO.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.util.Date; - /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:27【需求编号】 @@ -20,7 +21,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 单位污区图统计季表 */ @@ -59,4 +59,4 @@ public class RStatPollutionOrgQPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java index 8e876bada..44fc2c38d 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionOrgYPO.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.util.Date; - /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -20,7 +21,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 单位污区图统计年表 */ @@ -59,4 +59,4 @@ public class RStatPollutionOrgYPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java index f9ee65654..4fc3cc462 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationDPO.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.util.Date; - /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -20,7 +21,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 变电站污区图统计日表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationDPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java index 5aec94dab..2936a93d6 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationQPO.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.util.Date; - /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -20,7 +21,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 变电站污区图统计季表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationQPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java index d1978e1ee..e46ffc5ff 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPollutionSubstationYPO.java @@ -1,18 +1,19 @@ package com.njcn.harmonic.pojo.po; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; -import java.util.Date; - /** - * + * * Description: * 接口文档访问地址：http://serverIP:port/swagger-ui.html * Date: 2022/11/8 13:28【需求编号】 @@ -20,7 +21,6 @@ import java.util.Date; * @author clam * @version V1.0.0 */ - /** * 变电站污区图统计年表 */ @@ -59,4 +59,4 @@ public class RStatPollutionSubstationYPO implements Serializable { private Double value; private static final long serialVersionUID = 1L; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java index 81386b6c1..e276aaad3 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatPwPermeabilityM.java @@ -1,14 +1,14 @@ package com.njcn.harmonic.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - import java.io.Serializable; import java.util.Date; +import lombok.Data; /** - * + * * @TableName r_stat_pw_permeability_m */ @TableName(value ="r_stat_pw_permeability_m") @@ -79,4 +79,4 @@ public class RStatPwPermeabilityM implements Serializable { private String permeabilityType; -} +} \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java index f3c89aede..ea73dddc4 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java index 8213b4d56..5d1ee2efe 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationQ.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java index 9bce4f285..bb0933d4f 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationVoltageM.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java index f002c4289..0fe743cd2 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatSubstationY.java @@ -1,19 +1,18 @@ package com.njcn.harmonic.pojo.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDate; +import com.baomidou.mybatisplus.annotation.TableId; +import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.time.LocalDate; - /** *

- * + * *

* * @author rui.wu diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java index ba06f5f52..252a8e184 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/EventDetailVO.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.pojo.vo; import lombok.Data; import java.io.Serializable; +import java.time.LocalDateTime; /** * @author denghuajun diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java index 618f45e03..47e43e6eb 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java index 28a6b558d..a01630fd4 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.List; +import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java index dbe6ce943..ec958e1a1 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HistoryDataResultVO.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.time.LocalTime; +import java.util.ArrayList; import java.util.List; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java index a4c00db08..672e8f05a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/IntegrityIconVO.java @@ -6,6 +6,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; /** * 类的介绍： diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java index 3f5dc50e1..b664fcb07 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PwRMpBenchmarkLevelVO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Title PwRMpBenchmarkLevelVO diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java index 2a5809ed8..997e3e086 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/QueryResultLimitVO.java @@ -1,8 +1,8 @@ package com.njcn.harmonic.pojo.vo; import lombok.Data; -import org.influxdb.dto.QueryResult; +import org.influxdb.dto.QueryResult; import java.io.Serializable; import java.util.List; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java index 8eaf8d47e..0f693bec9 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpHarmonicReportDVO.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.pojo.vo; import com.njcn.harmonic.pojo.po.*; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.json.JSONObject; import java.io.Serializable; import java.util.Map; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java index 11639678a..a00b9f6ee 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailIconVO.java @@ -3,6 +3,8 @@ package com.njcn.harmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDate; + /** * <功能描述> * diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java index 5d2ea744e..628f4b8dd 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RMpPartHarmonicDetailVO.java @@ -1,5 +1,8 @@ package com.njcn.harmonic.pojo.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailD; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java index 395843c2f..84c7f6c9b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLoadTypeVO.java @@ -1,7 +1,15 @@ package com.njcn.harmonic.pojo.vo; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDate; /** *

diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java index 6c4b01171..241f86401 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgIndexVO.java @@ -3,6 +3,7 @@ package com.njcn.harmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java index 8df2219b2..a7877f467 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RSubstationIconVO.java @@ -1,5 +1,6 @@ package com.njcn.harmonic.pojo.vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java index 550b62d4c..0c8705c6b 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/HarmonicComAssesUtil.java @@ -26,7 +26,7 @@ import java.util.List; @Component public class HarmonicComAssesUtil { // 日志记录 - private static final Logger logger = LoggerFactory.getLogger(HarmonicComAssesUtil.class); + private static final Logger logger = LoggerFactory.getLogger(com.njcn.harmonic.utils.HarmonicComAssesUtil.class); private static final int ST_QT_NUM = 6;//系统评价指标数目 private static final int GRADE_NUM = 5;//指标分级数目 private static final int METHOD_NUM = 5;//评估方法数 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java index a935f1672..a0fbf175c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HarmonicController.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller; +//package com.njcn.harmonic.controller; // //import com.njcn.common.pojo.annotation.OperateInfo; //import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java index de15cbea4..d2cba9871 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/PollutionController.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.controller;//package com.njcn.harmonic.controller; +//package com.njcn.harmonic.controller; // //import com.njcn.common.pojo.annotation.OperateInfo; //import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java deleted file mode 100644 index 5dae8c387..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RMpBenchmarkLevelController.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.njcn.harmonic.controller; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; -import com.njcn.harmonic.service.RMpBenchmarkLevelMService; -import com.njcn.harmonic.service.RMpBenchmarkLevelQService; -import com.njcn.harmonic.service.RMpBenchmarkLevelYService; -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; - -/** - * @Title RMpBenchmarkLevelController - * @Package com.njcn.device.pms.controller - * @Author jianghaifei - * @Date 2022-10-11 10:34 - * @Version V1.0 - */ -@RestController -@Api(tags = "主配网-基准水平评估") -@RequiredArgsConstructor -@RequestMapping("/rMpBenchmarkLevel") -public class RMpBenchmarkLevelController extends BaseController { - - private final RMpBenchmarkLevelMService rMpBenchmarkLevelMService; //基准水平-月 - - private final RMpBenchmarkLevelQService rMpBenchmarkLevelQService; //基准水平-季 - - private final RMpBenchmarkLevelYService rMpBenchmarkLevelYService; //基准水平-年 - - - @PostMapping("getAllRMpBenchmarkLevelList") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("主网-区域稳态电能质量水平评估") - public HttpResult> getAllRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - String methodDescribe = getMethodDescribe("getAllRMpBenchmarkLevelList"); - //获取查询条件-时间类型 - String type = rMpBenchmarkLevelParam.getType().toString(); - List rMpBenchmarkLevelList; - switch (type) { - case BizParamConstant.STAT_BIZ_YEAR: - //查询基准水平-年数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelYService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - case BizParamConstant.STAT_BIZ_QUARTER: - //查询基准水平-季数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - case BizParamConstant.STAT_BIZ_MONTH: - //查询基准水平-月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - default: - //如果前端没有传type默认查询月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe); - } - - @PostMapping("getPwRMpBenchmarkLevelList") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("配网-全网基准水平") - public HttpResult> getPwRMpBenchmarkLevelList(@RequestBody RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - String methodDescribe = getMethodDescribe("getPwRMpBenchmarkLevelList"); - //获取查询条件-时间类型 - String type = rMpBenchmarkLevelParam.getType().toString(); - List rMpBenchmarkLevelList; - switch (type) { - case BizParamConstant.STAT_BIZ_YEAR: - //查询基准水平-年数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelYService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - case BizParamConstant.STAT_BIZ_QUARTER: - //查询基准水平-季数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelQService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - case BizParamConstant.STAT_BIZ_MONTH: - //查询基准水平-月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - break; - default: - //如果前端没有传type默认查询月数据 - rMpBenchmarkLevelList = rMpBenchmarkLevelMService.getPwRMpBenchmarkLevelList(rMpBenchmarkLevelParam); - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rMpBenchmarkLevelList, methodDescribe); - } -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatPwPermeabilityMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatPwPermeabilityMController.java deleted file mode 100644 index f83ce0df0..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/RStatPwPermeabilityMController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.njcn.harmonic.controller; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; -import com.njcn.harmonic.service.RStatPwPermeabilityMService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -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; - -/** - * @Title RStatPwPermeabilityMController - * @Package com.njcn.harmonic.controller - * @Author jianghaifei - * @Date 2022-11-07 13:55 - * @Version V1.0 - */ -@RestController -@RequestMapping("/rStatPwPermeability") -@RequiredArgsConstructor -@Api(tags = "配网-各渗透率光伏台区基准水平") -public class RStatPwPermeabilityMController extends BaseController { - - private final RStatPwPermeabilityMService rStatPwPermeabilityMService; - - @PostMapping("getPwPermeabilityList") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询各渗透率光伏台区基准水平") - public HttpResult> getPwPermeabilityList(@RequestBody RStatPwPermeabilityMParam rStatPwPermeabilityMParam) { - String methodDescribe = getMethodDescribe("getPwPermeabilityList"); - List list = rStatPwPermeabilityMService.getPwPermeabilityList(rStatPwPermeabilityMParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java index 17f226fc5..9d9e9fb29 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicController.java @@ -16,6 +16,7 @@ import com.njcn.harmonic.service.majornetwork.RStatHarmonicQService; import com.njcn.harmonic.service.majornetwork.RStatHarmonicYService; 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.*; @@ -46,6 +47,7 @@ public class PwRStatHarmonicController extends BaseController { @PostMapping("/getPwAllRStatHarmonic") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("查询稳态累计超标监测点数") + @ApiImplicitParam(name = "param", value = "累计超标监测点数参数", required = true) public HttpResult> getPwAllRStatHarmonic(@RequestBody StatisticsBizBaseParam param) { String methodDescribe = getMethodDescribe("getPwAllRStatHarmonic"); List rStatHarmonicMAll = null; @@ -76,6 +78,7 @@ public class PwRStatHarmonicController extends BaseController { @PostMapping("/getPwRStatHarmonicIconDate") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态监测点-频率偏差-越线日期统计图") + @ApiImplicitParam(name = "param", value = "越线日期统计参数", required = true) public HttpResult> getPwRStatHarmonicIconDate(@RequestBody RStatHarmonicMParam param) { String methodDescribe = getMethodDescribe("getPwRStatHarmonicIconDate"); List rStatHarmonicIcon = rStatHarmonicMService.getPwRStatHarmonicIconDate(param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgMController.java deleted file mode 100644 index b3a0a5b26..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/distribution/PwRStatHarmonicOrgMController.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.njcn.harmonic.controller.distribution; - - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; -import com.njcn.harmonic.pojo.vo.RArrayVO; -import com.njcn.harmonic.pojo.vo.RIconVO; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgMService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgQService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgYService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 前端控制器 - *

- * - * @author rui.wu - * @since 2022-10-14 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "配网指标分类概览-各单位分类总览") -@RequestMapping("/harmonic/pwRStatHarmonicOrg") -public class PwRStatHarmonicOrgMController extends BaseController { - - private final RStatHarmonicOrgYService rStatHarmonicOrgYService; - private final RStatHarmonicOrgQService rStatHarmonicOrgQService; - private final RStatHarmonicOrgMService rStatHarmonicOrgMService; - - /** - * 查询查询监测点稳态指标 日/月点数 - */ - @PostMapping("/getPwRStatHarmonicOrg") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询稳态累计超标监测点数") - public HttpResult> getPwRStatHarmonicOrg(@RequestBody StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getPwRStatHarmonicOrg"); - List org = null; - String string = param.getType().toString(); - switch (string) { - //查询各单位累计超标监测点数-年数据 - case BizParamConstant.STAT_BIZ_YEAR: - org = rStatHarmonicOrgYService.getPwRStatHarmonicYAll(param); - break; - //查询各单位累计超标监测点数-季数据 - case BizParamConstant.STAT_BIZ_QUARTER: - org = rStatHarmonicOrgQService.getPwRStatHarmonicQAll(param); - break; - //查询各单位累计超标监测点数-月数据 - case BizParamConstant.STAT_BIZ_MONTH: - org = rStatHarmonicOrgMService.getPwRStatHarmonicMAll(param); - break; - default: - break; - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, org, methodDescribe); - } - - - /** - * 查询查询监测点稳态指标 日/月点数 - */ - @PostMapping("/getPwRStatHarmonicOrgIcon") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询稳态各单位超标监测统计图") - public HttpResult> getPwRStatHarmonicOrgIcon(@RequestBody RStatHarmonicMParam param) { - String methodDescribe = getMethodDescribe("getPwRStatHarmonicOrgIcon"); - List icon= null; - String string = param.getType().toString(); - switch (string) { - //查询各单位累计超标监测点数统计图-年数据 - case BizParamConstant.STAT_BIZ_YEAR: - icon = rStatHarmonicOrgYService.getPwRStatHarmonicOrgYIcon(param); - break; - //查询各单位累计超标监测点数-季数据 - case BizParamConstant.STAT_BIZ_QUARTER: - icon = rStatHarmonicOrgQService.getPwRStatHarmonicOrgQIcon(param); - break; - //查询各单位累计超标监测点数-月数据 - case BizParamConstant.STAT_BIZ_MONTH: - icon = rStatHarmonicOrgMService.getPwRStatHarmonicOrgMIcon(param); - break; - default: - break; - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, icon, methodDescribe); - } - -} - 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 f43830c72..eb0571928 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 @@ -14,6 +14,7 @@ import com.njcn.harmonic.service.distribution.PwRStatOrgService; import com.njcn.harmonic.service.majornetwork.*; 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.*; @@ -45,6 +46,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getPwAllRStatHarmonicOrg") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域超标统计") + @ApiImplicitParam(name = "param", value = "超标参数", required = true) public HttpResult> getPwAllRStatHarmonicOrg(@RequestBody StatSubstationBizBaseParam param) { String methodDescribe = getMethodDescribe("getPwAllRStatHarmonicOrg"); List rStatHarmonicAll = pwRStatOrgService.getRStatHarmonicAll(param); @@ -58,6 +60,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getPwRStatSubstation") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域稳态指标超标分类统计表") + @ApiImplicitParam(name = "param", value = "超标分类参数", required = true) public HttpResult> getPwRStatSubstation(@RequestBody StatSubstationBizBaseParam param) { String methodDescribe = getMethodDescribe("getPwRStatSubstation"); List statSubstationIcon = pwRStatOrgService.getRStatSubstationOrg(param); @@ -73,6 +76,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getPwRMpPartHarmonicDetail") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态指标超标明细表") + @ApiImplicitParam(name = "param", value = "超标明细参数", required = true) public HttpResult> getPwRMpPartHarmonicDetail(@RequestBody StatSubstationBizBaseParam param) { String methodDescribe = getMethodDescribe("getPwRMpPartHarmonicDetail"); List rMpPartHarmonicDetail = pwRStatOrgService.getRMpPartHarmonicDetail(param); @@ -88,6 +92,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getRMpPartHarmonicDetailIcon") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态指标超标明细表-指标趋势图") + @ApiImplicitParam(name = "param", value = "超标指标趋势参数", required = true) public HttpResult> getRMpPartHarmonicDetailIcon(@RequestBody StatisticsBizBaseParam param) { String methodDescribe = getMethodDescribe("getRMpPartHarmonicDetailIcon"); List rMpPartHarmonicDetail = rMpPartHarmonicDetailDService.getRMpPartHarmonicDetailIcon(param); @@ -103,6 +108,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getPwRStatOrgIndex") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域稳态指标合格率统计表") + @ApiImplicitParam(name = "param", value = "超标合格率统计参数", required = true) public HttpResult> getPwRStatOrgIndex(@RequestBody StatSubstationBizBaseParam param) { String methodDescribe = getMethodDescribe("getPwRStatOrgIndex"); List rStatOrg = pwRStatOrgService.getRStatOrgIndex(param); @@ -118,6 +124,7 @@ public class PwRStatOrgController extends BaseController { @PostMapping("/getPwRMpPassRateInfo") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("稳态指标合格率明细表") + @ApiImplicitParam(name = "param", value = "超标合格率明细参数", required = true) public HttpResult> getPwRMpPassRateInfo(@RequestBody RStatOrgParam.PwRStatOrgParam param) { String methodDescribe = getMethodDescribe("getPwRMpPassRateInfo"); List rStatOrg = pwRStatOrgService.getRMpPassRateInfo(param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicMController.java deleted file mode 100644 index a36265079..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicMController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.njcn.harmonic.controller.majornetwork; - - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; -import com.njcn.harmonic.pojo.vo.*; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicMService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicQService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicYService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - *

- * 前端控制器 - *

- * - * @author rui.wu - * @since 2022-10-09 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "主网指标分类概览-监测点分类总览") -@RequestMapping("/harmonic/rStatHarmonic") -public class RStatHarmonicMController extends BaseController { - - private final RStatHarmonicMService rStatHarmonicMService; - private final RStatHarmonicQService rStatHarmonicQService; - private final RStatHarmonicYService rStatHarmonicYService; - - /** - * 查询查询监测点稳态指标 日/月点数 - */ - @GetMapping("/getAllRStatHarmonic") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询稳态累计超标监测点数") - public HttpResult> getAllRStatHarmonic(StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getAllRStatHarmonic"); - List rStatHarmonicMAll = null; - String string = param.getType().toString(); - switch (string) { - //查询超标监测点数-年数据 - case BizParamConstant.STAT_BIZ_YEAR: - rStatHarmonicMAll = rStatHarmonicYService.getRStatHarmonicYAll(param); - break; - //查询超标监测点数-季数据 - case BizParamConstant.STAT_BIZ_QUARTER: - rStatHarmonicMAll = rStatHarmonicQService.getRStatHarmonicQAll(param); - break; - //查询超标监测点数-月数据 - case BizParamConstant.STAT_BIZ_MONTH: - rStatHarmonicMAll = rStatHarmonicMService.getRStatHarmonicMAll(param); - break; - default: - break; - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe); - } - - /** - * 电铁-频率偏差-电压统计图 - */ - @GetMapping("/getRStatHarmonicIconVoltage") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("稳态电铁-频率偏差-电压统计图") - public HttpResult> getRStatHarmonicIconVoltage(RStatHarmonicMParam param) { - String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage"); - List rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconVoltage(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe); - } - - /** - * 电铁-频率偏差-电压统计图 - */ - @GetMapping("/getRStatHarmonicIconDate") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("稳态电铁-频率偏差-越线日期统计图") - public HttpResult> getRStatHarmonicIconDate(RStatHarmonicMParam param) { - String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate"); - List rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe); - } - - -} - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgMController.java deleted file mode 100644 index 4301c2232..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicOrgMController.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.njcn.harmonic.controller.majornetwork; - - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.constant.BizParamConstant; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.param.RStatHarmonicMParam; -import com.njcn.harmonic.pojo.vo.RArrayVO; -import com.njcn.harmonic.pojo.vo.RIconVO; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgMService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgQService; -import com.njcn.harmonic.service.majornetwork.RStatHarmonicOrgYService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - *

- * 前端控制器 - *

- * - * @author rui.wu - * @since 2022-10-14 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "主网指标分类概览-各单位分类总览") -@RequestMapping("/harmonic/rStatHarmonicOrg") -public class RStatHarmonicOrgMController extends BaseController { - - private final RStatHarmonicOrgYService rStatHarmonicOrgYService; - private final RStatHarmonicOrgQService rStatHarmonicOrgQService; - private final RStatHarmonicOrgMService rStatHarmonicOrgMService; - - /** - * 查询查询监测点稳态指标 日/月点数 - */ - @GetMapping("/getAllRStatHarmonicOrg") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询稳态累计超标监测点数") - public HttpResult> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg"); - List rStatHarmonicOrgMAll = null; - String string = param.getType().toString(); - switch (string) { - //查询各单位累计超标监测点数-年数据 - case BizParamConstant.STAT_BIZ_YEAR: - rStatHarmonicOrgMAll = rStatHarmonicOrgYService.getRStatHarmonicYAll(param); - break; - //查询各单位累计超标监测点数-季数据 - case BizParamConstant.STAT_BIZ_QUARTER: - rStatHarmonicOrgMAll = rStatHarmonicOrgQService.getRStatHarmonicQAll(param); - break; - //查询各单位累计超标监测点数-月数据 - case BizParamConstant.STAT_BIZ_MONTH: - rStatHarmonicOrgMAll = rStatHarmonicOrgMService.getRStatHarmonicMAll(param); - break; - default: - break; - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgMAll, methodDescribe); - } - - - /** - * 查询查询监测点稳态指标 日/月点数 - */ - @GetMapping("/getAllRStatHarmonicOrgIcon") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("查询稳态各单位超标监测统计图") - public HttpResult> getAllRStatHarmonicOrgIcon(RStatHarmonicMParam param) { - String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrgIcon"); - List getAllRStatHarmonicOrgIcon = null; - String string = param.getType().toString(); - switch (string) { - //查询各单位累计超标监测点数统计图-年数据 - case BizParamConstant.STAT_BIZ_YEAR: - getAllRStatHarmonicOrgIcon = rStatHarmonicOrgYService.getRStatHarmonicOrgYIcon(param); - break; - //查询各单位累计超标监测点数-季数据 - case BizParamConstant.STAT_BIZ_QUARTER: - getAllRStatHarmonicOrgIcon = rStatHarmonicOrgQService.getRStatHarmonicOrgQIcon(param); - break; - //查询各单位累计超标监测点数-月数据 - case BizParamConstant.STAT_BIZ_MONTH: - getAllRStatHarmonicOrgIcon = rStatHarmonicOrgMService.getRStatHarmonicOrgMIcon(param); - break; - default: - break; - } - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, getAllRStatHarmonicOrgIcon, methodDescribe); - } - -} - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java index d389c1bd1..6041f516a 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java @@ -82,7 +82,7 @@ public class RStatOrgController extends BaseController { @GetMapping("/getRStatSubstation") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("区域稳态指标超标分类统计表") - public HttpResult> getRStatSubstation(StatisticsBizBaseParam param) { + public HttpResult > getRStatSubstation(StatisticsBizBaseParam param) { String methodDescribe = getMethodDescribe("getRStatSubstation"); List statSubstationIcon = rStatOrgYService.getRStatSubstationOrg(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatSubstationMController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatSubstationMController.java deleted file mode 100644 index ede2f48e7..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatSubstationMController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.njcn.harmonic.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.param.StatisticsBizBaseParam; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO; -import com.njcn.harmonic.pojo.vo.RSubstationIconVO; -import com.njcn.harmonic.pojo.vo.RVoltageIconVO; -import com.njcn.harmonic.service.majornetwork.RStatSubstationMService; -import com.njcn.harmonic.service.majornetwork.RStatSubstationVoltageMService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - - -/** - *

- * 前端控制器 - *

- * - * @author rui.wu - * @since 2022-10-18 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "主网指标分类概览-变电站分类总览") -@RequestMapping("/harmonic/rStatSubstation") -public class RStatSubstationMController extends BaseController { - - private final RStatSubstationMService rStatSubstationMService; - private final RStatSubstationVoltageMService rStatSubstationVoltageMService; - - /** - * 变电站稳态指标超标分布（按超标天数） - */ - @GetMapping("/getAllRStatSubstationIconDays") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("变电站稳态指标超标分布（按超标天数）") - public HttpResult getAllRStatSubstationIconDays(StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getAllRStatSubstationIconDays"); - RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); - } - - /** - * 变电站稳态指标超标分布（按电压等级） - */ - @GetMapping("/getAllRStatSubstationIconVoltage") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("变电站稳态指标超标分布（按电压等级）") - public HttpResult> getAllRStatSubstationIconVoltage(StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getAllRStatSubstationIconVoltage"); - List statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); - } - - - /** - * 变电站稳态指标平均超标天数 - */ - @GetMapping("/getAllRStatSubstationIconAvgDays") - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("变电站稳态指标平均超标天数") - public HttpResult> getAllRStatSubstationIconAvgDays(StatisticsBizBaseParam param) { - String methodDescribe = getMethodDescribe("getAllRStatSubstationIconAvgDays"); - List statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe); - } -} - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java deleted file mode 100644 index 626ad8a08..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelMMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.harmonic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_m】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelM -*/ -public interface RMpBenchmarkLevelMMapper extends BaseMapper { - - -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java deleted file mode 100644 index 81136dd6c..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelQMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.harmonic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_q】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelQ -*/ -public interface RMpBenchmarkLevelQMapper extends BaseMapper { - - -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java deleted file mode 100644 index dbf91c41a..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RMpBenchmarkLevelYMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.njcn.harmonic.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_y】的数据库操作Mapper -* @createDate 2022-10-11 10:32:18 -* @Entity com.njcn.device.pms.pojo.po.RMpBenchmarkLevelY -*/ -public interface RMpBenchmarkLevelYMapper extends BaseMapper { - - -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatPwPermeabilityMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatPwPermeabilityMMapper.java deleted file mode 100644 index a4904279d..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatPwPermeabilityMMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.njcn.harmonic.mapper; - -import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam; -import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; - -import java.util.List; -import java.util.Map; - -/** -* @author jianghf -* @description 针对表【r_stat_pw_permeability_m】的数据库操作Mapper -* @createDate 2022-11-07 10:35:21 -* @Entity com.njcn.harmonic.pojo.po.RStatPwPermeabilityM -*/ -public interface RStatPwPermeabilityMMapper extends BaseMapper { - - List getPwPermeabilityList(Map map); -} - - - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml deleted file mode 100644 index e9f73200b..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelMMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml deleted file mode 100644 index e07939dfb..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelQMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml deleted file mode 100644 index 9dcf0e43a..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RMpBenchmarkLevelYMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - measurement_point_id,data_date,voltage_avg, - voltage_sd,unbalance_avg,unbalance_sd, - vthd_avg,vthd_sd,flicker_avg, - flicker_sd - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPwPermeabilityMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPwPermeabilityMMapper.xml deleted file mode 100644 index a34545d59..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatPwPermeabilityMMapper.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - org_no,data_date,psr_id, - voltage_avg,voltage_sd,unbalance_avg, - unbalance_sd,vthd_avg,vthd_sd, - flicker_avg,flicker_sd,permeability_type - - - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java deleted file mode 100644 index 853d6bfc5..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelMService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.harmonic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; - -import java.util.List; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service -* @createDate 2022-10-11 10:32:18 -*/ -public interface RMpBenchmarkLevelMService extends IService { - - /*** - * 查询区域稳态电能质量水平(月) - * @author jianghaifei - * @date 2022-10-11 11:26 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); - - /*** - * 配网-全网基准水平 - * @author jianghaifei - * @date 2022-11-04 10:30 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java deleted file mode 100644 index ce3fce41d..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelQService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.harmonic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; - -import java.util.List; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_q】的数据库操作Service -* @createDate 2022-10-11 10:32:18 -*/ -public interface RMpBenchmarkLevelQService extends IService { - - /*** - * 主网-区域稳态电能质量水平评估 - * @author jianghaifei - * @date 2022-11-04 10:30 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); - - /*** - * 配网-全网基准水平 - * @author jianghaifei - * @date 2022-11-04 10:31 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java deleted file mode 100644 index 0e776bd1c..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RMpBenchmarkLevelYService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.harmonic.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; - -import java.util.List; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_y】的数据库操作Service -* @createDate 2022-10-11 10:32:18 -*/ -public interface RMpBenchmarkLevelYService extends IService { - - /*** - * 主网-区域稳态电能质量水平评估 - * @author jianghaifei - * @date 2022-11-04 10:30 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); - - /*** - * 配网-全网基准水平 - * @author jianghaifei - * @date 2022-11-04 10:30 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam); -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatPwPermeabilityMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatPwPermeabilityMService.java deleted file mode 100644 index 5c7e59168..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/RStatPwPermeabilityMService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.njcn.harmonic.service; - -import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam; -import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; - -import java.util.List; - -/** - * 各渗透率光伏台区基准水平 -* @author jianghf -* @description 针对表【r_stat_pw_permeability_m】的数据库操作Service -* @createDate 2022-11-07 10:35:21 -*/ -public interface RStatPwPermeabilityMService extends IService { - - /*** - * 获取各渗透率光伏台区基准水平 - * @author jianghaifei - * @date 2022-11-07 14:38 - * @param rStatPwPermeabilityMParam - * @return java.util.List - */ - List getPwPermeabilityList(RStatPwPermeabilityMParam rStatPwPermeabilityMParam); -} 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 aa3162ae1..d5e2bfef6 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.valueOf(contion).equals(60) && !Integer.valueOf(contion).equals(61) && !Integer.valueOf(contion).equals(62)) { + if (Integer.parseInt(contion) != 60 || Integer.parseInt(contion) != 61 || Integer.parseInt(contion) != 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/impl/RMpBenchmarkLevelMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java deleted file mode 100644 index b83790583..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelMServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.njcn.harmonic.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.common.pojo.dto.SimpleDTO; -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.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.harmonic.mapper.RMpBenchmarkLevelMMapper; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelM; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; -import com.njcn.harmonic.service.RMpBenchmarkLevelMService; -import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataTypeEnum; -import com.njcn.system.pojo.po.DictData; -import lombok.RequiredArgsConstructor; -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; -import java.util.stream.Collectors; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_m】的数据库操作Service实现 -* @createDate 2022-10-11 10:32:18 -*/ -@Service -@RequiredArgsConstructor -public class RMpBenchmarkLevelMServiceImpl extends ServiceImpl -implements RMpBenchmarkLevelMService { - - private final DicDataFeignClient dicDataFeignClient; - - private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; - - private final MonitorClient monitorClient; - - private final PwMonitorClient pwMonitorClient; - - @Override - public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //获取电压等级的字典 - List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); - //将电压信息转成map，key：id value：name - Map voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - //获取基准水平评价指标字典 - List benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData(); - //将基准水平评价指标信息转成map，key：id value：name - Map benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - - //查询所有子单位下的所有监测点 - PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id); - pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); - if (CollUtil.isNotEmpty(voltageLevelParamList)) { - //查询条件：电压等级（筛选电压等级为voltageLevel的监测点） - List simpleDTOList = voltageLevelParamList.stream().map(item -> { - SimpleDTO simpleDTO = new SimpleDTO(); - simpleDTO.setId(item); - return simpleDTO; - }).collect(Collectors.toList()); - pmsDeviceInfoParam.setVoltageLevel(simpleDTOList); - } - //获取到该部门的所有子部门的监测点idList - List pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); - //过滤出业务需要的监测点id集合 - List firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id - pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList())); - List lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合 - //如果没有监测点id信息，直接返回空集合 - if (CollUtil.isEmpty(lastMonitorIdList)) { - return new ArrayList<>(); - } - //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合 -// LambdaQueryWrapper monitorWrapper = new LambdaQueryWrapper<>(); -// monitorWrapper.in(Monitor::getId, lastMonitorIdList); - PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam(); - pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList); - Map monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor)); - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelM::getMeasurementPointId, lastMonitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelM::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelM::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId())) - .collect(Collectors.toList()).get(0); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id - rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称 - //基准水平评价指标 - rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id - rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()); - rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel())); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } - - @Override - public List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //根据条件查询单位下面的所有配网监测点 - PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(id); //单位id - pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级 - List pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - if (CollUtil.isEmpty(pwMonitorList)) { - return new ArrayList<>(); - } - //监测点id集合 - List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); - //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); - - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelM::getMeasurementPointId, monitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelM::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelM::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id - rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java deleted file mode 100644 index 4da58d6c3..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelQServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.njcn.harmonic.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.common.pojo.dto.SimpleDTO; -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.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.harmonic.mapper.RMpBenchmarkLevelQMapper; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelQ; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; -import com.njcn.harmonic.service.RMpBenchmarkLevelQService; -import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataTypeEnum; -import com.njcn.system.pojo.po.DictData; -import lombok.RequiredArgsConstructor; -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; -import java.util.stream.Collectors; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_q】的数据库操作Service实现 -* @createDate 2022-10-11 10:32:18 -*/ -@Service -@RequiredArgsConstructor -public class RMpBenchmarkLevelQServiceImpl extends ServiceImpl -implements RMpBenchmarkLevelQService { - - private final DicDataFeignClient dicDataFeignClient; - - private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; - - private final MonitorClient monitorClient; - - private final PwMonitorClient pwMonitorClient; - - @Override - public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //获取电压等级的字典 - List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); - //将电压信息转成map，key：id value：name - Map voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - //获取基准水平评价指标字典 - List benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData(); - //将基准水平评价指标信息转成map，key：id value：name - Map benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - - //查询所有子单位下的所有监测点 - PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id); - pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); - if (CollUtil.isNotEmpty(voltageLevelParamList)) { - //查询条件：电压等级（筛选电压等级为voltageLevel的监测点） - List simpleDTOList = voltageLevelParamList.stream().map(item -> { - SimpleDTO simpleDTO = new SimpleDTO(); - simpleDTO.setId(item); - return simpleDTO; - }).collect(Collectors.toList()); - pmsDeviceInfoParam.setVoltageLevel(simpleDTOList); - } - //获取到该部门的所有子部门的监测点idList - List pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); - //过滤出业务需要的监测点id集合 - List firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id - pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList())); - List lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合 - //如果没有监测点id信息，直接返回空集合 - if (CollUtil.isEmpty(lastMonitorIdList)) { - return new ArrayList<>(); - } - //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合 -// LambdaQueryWrapper monitorWrapper = new LambdaQueryWrapper<>(); -// monitorWrapper.in(Monitor::getId, lastMonitorIdList); - PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam(); - pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList); - Map monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor)); - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelQ::getMeasurementPointId, lastMonitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelQ::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelQ::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId())) - .collect(Collectors.toList()).get(0); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id - rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称 - //基准水平评价指标 - rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id - rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()); - rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel())); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } - - @Override - public List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //根据条件查询单位下面的所有配网监测点 - PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(id); //单位id - pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级 - List pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - if (CollUtil.isEmpty(pwMonitorList)) { - return new ArrayList<>(); - } - //监测点id集合 - List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); - //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); - - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelQ::getMeasurementPointId, monitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelQ::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelQ::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id - rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java deleted file mode 100644 index b9ad500ca..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RMpBenchmarkLevelYServiceImpl.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.njcn.harmonic.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.common.pojo.dto.SimpleDTO; -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.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; -import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.harmonic.mapper.RMpBenchmarkLevelYMapper; -import com.njcn.harmonic.pojo.param.RMpBenchmarkLevelParam; -import com.njcn.harmonic.pojo.po.RMpBenchmarkLevelY; -import com.njcn.harmonic.pojo.vo.PwRMpBenchmarkLevelVO; -import com.njcn.harmonic.pojo.vo.RMpBenchmarkLevelVO; -import com.njcn.harmonic.service.RMpBenchmarkLevelYService; -import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataTypeEnum; -import com.njcn.system.pojo.po.DictData; -import lombok.RequiredArgsConstructor; -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; -import java.util.stream.Collectors; - -/** -* @author jianghf -* @description 针对表【r_mp_benchmark_level_y】的数据库操作Service实现 -* @createDate 2022-10-11 10:32:18 -*/ -@Service -@RequiredArgsConstructor -public class RMpBenchmarkLevelYServiceImpl extends ServiceImpl -implements RMpBenchmarkLevelYService { - - private final DicDataFeignClient dicDataFeignClient; - - private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; - - private final MonitorClient monitorClient; - - private final PwMonitorClient pwMonitorClient; - - @Override - public List getRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - String benchmarkIndicator = rMpBenchmarkLevelParam.getBenchmarkIndicator(); //评价指标 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //获取电压等级的字典 - List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); - //将电压信息转成map，key：id value：name - Map voltageLevelMap = voltageLevelList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - //获取基准水平评价指标字典 - List benchmarkIndicatorList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.BENCHMARK_INDICATORS.getCode()).getData(); - //将基准水平评价指标信息转成map，key：id value：name - Map benchmarkIndicatorMap = benchmarkIndicatorList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); - - //查询所有子单位下的所有监测点 - PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam(id); - pmsDeviceInfoParam.setStatisticalType(new SimpleDTO()); - if (CollUtil.isNotEmpty(voltageLevelParamList)) { - //查询条件：电压等级（筛选电压等级为voltageLevel的监测点） - List simpleDTOList = voltageLevelParamList.stream().map(item -> { - SimpleDTO simpleDTO = new SimpleDTO(); - simpleDTO.setId(item); - return simpleDTO; - }).collect(Collectors.toList()); - pmsDeviceInfoParam.setVoltageLevel(simpleDTOList); - } - //获取到该部门的所有子部门的监测点idList - List pmsDeviceInfoWithInOrg = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData(); - //过滤出业务需要的监测点id集合 - List firstMonitorIdList = new ArrayList<>(); //只用于合并多个部门的监测点id - pmsDeviceInfoWithInOrg.forEach(item -> firstMonitorIdList.addAll(item.getMonitorIdList())); - List lastMonitorIdList = firstMonitorIdList.stream().distinct().collect(Collectors.toList()); //最终的监测点id集合 - //如果没有监测点id信息，直接返回空集合 - if (CollUtil.isEmpty(lastMonitorIdList)) { - return new ArrayList<>(); - } - //查询对应的监测点完整信息 并转为key：监测点id value：监测点实体的map集合 -// LambdaQueryWrapper monitorWrapper = new LambdaQueryWrapper<>(); -// monitorWrapper.in(Monitor::getId, lastMonitorIdList); - PmsMonitorInfoParam pmsMonitorInfoParam = new PmsMonitorInfoParam(); - pmsMonitorInfoParam.setMonitorIds(lastMonitorIdList); - Map monitorMap = monitorClient.getMonitorInfo(pmsMonitorInfoParam).getData().stream().collect(Collectors.toMap(PmsMonitorInfoDTO::getMonitorId, monitor -> monitor)); - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(lastMonitorIdList), RMpBenchmarkLevelY::getMeasurementPointId, lastMonitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelY::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelY::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - RMpBenchmarkLevelVO rMpBenchmarkLevelVO = new RMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - PmsGeneralDeviceDTO pmsGeneralDeviceDTO = pmsDeviceInfoWithInOrg.stream().filter(dto -> dto.getMonitorIdList().contains(item.getMeasurementPointId())) - .collect(Collectors.toList()).get(0); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(pmsGeneralDeviceDTO.getIndex()); //单位id - rMpBenchmarkLevelVO.setOrgName(pmsGeneralDeviceDTO.getName()); //单位名称 - //基准水平评价指标 - rMpBenchmarkLevelVO.setBenchmarkIndicator(benchmarkIndicator); //基准水平评价指标id - rMpBenchmarkLevelVO.setBenchmarkIndicatorName(benchmarkIndicatorMap.get(benchmarkIndicator)); //基准水平评价指标 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel()); - rMpBenchmarkLevelVO.setVoltageLevelName(voltageLevelMap.get(monitorMap.get(item.getMeasurementPointId()).getMonitorVoltageLevel())); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } - - /*** - * 配网-全网基准水平 - * @author jianghaifei - * @date 2022-11-04 10:32 - * @param rMpBenchmarkLevelParam - * @return java.util.List - */ - @Override - public List getPwRMpBenchmarkLevelList(RMpBenchmarkLevelParam rMpBenchmarkLevelParam) { - //提取查询条件 - String id = rMpBenchmarkLevelParam.getId(); //单位id - if (StringUtils.isBlank(id)) { - throw new BusinessException(CommonResponseEnum.NO_DATA, "单位id不可为空"); - } - String startTime = rMpBenchmarkLevelParam.getStartTime(); //开始时间 - String endTime = rMpBenchmarkLevelParam.getEndTime(); //截止时间 - List voltageLevelParamList = StringUtils.isNotBlank(rMpBenchmarkLevelParam.getVoltageLevel()) ? Arrays.asList(rMpBenchmarkLevelParam.getVoltageLevel().split(",")) : null; //电压等级 - - //根据条件查询单位下面的所有配网监测点 - PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(id); //单位id - pwPmsMonitorParam.setVoltageLevels(voltageLevelParamList); //电压等级 - List pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - if (CollUtil.isEmpty(pwMonitorList)) { - return new ArrayList<>(); - } - //监测点id集合 - List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); - //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); - - //查询【基准水平-月】数据 - /*组装条件：where measurement_point_id in (monitorIdList) and data_date >= startTime - and data_date <= endTime and voltage_level - */ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(CollUtil.isNotEmpty(monitorIdList), RMpBenchmarkLevelY::getMeasurementPointId, monitorIdList) - .ge(StringUtils.isNotBlank(startTime), RMpBenchmarkLevelY::getDataDate, startTime) - .le(StringUtils.isNotBlank(endTime), RMpBenchmarkLevelY::getDataDate, endTime); - List list = this.list(lambdaQueryWrapper); - List resultList = list.stream().map(item -> { - //封装前端需要的对象 - PwRMpBenchmarkLevelVO rMpBenchmarkLevelVO = new PwRMpBenchmarkLevelVO(); - BeanUtils.copyProperties(item, rMpBenchmarkLevelVO); - //单位信息 - rMpBenchmarkLevelVO.setOrgNo(monitorMap.get(item.getMeasurementPointId()).getOrgId()); //单位id - rMpBenchmarkLevelVO.setOrgName(monitorMap.get(item.getMeasurementPointId()).getOrgName()); //单位名称 - //监测点信息 - rMpBenchmarkLevelVO.setMeasurementPointName(monitorMap.get(item.getMeasurementPointId()).getMonitorName()); //监测点名称 - //电压等级 - rMpBenchmarkLevelVO.setVoltageLevel(monitorMap.get(item.getMeasurementPointId()).getVoltageLevel()); - return rMpBenchmarkLevelVO; - }).collect(Collectors.toList()); - return resultList; - } -} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatPwPermeabilityMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatPwPermeabilityMServiceImpl.java deleted file mode 100644 index 6c7977aab..000000000 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/RStatPwPermeabilityMServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.njcn.harmonic.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.device.pms.api.PwMonitorClient; -import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO; -import com.njcn.device.pms.pojo.param.PwPmsMonitorParam; -import com.njcn.harmonic.mapper.RStatPwPermeabilityMMapper; -import com.njcn.harmonic.pojo.param.RStatPwPermeabilityMParam; -import com.njcn.harmonic.pojo.po.RStatPwPermeabilityM; -import com.njcn.harmonic.pojo.vo.RStatPwPermeabilityMVO; -import com.njcn.harmonic.service.RStatPwPermeabilityMService; -import com.njcn.system.api.DicDataFeignClient; -import com.njcn.system.enums.DicDataTypeEnum; -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; - -/** - * 各渗透率光伏台区基准水平 -* @author jianghf -* @description 针对表【r_stat_pw_permeability_m】的数据库操作Service实现 -* @createDate 2022-11-07 10:35:21 -*/ -@Service -@RequiredArgsConstructor -public class RStatPwPermeabilityMServiceImpl extends ServiceImpl - implements RStatPwPermeabilityMService{ - - private final PwMonitorClient pwMonitorClient; - - private final DicDataFeignClient dicDataFeignClient; - - - /*** - * 获取各渗透率光伏台区基准水平 - * @author jianghaifei - * @date 2022-11-07 14:38 - * @param rStatPwPermeabilityMParam - * @return java.util.List - */ - @Override - public List getPwPermeabilityList(RStatPwPermeabilityMParam rStatPwPermeabilityMParam) { - //提起参数 - String id = rStatPwPermeabilityMParam.getId(); //单位id - String psrName = rStatPwPermeabilityMParam.getPsrName(); //台区名称 - String startTime = rStatPwPermeabilityMParam.getStartTime(); //开始时间 - String endTime = rStatPwPermeabilityMParam.getEndTime(); //结束时间 - - //根据条件查询单位下面的所有配网监测点 - PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam(); - pwPmsMonitorParam.setOrgId(id); //单位id - pwPmsMonitorParam.setMonitorName(psrName); //台区名称（监测点名称） - List pwMonitorList = pwMonitorClient.getPwMonitorList(pwPmsMonitorParam).getData(); - if (CollUtil.isEmpty(pwMonitorList)) { - return new ArrayList<>(); - } - //监测点id集合 - List monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); - //监测点map key:监测点id value:监测点实体 - Map monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); - - //获取各渗透率字典 - List rateList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.PERMEABILITY_TYPE.getCode()).getData(); - Map condMap = rateList.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId)); - condMap.put("startTime", startTime); - condMap.put("endTime", endTime); - condMap.put("idList", monitorIdList); - List list = this.baseMapper.getPwPermeabilityList(condMap); - list = list.stream().peek(item -> { - item.setOrgName(monitorMap.get(item.getPsrId()).getOrgName()); //单位名称 - item.setPsrName(monitorMap.get(item.getPsrId()).getMonitorName()); //台区名称 - }).collect(Collectors.toList()); - return list; - } -} - - - - diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPartHarmonicDetailMService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPartHarmonicDetailMService.java index 051caa755..cf0ad90af 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPartHarmonicDetailMService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPartHarmonicDetailMService.java @@ -1,8 +1,6 @@ package com.njcn.harmonic.service.majornetwork; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.pojo.param.RStatOrgParam; -import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RMpPartHarmonicDetailM; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.vo.RMpPartHarmonicDetailVO; diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPassRateService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPassRateService.java index afb3e77c4..74e6e4202 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPassRateService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RMpPassRateService.java @@ -1,8 +1,6 @@ package com.njcn.harmonic.service.majornetwork; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.harmonic.pojo.param.RStatOrgParam; -import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RMpPassRateQ; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.harmonic.pojo.vo.RStatOrgIndexVO; 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 a6bf7a543..1f6c058d4 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 @@ -26,6 +26,10 @@ import com.njcn.system.api.DicDataFeignClient; 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 lombok.SneakyThrows; import org.springframework.stereotype.Service; @@ -53,6 +57,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl getRStatHarmonicMAll(StatisticsBizBaseParam param) { @@ -71,8 +76,14 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); @@ -183,7 +194,13 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); + + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), 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()) @@ -253,7 +270,12 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), 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()) @@ -315,8 +337,14 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); + + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); @@ -408,7 +436,12 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), 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()) 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 350b19a25..c892367b6 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 @@ -51,8 +51,8 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //对象主节点 获取所有得指标类型 List lineTypeData = dicDataFeignClient.getDicDataByTypeCode @@ -75,6 +75,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl aa = new ArrayList<>(linkedHashMap.values()); - aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName())); + aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort())); arrayVO.setColumns(aa); arrayVOList.add(arrayVO); } @@ -129,7 +131,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl aa = new ArrayList<>(linkedHashMap.values()); - arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); return aa; } @@ -137,9 +139,9 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getRStatHarmonicOrgMIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -181,6 +183,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -210,8 +213,8 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); @@ -240,6 +243,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId())) .collect(Collectors.toList()); this.assignDict(notDeptDTOS, eventVO, arrayVO); - eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getHarmonicName())); + eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } }); @@ -267,7 +271,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl statHarmonic.getHarmonicName())); + statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); @@ -278,9 +282,9 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl getPwRStatHarmonicOrgMIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -322,6 +326,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -351,6 +356,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //对象主节点 获取所有得指标类型 List lineTypeData = dicDataFeignClient.getDicDataByTypeCode @@ -74,6 +74,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl aa = new ArrayList<>(linkedHashMap.values()); - aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName())); + aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort())); arrayVO.setColumns(aa); arrayVOList.add(arrayVO); } @@ -125,7 +127,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl aa = new ArrayList<>(linkedHashMap.values()); - arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); return aa; } @@ -133,9 +135,9 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl getRStatHarmonicOrgQIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -177,6 +179,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -203,8 +206,8 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); @@ -233,6 +236,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId())) .collect(Collectors.toList()); this.assignDict(notDeptDTOS, eventVO, arrayVO); - eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getHarmonicName())); + eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } }); @@ -256,7 +260,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl statHarmonic.getHarmonicName())); + statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); @@ -267,9 +271,9 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl getPwRStatHarmonicOrgQIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -311,6 +315,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -337,6 +342,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //对象主节点 获取所有得指标类型 List lineTypeData = dicDataFeignClient.getDicDataByTypeCode @@ -74,6 +74,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl aa=new ArrayList<>(linkedHashMap.values()); - aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getHarmonicName())); + aa.sort(Comparator.comparing(rStatHarmonicMVO -> rStatHarmonicMVO.getSort())); arrayVO.setColumns(aa); arrayVOList.add(arrayVO); } @@ -125,7 +127,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl aa=new ArrayList<>(linkedHashMap.values()); - arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); return aa; } @@ -133,9 +135,9 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl getRStatHarmonicOrgYIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -178,6 +180,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -204,8 +207,8 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取配网信息 DictData distributionData = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); @@ -234,6 +237,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl notDeptDTOS = deptDTOList.stream().filter(r -> !listMap.containsKey(r.getId())) .collect(Collectors.toList()); this.assignDict(notDeptDTOS, eventVO, arrayVO); - eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getHarmonicName())); + eventVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } }); @@ -256,7 +260,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl statHarmonic.getHarmonicName())); + statharmonicVO.sort(Comparator.comparing(statHarmonic -> statHarmonic.getSort())); arrayVOList.add(arrayVO); } arrayVOList.sort(Comparator.comparing(rArrayVO -> rArrayVO.getSort())); @@ -267,9 +271,9 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl getPwRStatHarmonicOrgYIcon(RStatHarmonicMParam param) { //各单位类型 List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //指标对象类型属性 DictData harmonicData; //判断是是否传入检测点信息值（电压） @@ -312,6 +316,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl rIconVO.getRowName())); + arrayVOList.sort(Comparator.comparing(rIconVO -> rIconVO.getSort())); return arrayVOList; } @@ -338,6 +343,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl getRStatHarmonicQAll(StatisticsBizBaseParam param) { @@ -53,8 +58,13 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); @@ -142,8 +152,13 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); 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 cc0e368d7..0dce136f1 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 @@ -15,6 +15,10 @@ import com.njcn.system.api.DicDataFeignClient; 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.springframework.stereotype.Service; @@ -36,6 +40,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl getRStatHarmonicYAll(StatisticsBizBaseParam param) { @@ -52,8 +57,13 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); @@ -142,8 +152,14 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl arrayVOList = new ArrayList<>(); + + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + //数据库查询 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())); 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 4e7a2fce0..3a6ff98eb 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 @@ -50,7 +50,7 @@ public class RStatLoadTypeServiceImpl extends ServiceImpl getRStatLoadType(StatisticsBizBaseParam param) { //获取部门信息 List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); //获取字典信息 List data1 = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.MONITORING_LABELS.getCode()).getData(); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java index 46c4cd8d7..27a242a79 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java @@ -48,10 +48,10 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) { //获取部门信息 List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取部门id集合 - List deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); List info = new ArrayList<>(); List temp = new ArrayList<>(); if (CollectionUtil.isNotEmpty(data)) { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java index 00fa24de3..7499115e3 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java @@ -44,8 +44,8 @@ public class RStatOrgMServiceImpl extends ServiceImpl getRStatHarmonicMAll(StatisticsBizBaseParam param) { List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取主网id信息 DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); //数据库查询 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java index 827dedc4b..6e05a3828 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java @@ -44,8 +44,8 @@ public class RStatOrgQServiceImpl extends ServiceImpl getRStatHarmonicQAll(StatisticsBizBaseParam param) { List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取主网id信息 DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); 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 bada302c7..14b05ca38 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 @@ -69,8 +69,8 @@ public class RStatOrgYServiceImpl extends ServiceImpl getRStatHarmonicYAll(StatisticsBizBaseParam param) { List deptDTOList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); //获取部门id集合 - List deptIds = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList()); - Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, Function.identity())); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); + Map deptMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity())); //获取主网id信息 DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); @@ -120,7 +120,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl temp = new ArrayList<>(); // 过滤出部门id - List deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); //获取主网id信息 @@ -280,6 +280,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl getRStatSubstation(StatSubstationBizBaseParam param) { + //远程调用监测点信息接口 PmsDeviceInfoParam pms = new PmsDeviceInfoParam(); pms.setDeptIndex(param.getId()); pms.setStatisticalType(new SimpleDTO()); @@ -349,7 +350,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl deptIds = data.stream().map(DeptDTO::getId).collect(Collectors.toList()); + List deptIds = data.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); baseParam.setIds(deptIds); // 类型（1年 2季度 3月份 4日 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationMServiceImpl.java index d6de4f75a..04c8b5bf4 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationMServiceImpl.java @@ -20,6 +20,7 @@ import com.njcn.harmonic.pojo.vo.RSubstationIcon2VO; import com.njcn.harmonic.pojo.vo.RSubstationIconVO; import com.njcn.harmonic.service.majornetwork.RStatSubstationMService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -50,7 +51,7 @@ public class RStatSubstationMServiceImpl extends ServiceImpl rSubstationIconVO = new ArrayList<>(); StatSubstationBizBaseParam baseParam = BeanUtil.copyProperties(param, StatSubstationBizBaseParam.class); //根据id进行筛选 -// baseParam.setIds(this.powerrIdList(param.getId())); + baseParam.setIds(this.powerrIdList(RequestUtil.getDeptIndex())); 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 fea309d27..d2e0d93be 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 @@ -1,11 +1,7 @@ package com.njcn.harmonic.service.majornetwork.impl; import cn.hutool.core.bean.BeanUtil; -import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.param.StatisticsBizBaseParam; -import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; -import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; import com.njcn.harmonic.pojo.po.RStatSubstationVoltageM; import com.njcn.harmonic.mapper.majornetwork.RStatSubstationVoltageMMapper; @@ -13,11 +9,14 @@ 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.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; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -31,26 +30,16 @@ import java.util.List; @RequiredArgsConstructor public class RStatSubstationVoltageMServiceImpl extends ServiceImpl implements RStatSubstationVoltageMService { - private final DeptFeignClient deptFeignClient; private final RStatSubstationVoltageMMapper rStatSubstationVoltageMMapper; - private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient; + private final DeptFeignClient deptFeignClient; @Override public List getStatSubstationIcon(StatisticsBizBaseParam param) { - //获取部门id集合 + //获取当前部门下所有部门信息 + List deptDTOList = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); + List deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList()); StatSubstationBizBaseParam baseParam= BeanUtil.copyProperties(param,StatSubstationBizBaseParam.class); -// baseParam.setIds(this.powerrIdList(param.getId())); + baseParam.setIds(deptIds); return rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam); } - //根据部门获取监测点id信息 - private List powerrIdList(String id){ - //获取部门下面监测点信息 - PmsDeviceInfoParam pms=new PmsDeviceInfoParam(); - pms.setDeptIndex(id); - pms.setStatisticalType(new SimpleDTO()); - List data = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pms).getData(); - List addids=new ArrayList<>(); - data.stream().forEach(e-> addids.addAll(e.getPowerrIdList())); - return addids; - } }