Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

合并代码

Browse Source
This commit is contained in:
hongawen
2022-11-21 17:57:23 +08:00
parent 10722d3991
commit a4c225d067
198 changed files with 1215 additions and 2387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PwMonitorClient.java
View File

@@ -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;

15
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/StatationStatClient.java
View File

@@ -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<List<PmsStatationStatInfoDTO>> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam pmsStatationStatInfoParam);
/**
* 获取变电站信息
*
* @param param 条件参数
* @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.po.PmsStatationStat>>
* @author yzh
* @date 2022/11/21
*/
@PostMapping("/getPowerInfo")
HttpResult<List<StatationStat>> getPowerInfo(@RequestBody PmsStatationStatInfoParam param);
}

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/TractionStationClient.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
View File

@@ -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;

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsGeneratrixClientFallbackFactory.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PwMonitorClientFallbackFactory.java
View File

@@ -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;

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/StatationStatClientFallbackFactory.java
View File

@@ -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<Stata
log.error("{}异常，降级处理，异常为：{}", "获取指定的变电站信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<StatationStat>> getPowerInfo(PmsStatationStatInfoParam param) {
log.error("{}异常，降级处理，异常为：{}", "获取变电站信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/TractionStationClientFallbackFactory.java
View File

@@ -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;

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/enums/PmsDeviceResponseEnum.java
View File

@@ -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","同一电站下存在相同名称母线"),

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/GeneratrixAndPowerStationDTO.java
View File

@@ -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;

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsGeneratrixDTO.java
View File

@@ -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;
/**
* 母线信息

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsStatationStatInfoDTO.java
View File

@@ -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;
/**

13
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixParam.java
View File

@@ -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;
}
}

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/GeneratrixWireParam.java
View File

@@ -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;

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java
View File

@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
/**
* pms-device

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsDeviceInfoParam.java
View File

@@ -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;

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsGeneratrixParam.java
View File

@@ -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;

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsMonitorParam.java
View File

@@ -37,4 +37,7 @@ public class PmsMonitorParam {
@ApiModelProperty(name = "powerrIds",value = "变电站id")
private List<String> powerrIds;
@ApiModelProperty(name = "powerrName",value = "变电站名称")
private String powerrName;
}

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsStatationStatInfoParam.java
View File

@@ -18,11 +18,16 @@ import java.util.List;
@NoArgsConstructor
public class PmsStatationStatInfoParam {
/**
* 单位code集合
*/
@ApiModelProperty(name = "orgIds",value = "单位code集合")
private List<String> orgIds;
/**
* 变电站id集合
*/
@ApiModelProperty(name = "powerIds",value = "变电站id集合")
@NotNull(message = "变电站id集合不可为空")
private List<String> powerIds;
/**

23
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTerminalParam.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PmsTractionStationParam.java
View File

@@ -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;

95
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerDistributionareaParam.java
View File

@@ -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;
}
}

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PwPmsMonitorParam.java
View File

@@ -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;
/**

5
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatPwAlarmDetailParam.java
View File

@@ -26,4 +26,9 @@ public class RStatPwAlarmDetailParam extends StatisticsBizBaseParam {
//监测点名称
@ApiModelProperty(name = "monitorName", value = "监测点名称")
private String monitorName;
@ApiModelProperty("页码")
private Integer pageNum;
@ApiModelProperty("页面尺寸")
private Integer pageSize;
}

12
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/RStatZwAlarmCountWParam.java
View File

@@ -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 {
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/UniversalFrontEndParam.java
View File

@@ -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;

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/DistributionMonitor.java
View File

@@ -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;
/**
* <p>

5
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java
View File

@@ -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;

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/GeneratrixWire.java
View File

@@ -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;
}

11
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagement.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen
@@ -73,7 +76,7 @@ public class HarmonicGeneralManagement extends BaseEntity {
private String plannedState;
/**
* 数据状态：0-删除；1-正常；
* 数据状态：0-删除；1-正常；
*/
private Boolean status;

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/HarmonicGeneralManagementData.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java
View File

@@ -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;

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PmsTerminal.java
View File

@@ -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;
/**
* <p>

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerClient.java
View File

@@ -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;
/**
* <p>

26
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerDistributionarea.java
View File

@@ -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;
/**
* <p>
@@ -137,25 +140,6 @@ public class PowerDistributionarea extends BaseEntity {
*/
private Integer status;
/**
* 创建用户
*/
private String createBy;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerGenerationUser.java
View File

@@ -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;
/**
* <p>

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/PowerQualityMatter.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexM.java
View File

@@ -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;
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingPO.java
View File

@@ -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)实体类

5
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java
View File

@@ -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;
}
}

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpMonitorAlarmCountM.java
View File

@@ -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;
}
}

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpPwAlarmDetailD.java
View File

@@ -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;
}
}

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RMpTargetWarnD.java
View File

@@ -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;
}
}

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexM.java
View File

@@ -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;
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexPO.java
View File

@@ -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;
/**
* 主网运行指标统计实体类

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/ROperatingIndexY.java
View File

@@ -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;
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAccountCheckDataPO.java
View File

@@ -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)实体类

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
View File

@@ -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;
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatBusbarHarmonicYPO.java
View File

@@ -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)实体类

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatMeasurementAccountDetailPO.java
View File

@@ -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)实体类

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatOrgPO.java
View File

@@ -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)实体类

5
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatPwAlarmCountW.java
View File

@@ -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;
}
}

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatSubstationPO.java
View File

@@ -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)实体类

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTargetDetailPO.java
View File

@@ -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)实体类

14
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatTractionStationAccountDetailPO.java
View File

@@ -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";
/**
* 时间
*/

5
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatZwAlarmCountW.java
View File

@@ -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;
}
}

13
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/SourceManagement.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen
@@ -110,7 +113,7 @@ public class SourceManagement extends BaseEntity {
private LocalDate filingDate;
/**
* 数据状态：0-删除；1-正常；
* 数据状态：0-删除；1-正常；
*/
private Boolean status;

7
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatationStat.java
View File

@@ -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;
/**
* <p>
@@ -23,6 +29,7 @@ public class StatationStat extends BaseEntity {
/**
* 电站编号
*/
@TableId
private String powerId;
/**

11
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/StatisticsRunMonitor.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen
@@ -88,7 +91,7 @@ public class StatisticsRunMonitor extends BaseEntity {
private LocalDateTime dataDate;
/**
* 数据状态：0-删除；1-正常；
* 数据状态：0-删除；1-正常；
*/
private Boolean status;

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TerminalEliminateData.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen

11
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen
@@ -113,7 +116,7 @@ public class TractionStation extends BaseEntity {
private Integer isUpToGrid;
/**
* 数据状态：0-删除；1-正常；
* 数据状态：0-删除；1-正常；
*/
private Integer status;

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TransientStasticData.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TreatTransientDetailData.java
View File

@@ -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;
/**
* <p>
*
*
* </p>
*
* @author hongawen

8
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsMonitorVO.java
View File

@@ -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

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatBusbarHarmonicYVO.java
View File

@@ -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;

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatEventOrgVO.java
View File

@@ -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;
/**

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatOrgVO.java
View File

@@ -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;
}
}

1
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatSubstationVO.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 变电站指标统计表实体类

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatZwAlarmCountWVO.java
View File

@@ -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 {
}
}

44
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/StatationStatVO.java
View File

@@ -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;
}

5
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RStatPwAlarmCountWController.java
View File

@@ -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<List<RStatPwAlarmDetailVO>> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
public HttpResult<Page<RStatPwAlarmDetailVO>> getAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
String methodDescribe = getMethodDescribe("getAlarmDetailList");
List<RStatPwAlarmDetailVO> list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam);
Page<RStatPwAlarmDetailVO> list = rStatPwAlarmCountWService.getAlarmDetailList(rStatPwAlarmDetailParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/DistributionMonitorController.java
View File

@@ -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<List<DoubleUserVO>> getDoubleUserByDept(@RequestParam("orgId")String orgId) {
String methodDescribe = getMethodDescribe("getDoubleUserByDept");

105
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/GeneratrixWireController.java
View File

@@ -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<Boolean> 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<Boolean> 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<Boolean> delGeneratrixWire(@RequestBody @NotEmpty(message = "线路id不可为空") List<String> 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<GeneratrixWire> 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<List<GeneratrixWire>> getGeneratrixWireList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getGeneratrixWireList");
List<GeneratrixWire> result = iGeneratrixWireService.getGeneratrixWireList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.java
View File

@@ -39,7 +39,7 @@ import java.util.List;
@RestController
@RequestMapping("/pms/monitor")
@Slf4j
@Api(tags = "主网监测点信息")
@Api(tags = "台账-主网监测点信息")
@RequiredArgsConstructor
public class MonitorController extends BaseController {

23
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsGeneratrixController.java
View File

@@ -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<Boolean> updateGeneratrix(@RequestBody GeneratrixParam.UpdateGeneratrixParam generatrixParam) {
public HttpResult<Boolean> 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<List<Generatrix>> getGeneratrixList(@RequestBody BaseParam baseParam) {
@ApiOperation("获取所有母线下拉框使用")
public HttpResult<List<Generatrix>> getGeneratrixList() {
String methodDescribe = getMethodDescribe("getGeneratrixList");
List<Generatrix> result = pmsGeneratrixService.getGeneratrixList(baseParam);
List<Generatrix> 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<Page<Generatrix>> getGeneratrixPageList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getGeneratrixPageList");
Page<Generatrix> result = pmsGeneratrixService.getGeneratrixPageList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

10
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerDistributionareaController.java
View File

@@ -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<Page<PowerDistributionareaVO>> getList(@RequestBody @Validated PowerDistributionareaParam.QueryParam queryParam){
@ApiImplicitParam(name = "baseParam",value = "查询台区信息",required = true)
public HttpResult<Page<PowerDistributionarea>> getList(@RequestBody @Validated BaseParam baseParam){
String methodDescribe = getMethodDescribe("getList");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
Page<PowerDistributionareaVO> res = iPowerDistributionareaService.getList(queryParam);
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam);
Page<PowerDistributionarea> res = iPowerDistributionareaService.getList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getPowerDistributionAreaById")
@ApiOperation("根据ID查询台区数据")

20
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PowerGenerationUserController.java
View File

@@ -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<Boolean> 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<Boolean> 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<Boolean> delPowerGenerationUser(@RequestBody @NotEmpty(message = "母线id不可为空") List<String> powerGenerationUserIds) {
@ApiOperation("删除发电用户")
@ApiImplicitParam(name = "powerGenerationUserIds", value = "发电用户ids", required = true)
public HttpResult<Boolean> delPowerGenerationUser(@RequestBody @NotEmpty(message = "发电用户id不可为空") List<String> 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<PowerGenerationUser> 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<List<PowerGenerationUser>> getPowerGenerationUserList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getPowerGenerationUserList");

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/RMpMonitorAlarmCountMController.java
View File

@@ -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;

70
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/StatationStatController.java
View File

@@ -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;
/**
* <p>
* 电站监测点设置信息
* 电站监测点设置信息
* </p>
*
* @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<List<PmsStatationStatInfoDTO>> getStatationStatInfo(@RequestBody @Validated PmsStatationStatInfoParam pmsStatationStatInfoParam) {
@ApiImplicitParams({
@ApiImplicitParam(name = "param", value = "获取指定的变电站信息条件", required = true)
})
public HttpResult<List<PmsStatationStatInfoDTO>> getStatationStatInfo(@RequestBody PmsStatationStatInfoParam param) {
String methodDescribe = getMethodDescribe("getStatationStatInfo");
List<PmsStatationStatInfoDTO> monitorInfo = statationStatService.getStatationStatInfo(pmsStatationStatInfoParam);
List<PmsStatationStatInfoDTO> 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<Boolean> 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<Boolean> 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<Boolean> delstatationStat(@RequestBody @NotEmpty(message = "电站id不可为空") List<String> 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<StatationStat> 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<List<StatationStat>> getstatationStatList(@RequestBody BaseParam baseParam) {
public HttpResult<List<StatationStat>> getstatationStatList() {
String methodDescribe = getMethodDescribe("getstatationStatList");
List<StatationStat> result = statationStatService.getStatationStatList(baseParam);
List<StatationStat> 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<Page<StatationStatVO>> getStatationStatPageList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getStatationStatPageList");
Page<StatationStatVO> result = statationStatService.getStatationStatPageList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 获取变电站信息
*
* @param param 条件参数
* @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.po.PmsStatationStat>>
* @author yzh
* @date 2022/11/21
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getPowerInfo")
@ApiOperation("获取变电站信息")
@ApiImplicitParams({
@ApiImplicitParam(name = "param", value = "条件参数", required = true)
})
public HttpResult<List<StatationStat>> getPowerInfo(@RequestBody PmsStatationStatInfoParam param) {
String methodDescribe = getMethodDescribe("getStatationStatInfo");
List<StatationStat> powerInfo = statationStatService.getPowerInfo(param);
if (CollectionUtil.isEmpty(powerInfo)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe);
}
}
}

132
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TerminalController.java
View File

@@ -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;
/**
* <p>
* 监测终端台账增删改查
* </p>
*
* @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<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated BaseParam baseParam){
String methodDescribe = getMethodDescribe("getTerminalList");
LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, baseParam);
Page<PmsTerminal> 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<PmsTerminal> 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<Object> 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<Object> 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<Object> delete(@RequestBody List<String> 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);
}
}
}

14
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/StatationStatMapper.java
View File

@@ -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<StatationStat> {
* @return 指定的变电站信息
*/
List<PmsStatationStatInfoDTO> getStatationStatInfo(@Param("pmsStatationStatInfoParam") PmsStatationStatInfoParam pmsStatationStatInfoParam);
/**
* 分页查询电站信息
* @author cdf
* @date 2022/11/18
*/
Page<StatationStatVO> getStatationStatPageList(Page<StatationStatVO> page,@Param("baseParam") BaseParam baseParam);
}

37
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/StatationStatMapper.xml
View File

@@ -20,13 +20,22 @@
WHERE
pm.Status = 1
AND pss.Status = 1
AND pm.Powerr_Id IN
<foreach collection="pmsStatationStatInfoParam.powerIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="pmsStatationStatInfoParam.powerIds != null and pmsStatationStatInfoParam.powerIds.size() > 0">
AND pm.Powerr_Id IN
<foreach collection="pmsStatationStatInfoParam.powerIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="pmsStatationStatInfoParam.orgIds != null and pmsStatationStatInfoParam.orgIds.size() > 0">
AND pm.Org_Id IN
<foreach collection="pmsStatationStatInfoParam.orgIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="pmsStatationStatInfoParam.powerVoltageLevel !=null and pmsStatationStatInfoParam.powerVoltageLevel.size() != 0">
AND pss.Voltage_Level IN
<foreach collection="pmsStatationStatInfoParam.powerVoltageLevel" item="item" open="(" close=")" separator=",">
<foreach collection="pmsStatationStatInfoParam.powerVoltageLevel" item="item" open="(" close=")"
separator=",">
#{item}
</foreach>
</if>
@@ -35,4 +44,22 @@
</if>
</select>
<select id="getStatationStatPageList" resultType="com.njcn.device.pms.pojo.vo.StatationStatVO">
select a.*, b.name orgName
from pms_statation_stat a
inner join sys_dept b on a.org_id = b.code
where a.status = 1
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
and a.Power_Id like concat('%',#{baseParam.searchValue},'%')
</if>
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
or a.Power_Name like concat('%',#{baseParam.searchValue},'%')
</if>
<if test="baseParam.searchValue!=null and baseParam.searchValue!=''">
or b.name like concat('%',#{baseParam.searchValue},'%')
</if>
order by a.Create_Time desc
</select>
</mapper>

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RStatPwAlarmCountWService.java
View File

@@ -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<RStatPwAlarmCountW>
List<RStatPwAlarmCountWVO> getAllRStatPwAlarmCountList(RStatPwAlarmCountWParam rStatPwAlarmCountWParam);
List<RStatPwAlarmDetailVO> getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam);
Page<RStatPwAlarmDetailVO> getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam);
}

8
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/IPwMonitorServiceImpl.java
View File

@@ -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<String> deptIdList = descendantDeptDTO.stream()
.map(DeptDTO::getId)
.map(DeptDTO::getCode)
.distinct()
.collect(Collectors.toList());
deptIdList.add(deptDTO.getId());
deptIdList.add(deptDTO.getCode());
List<PwPmsMonitorDTO> pwMonitorDataList = pwMonitorMapper.getPwMonitorDataList(deptIdList, pwPmsMonitorParam);
pwPmsMonitorDTOS.addAll(pwMonitorDataList);
}

36
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RStatPwAlarmCountWServiceImpl.java
View File

@@ -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<RStatPwAlarmCount
* @return java.util.List<com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO>
*/
@Override
public List<RStatPwAlarmDetailVO> getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
public Page<RStatPwAlarmDetailVO> getAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
//提取查询条件
String id = rStatPwAlarmDetailParam.getId(); //单位id
if (StringUtils.isBlank(id)) {
@@ -113,6 +116,8 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl<RStatPwAlarmCount
String startTime = rStatPwAlarmDetailParam.getStartTime(); //开始时间
String endTime = rStatPwAlarmDetailParam.getEndTime(); //结束时间
String monitorName = rStatPwAlarmDetailParam.getMonitorName(); //监测点名称
Integer pageNum = rStatPwAlarmDetailParam.getPageNum() != null && rStatPwAlarmDetailParam.getPageNum() != 0 ? rStatPwAlarmDetailParam.getPageNum() : 1; //页码
Integer pageSize = rStatPwAlarmDetailParam.getPageSize() != null && rStatPwAlarmDetailParam.getPageSize() != 0 ? rStatPwAlarmDetailParam.getPageSize() : 10; //页面尺寸
//告警类型
List<String> alarmTypeList = StringUtils.isNotBlank(rStatPwAlarmDetailParam.getAlarmType()) ? Arrays.asList(rStatPwAlarmDetailParam.getAlarmType().split(",")) : null;
//监测点类型
@@ -122,23 +127,6 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl<RStatPwAlarmCount
List<DictData> lineSortDict = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.LINE_SORT.getCode()).getData();
Map<String, String> lineSortIdMap = lineSortDict.stream().collect(Collectors.toMap(DictData::getCode, DictData::getId));
//获取所有子部门信息
List<DeptDTO> deptDTOList = deptFeignClient.getDeptDescendantIndexes(id, WebUtil.filterDeptType()).getData();
if (CollUtil.isEmpty(deptDTOList)) {
throw new BusinessException(CommonResponseEnum.NO_DATA, "部门不存在");
}
//单位id集合
List<String> orgNoList = deptDTOList.stream().map(DeptDTO::getId).collect(Collectors.toList());
//将单位信息转为map集合 key: 单位id value: 单位实体
Map<String, DeptDTO> deptDTOMap = deptDTOList.stream().collect(Collectors.toMap(DeptDTO::getId, deptDTO -> deptDTO));
//monitor表自身信息(后面I类监测点设置信息要用到)
PmsMonitorParam pmsMonitorParam = new PmsMonitorParam();
pmsMonitorParam.setOrgIds(orgNoList);
pmsMonitorParam.setMonitorName(monitorName);
List<PmsMonitorDTO> mainMonitorList = iMonitorService.getMonitorInfoListByCond(pmsMonitorParam);
Map<String, PmsMonitorDTO> 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<RStatPwAlarmCount
//配网监测点id集合
List<String> monitorIdList = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
if (CollUtil.isEmpty(monitorIdList)) {
return new ArrayList<>();
return new Page<>();
}
//监测点map key:监测点id value:监测点实体
Map<String, PwPmsMonitorDTO> monitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor));
@@ -160,9 +148,9 @@ public class RStatPwAlarmCountWServiceImpl extends ServiceImpl<RStatPwAlarmCount
.in(CollUtil.isNotEmpty(alarmTypeList), RMpPwAlarmDetailD::getAlarmType, alarmTypeList)
.ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime)
.le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime);
List<RMpPwAlarmDetailD> alarmDetailList = rMpPwAlarmDetailDService.list(alarmDetailWrapper);
Page<RMpPwAlarmDetailD> alarmDetailListPage = rMpPwAlarmDetailDService.page(new Page<>(pageNum, pageSize), alarmDetailWrapper);
List<RStatPwAlarmDetailVO> resultList = alarmDetailList.stream().map(item -> {
List<RStatPwAlarmDetailVO> 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<RStatPwAlarmCount
return rStatPwAlarmDetailVO;
}).collect(Collectors.toList());
return resultList;
Page<RStatPwAlarmDetailVO> resultPage = new Page<>();
BeanUtils.copyProperties(alarmDetailListPage, resultPage);
resultPage.setRecords(resultList);
return resultPage;
}
}

14
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IGeneratrixWireService.java
View File

@@ -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<GeneratrixWire> {
* @param baseParam 基础参数
* @return boolean
*/
List<GeneratrixWire> getGeneratrixWireList(BaseParam baseParam);
List<GeneratrixWire> getGeneratrixWireList();
/**
* 分页查询线路列表
* @author cdf
* @date 2022/10/25
* @param baseParam 基础参数
* @return boolean
*/
Page<GeneratrixWire> getGeneratrixWirePageList(BaseParam baseParam);
}

14
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java
View File

@@ -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<Generatrix> {
* @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> {
*/
Generatrix getGeneratrixById(String generatrixId);
/**
* 查询母线列表
*
* @return boolean
* @author cdf
* @date 2022/10/25
*/
List<Generatrix> getGeneratrixList();
/**
* 查询母线列表
*
@@ -73,7 +83,7 @@ public interface IPmsGeneratrixService extends IService<Generatrix> {
* @author cdf
* @date 2022/10/25
*/
List<Generatrix> getGeneratrixList(BaseParam baseParam);
Page<Generatrix> getGeneratrixPageList(BaseParam baseParam);
/**
* 获取母线与电站关联信息

4
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPowerDistributionareaService.java
View File

@@ -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<PowerDistributio
/**
* 查询所有
* @param queryParam
* @return
*/
Page<PowerDistributionareaVO> getList(PowerDistributionareaParam.QueryParam queryParam);
Page<PowerDistributionarea> getList(BaseParam baseParam);
/**
* 根据id查询

46
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IStatationStatService.java
View File

@@ -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<StatationStat> {
*/
List<PmsStatationStatInfoDTO> 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<String> 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<StatationStat> getStatationStatList();
/**
* 查询电站列表
*
* @param baseParam 基础参数
* @return boolean
* @author cdf
* @date 2022/10/25
*/
List<StatationStat> getStatationStatList(BaseParam baseParam);
Page<StatationStatVO> getStatationStatPageList(BaseParam baseParam);
/**
* 获取变电站信息
*
* @param param 条件参数
* @return com.njcn.common.pojo.response.HttpResult<java.util.List < com.njcn.device.pms.pojo.po.PmsStatationStat>>
* @author yzh
* @date 2022/11/21
*/
List<StatationStat> getPowerInfo(PmsStatationStatInfoParam param);
}

15
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DataQualityDetailsServiceImpl.java
View File

@@ -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<RStatMeasurementAccountDetailVO> getQualityProblemsOfMonitoringPointAccountData(DataQualityDetailsParam param) {
// 获取单位下的子单位信息
List<PmsGeneralDeviceDTO> data = getDeptInfo(param);
//获取所有子部门信息
List<DeptDTO> 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: 单位实体
*/

58
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java
View File

@@ -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<GeneratrixWireMapper, GeneratrixWire> 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<GeneratrixWireMapper, Genera
}
@Override
public List<GeneratrixWire> getGeneratrixWireList(BaseParam baseParam) {
return this.list();
public List<GeneratrixWire> getGeneratrixWireList() {
LambdaQueryWrapper<GeneratrixWire> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByAsc(GeneratrixWire::getCreateTime);
return this.list(lambdaQueryWrapper);
}
@Override
public Page<GeneratrixWire> getGeneratrixWirePageList(BaseParam baseParam) {
LambdaQueryWrapper<GeneratrixWire> 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<GeneratrixWire> 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);
}
}
}

1
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java
View File

@@ -98,6 +98,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> 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<Monitor> list = this.list(lambdaQueryWrapper);

18
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneralDeviceServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class PmsGeneralDeviceServiceImpl implements IPmsGeneralDeviceService {
List<DeptDTO> 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<String> 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<SimpleDTO> getPmsPowerrInfoWithInOrg(PmsDeviceInfoParam pmsDeviceInfoParam) {
List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(pmsDeviceInfoParam.getDeptIndex(), Stream.of(0,1).collect(Collectors.toList())).getData();
List<String> orgIdList = deptInfos.stream().map(deptDTO -> deptDTO.getId()).collect(Collectors.toList());
List<String> 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<DeptDTO> 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<String> 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<String> 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<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
PmsGeneralDeviceDTO pmsGeneralDeviceDTO = new PmsGeneralDeviceDTO();
pmsGeneralDeviceDTO.setIndex(deptDTO.getId());
pmsGeneralDeviceDTO.setIndex(deptDTO.getCode());
if (deptDTO.getType() == 0) {
pmsGeneralDeviceDTO.setName(deptDTO.getArea());
} else {

65
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java
View File

@@ -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<PmsGeneratrixMapper, G
private final PmsGeneratrixMapper pmsGeneratrixMapper;
private final StatationStatMapper statationStatMapper;
/**
* 获取母线信息
*
@@ -45,16 +59,29 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
@Override
public boolean addGeneratrix(GeneratrixParam generatrixParam) {
checkName(generatrixParam,false);
StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
if(Objects.isNull(statationStat)){
throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
}
Generatrix generatrix = new Generatrix();
BeanUtils.copyProperties(generatrixParam, generatrix);
generatrix.setStatationName(statationStat.getPowerName());
generatrix.setStatus(DataStateEnum.ENABLE.getCode());
return this.save(generatrix);
}
@Override
public boolean updateGeneratrix(GeneratrixParam.UpdateGeneratrixParam generatrixParam) {
public boolean updateGeneratrix(GeneratrixParam generatrixParam) {
checkName(generatrixParam,true);
StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId());
if(Objects.isNull(statationStat)){
throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
}
Generatrix generatrix = new Generatrix();
BeanUtils.copyProperties(generatrixParam, generatrix);
return this.save(generatrix);
generatrix.setStatationName(statationStat.getPowerName());
return this.updateById(generatrix);
}
@Override
@@ -68,8 +95,20 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
}
@Override
public List<Generatrix> getGeneratrixList(BaseParam baseParam) {
return this.list();
public List<Generatrix> getGeneratrixList() {
LambdaQueryWrapper<Generatrix> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime);
return this.list(lambdaQueryWrapper);
}
@Override
public Page<Generatrix> getGeneratrixPageList(BaseParam baseParam) {
LambdaQueryWrapper<Generatrix> 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<PmsGeneratrixMapper, G
public List<GeneratrixAndPowerStationDTO> getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) {
return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param);
}
private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){
LambdaQueryWrapper<Generatrix> 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);
}
}
}

50
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -27,18 +37,27 @@ import java.util.List;
* @since 2022-10-14
*/
@Service
@RequiredArgsConstructor
public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistributionareaMapper, PowerDistributionarea> implements IPowerDistributionareaService {
private final DeptFeignClient deptFeignClient;
private final IStatationStatService iStatationStatService;
private final IGeneratrixWireService iGeneratrixWireService;
private DicDataFeignClient dicDataFeignClient;
@Override
public Page<PowerDistributionareaVO> getList(PowerDistributionareaParam.QueryParam queryParam) {
QueryWrapper<PowerDistributionareaVO> 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<PowerDistributionarea> getList(BaseParam baseParam) {
LambdaQueryWrapper<PowerDistributionarea> 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<PowerDistribut
@Override
public boolean add(PowerDistributionareaParam newParam) {
checkName(newParam,true);
Dept dept = deptFeignClient.getDeptById(newParam.getOrgId()).getData();
if(Objects.isNull(dept)){
throw new BusinessException(PmsDeviceResponseEnum.ORG_ITEM_EMPTY);
}
Dept opDept = deptFeignClient.getDeptById(newParam.getOperationId()).getData();
if(Objects.isNull(opDept)){
throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY);
}
StatationStat statationStat = iStatationStatService.getStatationStatById(newParam.getPowerStationId());
if(Objects.isNull(statationStat)){
throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
}
PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
BeanUtils.copyProperties(newParam,powerDistributionarea);
//设为正常状态

36
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java
View File

@@ -1,12 +1,16 @@
package com.njcn.device.pms.service.majornetwork.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -16,7 +20,7 @@ import java.util.List;
/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author hongawen
@@ -39,7 +43,6 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
return statationStatMapper.getStatationStatInfo(pmsStatationStatInfoParam);
}
@Override
public boolean addStatationStat(StatationStatParam statationStatParam) {
StatationStat statationStat = new StatationStat();
@@ -65,7 +68,32 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
}
@Override
public List<StatationStat> getStatationStatList(BaseParam baseParam) {
return this.list();
public List<StatationStat> getStatationStatList() {
LambdaQueryWrapper<StatationStat> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.orderByDesc(StatationStat::getCreateTime);
return this.list(lambdaQueryWrapper);
}
@Override
public Page<StatationStatVO> 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<java.util.List < com.njcn.device.pms.pojo.po.PmsStatationStat>>
* @author yzh
* @date 2022/11/21
*/
@Override
public List<StatationStat> getPowerInfo(PmsStatationStatInfoParam param) {
LambdaQueryWrapper<StatationStat> 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);
}
}

47
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -26,12 +35,25 @@ import java.util.List;
* @since 2022-10-14
*/
@Service
@RequiredArgsConstructor
public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal> implements ITerminalService {
private final DeptFeignClient deptFeignClient;
private final IStatationStatService iStatationStatService;
private DicDataFeignClient dicDataFeignClient;
@Override
public Page<PmsTerminal> getTerminalList(BaseParam baseParam) {
LambdaQueryWrapper<PmsTerminal> 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<TerminalMapper, PmsTerminal
@Override
public boolean add(PmsTerminalParam terminalParam) {
checkName(terminalParam,true);
Dept dept = deptFeignClient.getDeptById(terminalParam.getOrgId()).getData();
if(Objects.isNull(dept)){
throw new BusinessException(PmsDeviceResponseEnum.ORG_ITEM_EMPTY);
}
Dept opDept = deptFeignClient.getDeptById(terminalParam.getOperationId()).getData();
if(Objects.isNull(opDept)){
throw new BusinessException(PmsDeviceResponseEnum.Operation_ITEM_EMPTY);
}
StatationStat statationStat = iStatationStatService.getStatationStatById(terminalParam.getPowerStationId());
if(Objects.isNull(statationStat)){
throw new BusinessException(PmsDeviceResponseEnum.NO_STATION);
}
PmsTerminal pmsTerminal = new PmsTerminal();
BeanUtils.copyProperties(terminalParam, pmsTerminal);
pmsTerminal.setOrgName(dept.getName());
pmsTerminal.setOperationName(opDept.getName());
pmsTerminal.setPowerrName(statationStat.getPowerName());
//设为正常状态
pmsTerminal.setStatus(DataStateEnum.ENABLE.getCode());
return this.save(pmsTerminal);
@@ -92,9 +135,7 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
lambdaQueryWrapper.eq(PmsTerminal::getName,terminalParam.getName());
//修改
if(!flag){
if(terminalParam instanceof PmsTerminalParam){
lambdaQueryWrapper.ne(PmsTerminal::getId,terminalParam.getId());
}
lambdaQueryWrapper.ne(PmsTerminal::getId,terminalParam.getId());
}
int result = this.count(lambdaQueryWrapper);
//大于等于1个则表示重复

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
View File

@@ -652,7 +652,7 @@ public class GeneralDeviceService {
query.in ("Id",DeviceIds).
eq ("Com_Flag",1);
Integer runDeviceCount = deviceMapper.selectCount (query);
BigDecimal rate = BigDecimal.valueOf (runDeviceCount).divide ( BigDecimal.valueOf (deviceCount),2,BigDecimal.ROUND_HALF_UP);
BigDecimal rate = BigDecimal.valueOf (runDeviceCount).divide ( BigDecimal.valueOf (deviceCount),4,BigDecimal.ROUND_HALF_UP);
deptDeviceDetailVO.setDeviceCount (deviceCount);
deptDeviceDetailVO.setRunDeviceCount (runDeviceCount);
deptDeviceDetailVO.setOnLineRate (rate);
@@ -672,7 +672,7 @@ public class GeneralDeviceService {
Integer count =lineMapper.queryOnlineSubstaion(DeviceIds);
deptSubstationDetailVO.setSubstationCount (substationCount);
deptSubstationDetailVO.setRunsubstationCount (count);
BigDecimal rate = BigDecimal.valueOf (count).divide ( BigDecimal.valueOf (substationCount),2,BigDecimal.ROUND_HALF_UP);
BigDecimal rate = BigDecimal.valueOf (count).divide ( BigDecimal.valueOf (substationCount),4,BigDecimal.ROUND_HALF_UP);
deptSubstationDetailVO.setOnLineRate (rate);
return deptSubstationDetailVO;

Some files were not shown because too many files have changed in this diff Show More