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-12-07 10:52:13 +08:00
parent cdf75aaea1
commit 60c2779fe0
156 changed files with 6242 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/DistributionMonitorClient.java
View File

@@ -13,6 +13,8 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
import com.njcn.device.pms.pojo.param.PmsMonitorParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
import com.njcn.device.pq.pojo.po.Overlimit;
import io.swagger.annotations.ApiImplicitParam;
@@ -42,5 +44,13 @@ public interface DistributionMonitorClient {
@PostMapping("/getDoubleUserByDept")
HttpResult<List<DoubleUserVO>> getDoubleUserByDept(@RequestParam("orgId")String orgId);
/**
* 获取配网监测点数据
* @author cdf
* @date 2022/11/29
*/
@PostMapping("distributionMonitorList")
HttpResult<List<DistributionMonitor>> distributionMonitorList(@RequestBody List<String> monitorIds);
}

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

@@ -9,6 +9,7 @@ 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.pojo.po.Monitor;
import com.njcn.device.pq.pojo.po.Overlimit;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
@@ -58,4 +59,13 @@ public interface MonitorClient {
HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id);
/**
* 获取主网监测点数据
* @author cdf
* @date 2022/11/29
*/
@PostMapping("getMonitorList")
HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds);
}

9
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/DistributionMonitorClientFallbackFactory.java
View File

@@ -9,12 +9,14 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
import com.njcn.device.pms.pojo.param.PmsMonitorParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
import com.njcn.device.pq.pojo.po.Overlimit;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -45,6 +47,13 @@ public class DistributionMonitorClientFallbackFactory implements FallbackFactory
}
@Override
public HttpResult<List<DistributionMonitor>> distributionMonitorList(List<String> monitorIds) {
log.error("{}异常，降级处理，异常为：{}", "获取配网监测点", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

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

@@ -10,6 +10,7 @@ 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.pojo.po.Monitor;
import com.njcn.device.pms.utils.PmsDeviceEnumUtil;
import com.njcn.device.pq.pojo.po.Overlimit;
import feign.hystrix.FallbackFactory;
@@ -54,6 +55,12 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
log.error("{}异常，降级处理，异常为：{}", "根据监测点Id获取限值 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<Monitor>> getMonitorList(List<String> monitorIds) {
log.error("{}异常，降级处理，异常为：{}", "获取主网监测点数据 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

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

@@ -22,8 +22,24 @@ public enum PmsDeviceResponseEnum {
NO_USER_TYPE("A00364","未查询字典用户类型"),
NO_STATION("A00365","未查询指定电站信息"),
NO_LINE_SORT("A00366","未查询到字典监测点类别"),
GENERATRIXWIRE_NAME_REPEAT("A00368","同一母线下存在相同名称线路"),
GENERATRIX_NAME_REPEAT("A00369","同一电站下存在相同名称母线"),
POWERGENERATIONUSER_SAME("A00370","发电用户名称或编号重复"),
POWERCLINET_SAME("A00371","用电用户名称或编号重复"),
WIRE_SAME("A00372","线路编号重复"),
GENWIRE_SAME("A00373","母线编号重复"),
POWER_CODE_SAME("A00374","台区名称或编号重复"),
POWER_CLIENT_DIS_EMPTY("A00375","发电用电用户参数不可为空"),
POWER_CLIENT_NOT_FIND("A00380","查无此用电用户"),
POWER_GEN_NOT_FIND("A00381","查无此发电用户"),
POWER_DIS_NOT_FIND("A00382","查无此台区信息"),
ONE_MONITOR_NOT_FIND("A00383","查无此I类监测点信息"),
TWO_MONITOR_NOT_FIND("A00384","查无此II类监测点信息"),
THREE_MONITOR_NOT_FIND("A00385","查无此III类监测点信息"),

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

@@ -25,26 +25,17 @@ public class DistributionMonitorParam {
/**
* 监测点ID
*/
@ApiModelProperty(value = "监测点类别(字典)")
@NotBlank(message = "监测点类别不能为空")
private String monitorId;
/**
* 电压等级(字典)
*/
private String voltageLevel;
/**
* 是否发电用户：0-否；1-是；
*/
private Boolean ifPowerUser;
/**
* 监测点状态(字典)
*/
@ApiModelProperty(value = "监测点状态(字典)")
@NotBlank(message = "监测点状态不能为空")
private String monitorState;
/**
* 创建日期
*/
private LocalDateTime createdDate;
@ApiModelProperty(value = "III类监测点小类 0.用电用户 1.发电用户 默认用电")
private Integer smallType;
}

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

@@ -17,6 +17,15 @@ import java.time.LocalDateTime;
@Data
public class MonitorParam {
private static final long serialVersionUID = 1L;
/**
* 监测线路ID
*/
@ApiModelProperty(value = "监测点编号")
@NotBlank(message = "监测点编号不可为空")
private String id;
/**
* 监测点名称
*/
@@ -32,6 +41,13 @@ public class MonitorParam {
@NotBlank(message = "组织机构ID不能为空")
private String orgId;
/**
* 组织机构名称(外键)
*/
@ApiModelProperty(value = "组织机构名称(外键)")
@NotBlank(message = "组织机构名称不能为空")
private String orgName;
/**
* 运维单位ID(外键)
@@ -40,6 +56,13 @@ public class MonitorParam {
@NotBlank(message = "运维单位ID不能为空")
private String operationId;
/**
* 运维单位名称
*/
@ApiModelProperty(value = "运维单位名称")
@NotBlank(message = "运维单位名称不能为空")
private String operationName;
/**
* 电站ID(外键)
@@ -49,12 +72,26 @@ public class MonitorParam {
private String powerrId;
/**
* 母线ID(外键)
* 电站名称
*/
@ApiModelProperty(value = "母线ID(外键)")
@NotBlank(message = "母线ID不能为空")
@ApiModelProperty(value = "电站名称")
@NotBlank(message = "电站名称不能为空")
private String powerrName;
/**
* 母线编号(外键)
*/
@ApiModelProperty(value = "母线编号(外键)")
@NotBlank(message = "母线编号不能为空")
private String generatrixId;
/**
* 母线名称
*/
@ApiModelProperty(value = "母线名称")
@NotBlank(message = "母线名称不能为空")
private String generatrixName;
/**
* 监测线路名称
*/
@@ -143,8 +180,8 @@ public class MonitorParam {
* 是否用户专线(字典)
*/
@ApiModelProperty(value = "是否用户专线(字典)")
@NotBlank(message = "是否用户专线不可为空")
private String isSpecialSupplyElectricity;
@NotNull(message = "是否用户专线不可为空")
private Integer isSpecialSupplyElectricity;
/**
* 监测点标签
@@ -203,16 +240,6 @@ public class MonitorParam {
private Integer isUpToGrid;
@Data
@EqualsAndHashCode(callSuper = true)
public static class UpdateMonitorParam extends MonitorParam{
/**
* 监测线路ID
*/
@ApiModelProperty(value = "监测点ID")
@NotBlank(message = "监测点ID不可为空")
private String id;
}
}

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

@@ -1,5 +1,6 @@
package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -65,10 +66,12 @@ public class PmsTerminalParam {
@ApiModelProperty(name = "verificationDate", value = "检定日期")
@NotBlank(message = "检定日期不能为空")
@DateTimeStrValid(message = "检定日期格式有误")
private String verificationDate;
@ApiModelProperty(name = "useDate", value = "投用日期")
@NotBlank(message = "投用日期不能为空")
@DateTimeStrValid(message = "投用日期格式有误")
private String useDate;
@ApiModelProperty(name = "inputType", value = "测量信号输入形式")

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

@@ -39,6 +39,12 @@ public class PowerClientParam {
@NotBlank(message = "组织机构ID不可为空")
private String orgId;
/**
* 组织机构名称
*/
@ApiModelProperty(value = " 组织机构名称",required = true)
@NotBlank(message = "组织机构名称不可为空")
private String orgName;
/**
@@ -48,6 +54,13 @@ public class PowerClientParam {
@NotBlank(message = "运维单位ID不可为空")
private String operationId;
/**
* 运维单位名称
*/
@ApiModelProperty(value = "运维单位名称",required = true)
@NotBlank(message = "运维单位名称不可为空")
private String operationName;
/**
* 用户分类(字典)
*/

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

@@ -39,6 +39,13 @@ public class PowerGenerationUserParam {
@NotBlank(message = "组织机构ID不可为空")
private String orgId;
/**
* 组织名称
*/
@ApiModelProperty(value = "组织名称",required = true)
@NotBlank(message = "组织名称不可为空")
private String orgName;
/**
* 运维单位ID(外键)
@@ -47,6 +54,13 @@ public class PowerGenerationUserParam {
@NotBlank(message = "运维单位ID不可为空")
private String operationId;
/**
* 运维单位名称
*/
@ApiModelProperty(value = "运维单位名称",required = true)
@NotBlank(message = "运维单位名称不可为空")
private String operationName;
/**
* 电源类别(字典)
*/

20
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/PowerUserParam.java Normal file
View File

@@ -0,0 +1,20 @@
package com.njcn.device.pms.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author xiaoyao
* @version 1.0.0
* @createTime 2022/11/30 13:52
*/
@Data
public class PowerUserParam {
/**
* 用户编号
*/
@ApiModelProperty(value = "用户编号",required = true)
private String id;
}

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

@@ -30,10 +30,14 @@ public class StatationStatParam {
private String powerName;
@ApiModelProperty(value = "单位组织id",required = true)
@NotBlank(message = "单位组织id不可为空")
@ApiModelProperty(value = "单位组织编号",required = true)
@NotBlank(message = "单位组织编号不可为空")
private String orgId;
@ApiModelProperty(value = "单位组织名称",required = true)
@NotBlank(message = "单位组织名称")
private String orgName;
/**
* 应设点数量
*/
@@ -48,4 +52,16 @@ public class StatationStatParam {
@NotBlank(message = "电压等级不可为空")
private String voltageLevel;
/**
* 经度
*/
@ApiModelProperty(value = "经度")
private Double longitude;
/**
* 维度
*/
@ApiModelProperty(value = "维度")
private Double latitude;
}

25
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TaiZhangDelParam.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.device.pms.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* pms-device
*
* @author cdf
* @date 2022/12/5
*/
@Data
public class TaiZhangDelParam {
@ApiModelProperty(name = "1.I类监测点 2.II类监测点 3.III类监测")
@NotNull(message = "类型不能为空")
private Integer type;
@ApiModelProperty(name = "监测点集合")
@NotEmpty(message = "监测点集合不能为空")
private List<String> ids;
}

42
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TaiZhangParam.java Normal file
View File

@@ -0,0 +1,42 @@
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;
/**
* pms-device
*
* @author cdf
* @date 2022/11/23
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class TaiZhangParam extends BaseParam {
@NotBlank(message = "组织部门编号不可为空")
@ApiModelProperty(value = "组织部门编号",required = true)
private String orgId;
@NotNull(message = "数据类型不可为空")
@ApiModelProperty(value = "数据类型 0.主网 1.配网",required = true)
private Integer dataType;
@ApiModelProperty(value = "监测点类别(字典 I II III 监测点)" ,required = true)
private String lineType;
@ApiModelProperty(value = "三类监测点小类 0用电 1发电")
private Integer treeType;
}

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

@@ -1,74 +1,89 @@
package com.njcn.device.pms.pojo.param;
import com.njcn.web.pojo.annotation.DateTimeStrValid;
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;
@Data
public class TractionStationParam {
@ApiModelProperty(name = "id",value = "牵引站编号")
@NotBlank(message = "牵引站编号不可为空")
private String id;
@ApiModelProperty(name = "Name", value = "牵引站名称")
private String Name;
@ApiModelProperty(name = "name", value = "牵引站名称")
@NotBlank(message = "牵引站名称不可为空")
private String name;
@ApiModelProperty(name = "OrgName", value = "组织机构名称")
private String OrgName;
@ApiModelProperty(name = "orgName", value = "组织机构名称")
@NotBlank(message = "组织机构名称不可为空")
private String orgName;
@ApiModelProperty(name = "OrgId", value = "组织机构ID")
private String OrgId;
@ApiModelProperty(name = "orgId", value = "组织机构编号")
@NotBlank(message = "组织机构编号不可为空")
private String orgId;
@ApiModelProperty(name = "OperationName", value = "运维单位名称")
private String OperationName;
@ApiModelProperty(name = "operationName", value = "运维单位名称")
@NotBlank(message = "运维单位名称不可为空")
private String operationName;
@ApiModelProperty(name = "OperationId", value = "运维单位ID")
private String OperationId;
@ApiModelProperty(name = "operationId", value = "运维单位编号")
@NotBlank(message = "运维单位编号不可为空")
private String operationId;
@ApiModelProperty(name = "VoltageLevel", value = "供电电压等级")
private String VoltageLevel;
@ApiModelProperty(name = "voltageLevel", value = "供电电压等级")
@NotBlank(message = "供电电压等级不可为空")
private String voltageLevel;
@ApiModelProperty(name = "RailwayLineId", value = "铁路线路编号")
private String RailwayLineId;
@ApiModelProperty(name = "railwayLineId", value = "铁路线路编号")
@NotBlank(message = "铁路线路编号不可为空")
private String railwayLineId;
@ApiModelProperty(name = "RailwayLineName", value = "铁路线路名称")
private String RailwayLineName;
@ApiModelProperty(name = "railwayLineName", value = "铁路线路名称")
@NotBlank(message = "铁路线路名称不可为空")
private String railwayLineName;
@ApiModelProperty(name = "ConnetGroupWay", value = "牵引站变压器接线方式")
private String ConnetGroupWay;
@ApiModelProperty(name = "connetGroupWay", value = "牵引站变压器接线方式")
@NotBlank(message = "牵引站变压器接线方式不可为空")
private String connetGroupWay;
@ApiModelProperty(name = "RatedCapacity", value = "牵引站变电容量")
private Float RatedCapacity;
@ApiModelProperty(name = "ratedCapacity", value = "牵引站变电容量")
@NotNull(message = "牵引站变电容量不可为空")
private Float ratedCapacity;
@ApiModelProperty(name = "PowerId", value = "供电变电站编号")
private String PowerId;
@ApiModelProperty(name = "powerId", value = "供电变电站编号")
@NotBlank(message = "供电变电站编号不可为空")
private String powerId;
@ApiModelProperty(name = "PowerName", value = "供电变电站名称")
private String PowerName;
@ApiModelProperty(name = "powerName", value = "供电变电站名称")
@NotBlank(message = "供电变电站名称不可为空")
private String powerName;
@ApiModelProperty(name = "PowerVoltageLevel", value = "供电变电站电压等级")
private String PowerVoltageLevel;
@ApiModelProperty(name = "powerVoltageLevel", value = "供电变电站电压等级")
@NotBlank(message = "供电变电站电压等级不可为空")
private String powerVoltageLevel;
@ApiModelProperty(name = "IfSpecial", value = "是否专线供电：0-否;1-是;")
private Integer IfSpecial;
@ApiModelProperty(name = "ifSpecial", value = "是否专线供电：0-否;1-是;")
@NotNull(message = "是否专线供电")
private Integer ifSpecial;
@ApiModelProperty(name = "CreatedDate", value = "创建日期")
private String CreatedDate;
@ApiModelProperty(name = "createdDate", value = "创建日期")
@NotBlank(message = "创建日期不可为空")
@DateTimeStrValid(format = "yyyy-MM-dd",message = "创建日期格式有误")
private String createdDate;
@ApiModelProperty(name = "UserTag", value = "用户标签")
private String UserTag;
@ApiModelProperty(name = "userTag", value = "用户标签")
@NotBlank(message = "用户标签不可为空")
private String userTag;
@ApiModelProperty(name = "IsUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
private Integer IsUpToGrid;
@ApiModelProperty(name = "isUpToGrid", value = "是否是上送国网监测点,0-否 1-是")
@NotNull(message = "是否是上送国网监测点不可为空")
private Integer isUpToGrid;
/**
* 查询数据实体
*/
@Data
@EqualsAndHashCode(callSuper = true)
public static class QueryParam extends BaseParam {
private Integer Status;
}
}

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

@@ -43,7 +43,7 @@ public class DistributionMonitor extends BaseEntity {
/**
* 是否发电用户：0-否；1-是；
*/
private Boolean ifPowerUser;
private Integer ifPowerUser;
/**
* 监测点状态(字典)
@@ -58,7 +58,7 @@ public class DistributionMonitor extends BaseEntity {
/**
* 数据状态：0-删除；1-正常；
*/
private Boolean status;
private Integer status;

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

@@ -135,7 +135,7 @@ public class Monitor extends BaseEntity {
/**
* 是否用户专线(字典)
*/
private String isSpecialSupplyElectricity;
private Integer isSpecialSupplyElectricity;
/**
* 监测点标签

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
@@ -42,6 +43,11 @@ public class StatationStat extends BaseEntity {
*/
private String orgId;
/**
* 机构组织名称
*/
private String orgName;
/**
* 应设点数量
*/
@@ -52,10 +58,20 @@ public class StatationStat extends BaseEntity {
*/
private String voltageLevel;
/**
* 经度
*/
private Double longitude;
/**
* 维度
*/
private Double latitude;
/**
* 数据状态：0-删除；1-正常；
*/
private Boolean status;
private Integer status;

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

@@ -3,6 +3,7 @@ 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;
@@ -12,7 +13,7 @@ import lombok.Setter;
/**
* <p>
*
*
* </p>
*
* @author hongawen
@@ -103,7 +104,7 @@ public class TractionStation extends BaseEntity {
/**
* 创建日期
*/
private LocalDateTime createdDate;
private LocalDate createdDate;
/**
* 用户标签
@@ -116,29 +117,11 @@ public class TractionStation extends BaseEntity {
private Integer isUpToGrid;
/**
* 数据状态：0-删除；1-正常；
* 数据状态：0-删除；1-正常；
*/
private Integer status;
/**
* 创建用户
*/
private String createBy;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
private LocalDateTime updateTime;
}

219
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/PmsPowerTreeMonitorVO.java Normal file
View File

@@ -0,0 +1,219 @@
package com.njcn.device.pms.pojo.vo;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import lombok.Data;
import java.time.LocalDate;
/**
* pms-device
*
* @author cdf
* @date 2022/11/25
*/
@Data
public class PmsPowerTreeMonitorVO {
private static final long serialVersionUID = 1L;
//公共
/**
* 用户编号
*/
private String id;
/**
* 用户名称
*/
private String name;
/**
* 组织机构名称
*/
private String orgName;
/**
* 组织机构ID(外键)
*/
private String orgId;
/**
* 运维单位名称
*/
private String operationName;
/**
* 运维单位ID(外键)
*/
private String operationId;
/**
* 并网电压等级(字典)
*/
private String voltageLevel;
/**
* 供电变电站(外键)
*/
private String powerStationId;
/**
* 供电线路(外键)
*/
private String lineId;
/**
* 供电台区(外键)
*/
private String platformId;
/**
* 用户标签
*/
private String userTag;
/**
* 是否是上送国网监测点,0-否 1-是
*/
private Integer isUpToGrid;
//用电用户
/**
* 用户分类(字典)
*/
private String userType;
/**
* 行业分类(字典)
*/
private String industryType;
/**
* 用电类别(字典)
*/
private String electricityType;
/**
* 合同容量
*/
private Float contractCapacity;
/**
* 运行容量
*/
private Float operatingCapacity;
/**
* 生产班次(字典)
*/
private String productionShift;
/**
* 负荷性质(字典)
*/
private String loadNature;
/**
* 高耗能行业类别(字典)
*/
private String highIndustryType;
/**
* 送电日期
*/
private LocalDate powerTransmissionDate;
/**
* 重要性等级(字典)
*/
private String importanceLevel;
/**
* 用电客户状态(字典)
*/
private String eccStat;
/**
* 是否敏感用户：0-否；1：是；
*/
private Integer ifSensitiveUser;
/**
* 是否影响电能质量：0-否；1：是；
*/
private Integer ifPowerQuality;
/**
* 是否重要客户：0-否；1：是；
*/
private Integer ifKeyCustomers;
/**
* 敏感用户类别(字典)
*/
private String sensitiveType;
//发电
/**
* 电源类别(字典)
*/
private String powerCategory;
/**
* 电站类型(字典)
*/
private String powerStationType;
/**
* 发电方式(字典)
*/
private String powerGenerationMode;
/**
* 总装机容量
*/
private Float sourceCapacity;
/**
* 并网日期
*/
private LocalDate connectionDate;
/**
* 能源消纳方式(字典)
*/
private String connectionMode;
/**
* 客户状态(字典)
*/
private String gcStat;
}

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

@@ -42,6 +42,9 @@ public class ROperatingIndexCommonVO {
@ApiModelProperty(name = " transitMeasurementRate", value = "在线监测率")
private Double transitMeasurementRate;
@ApiModelProperty(name = "onlineMeasurementPoints", value = "监测终端数")
private Integer onlineMeasurementPoints;
/**
* 在线终端数
*/

47
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAlarmDetailVO.java Normal file
View File

@@ -0,0 +1,47 @@
package com.njcn.device.pms.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 告警明细(主配网)
* @Title RStatAlarmDetailVO
* @Package com.njcn.device.pms.pojo.vo
* @Author jianghaifei
* @Date 2022-11-23 19:51
* @Version V1.0
*/
@Data
public class RStatAlarmDetailVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 监测点ID
*/
@ApiModelProperty(name = "measurementPointId", value = "监测点ID")
private String measurementPointId;
@ApiModelProperty(name = "measurementPointName", value = "监测点名称")
private String measurementPointName;
/**
* 告警类型
*/
@ApiModelProperty(name = "alarmType", value = "告警类型(字典)")
private String alarmType;
/**
* 告警描述
*/
@ApiModelProperty(name = "alarmInfo", value = "告警描述")
private String alarmInfo;
/**
* 告警持续时间
*/
@ApiModelProperty(name = "alarmLastTime", value = "告警持续时间")
private Double alarmLastTime;
}

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

@@ -28,7 +28,17 @@ public class StatationStatVO implements Serializable {
@ApiModelProperty(name = "voltageLevel", value = "电压等级")
private String voltageLevel;
/**
* 经度
*/
@ApiModelProperty(value = "经度")
private Double longitude;
/**
* 维度
*/
@ApiModelProperty(value = "维度")
private Double latitude;

47
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/distribution/RMpPwAlarmDetailDController.java Normal file
View File

@@ -0,0 +1,47 @@
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;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
import com.njcn.device.pms.pojo.vo.RStatPwAlarmDetailVO;
import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @Title RMpPwAlarmDetailDController
* @Package com.njcn.device.pms.controller.distribution
* @Author jianghaifei
* @Date 2022-11-23 19:46
* @Version V1.0
*/
@RestController
@RequestMapping("/rMpPwAlarmDetail")
@Api(tags = "告警明细")
@RequiredArgsConstructor
public class RMpPwAlarmDetailDController extends BaseController {
private final RMpPwAlarmDetailDService rMpPwAlarmDetailDService;
@PostMapping("getAllAlarmDetailList")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("告警明细查看(主配网)")
public HttpResult<List<RStatAlarmDetailVO>> getAllAlarmDetailList(@RequestBody RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
String methodDescribe = getMethodDescribe("getAllAlarmDetailList");
List<RStatAlarmDetailVO> list = rMpPwAlarmDetailDService.getAllAlarmDetailList(rStatPwAlarmDetailParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

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

@@ -3,22 +3,22 @@ package com.njcn.device.pms.controller.majornetwork;
import cn.hutool.core.collection.CollectionUtil;
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.dto.PmsGeneralDeviceDTO;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
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;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.njcn.web.controller.BaseController;
@@ -47,12 +47,33 @@ public class DistributionMonitorController extends BaseController {
* @author cdf
* @date 2022/10/26
*/
@PostMapping
@PostMapping("addDistributionMonitor")
@ApiImplicitParam(name = "distributionMonitorParam",value = "配网监测点实体",required = true)
public HttpResult<Boolean> addDistributionMonitor(@RequestBody DistributionMonitorParam distributionMonitorParam){
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@ApiOperation("新增配网监测点")
public HttpResult<Boolean> addDistributionMonitor(@RequestBody @Validated DistributionMonitorParam distributionMonitorParam){
String methodDescribe = getMethodDescribe("addDistributionMonitor");
boolean res= iDistributionMonitorService.addDistributionMonitor(distributionMonitorParam);
if(res){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
/**
* 获取配网监测点
* @author cdf
* @date 2022/11/29
*/
@PostMapping("distributionMonitorList")
@ApiImplicitParam(name = "disMonitorIds",value = "配网监测点编号",required = true)
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("获取配网监测点")
public HttpResult<List<DistributionMonitor>> distributionMonitorList(@RequestBody List<String> disMonitorIds){
String methodDescribe = getMethodDescribe("distributionMonitorList");
List<DistributionMonitor> res = iDistributionMonitorService.distributionMonitorList(disMonitorIds);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
@@ -77,6 +98,27 @@ public class DistributionMonitorController extends BaseController {
/**
* 删除配网监测点
* @author cdf
* @date 2022/12/5
*/
@PostMapping("delDistributionMonitor")
@ApiImplicitParam(name = "taiZhangDelParam",value = "配网监测点实体",required = true)
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
@ApiOperation("删除配网监测点")
public HttpResult<Boolean> delDistributionMonitor(@RequestBody @Validated TaiZhangDelParam taiZhangDelParam){
String methodDescribe = getMethodDescribe("delDistributionMonitor");
boolean res= iDistributionMonitorService.delDistributionMonitor(taiZhangDelParam);
if(res){
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
}
}
}

64
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/MonitorController.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;
@@ -12,11 +13,13 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
import com.njcn.device.pms.pojo.param.MonitorParam;
import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
import com.njcn.device.pms.pojo.param.PmsMonitorParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pq.pojo.po.Overlimit;
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;
@@ -27,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import java.util.List;
import java.util.Objects;
/**
* <p>
@@ -105,6 +109,62 @@ public class MonitorController extends BaseController {
/**
* 分页获取所有主网监测点
* @author cdf
* @date 2022/11/25
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getAllMonitorPageList")
@ApiOperation("分页获取所有主网监测点")
@ApiImplicitParam(name = "baseParam",required = true)
public HttpResult<Page<Monitor>> getAllMonitorPageList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getAllMonitorList");
Page<Monitor> monitor= monitorService.getAllMonitorPageList(baseParam);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
}
/**
* 获取所有主网监测点
* @author cdf
* @date 2022/11/29
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMonitorList")
@ApiOperation("获取所有主网监测点(或者指定监测点编号查询)")
@ApiImplicitParam(name = "monitorIds",value = "主网监测点编号",required = true)
public HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds) {
String methodDescribe = getMethodDescribe("getAllMonitorList");
List<Monitor> monitor= monitorService.getMonitorList(monitorIds);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
}
/**
* 根据条件获取所有主网监测点
* @author cdf
* @date 2022/11/29
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMonitorListByParam")
@ApiOperation("根据条件获取所有主网监测点")
@ApiImplicitParam(name = "monitorParam",value = "查询参数体",required = true)
public HttpResult<List<Monitor>> getMonitorListByParam(@RequestBody MonitorParam monitorParam) {
String methodDescribe = getMethodDescribe("getMonitorListByParam");
List<Monitor> monitor= monitorService.getMonitorListByParam(monitorParam);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
}
@@ -112,7 +172,7 @@ public class MonitorController extends BaseController {
@PostMapping("/addMonitor")
@ApiOperation("新增主网监测点")
@ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
public HttpResult<Boolean> addMonitor(@RequestBody MonitorParam monitorParam) {
public HttpResult<Boolean> addMonitor(@RequestBody @Validated MonitorParam monitorParam) {
String methodDescribe = getMethodDescribe("addMonitor");
boolean result = monitorService.addMonitor(monitorParam);
if(result){
@@ -126,7 +186,7 @@ public class MonitorController extends BaseController {
@PostMapping("/updateMonitor")
@ApiOperation("修改主网监测点")
@ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam.UpdateMonitorParam monitorParam) {
public HttpResult<Boolean> updateMonitor(@RequestBody MonitorParam monitorParam) {
String methodDescribe = getMethodDescribe("updateMonitor");
boolean result = monitorService.updateMonitor(monitorParam);
if(result){

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

@@ -40,9 +40,9 @@ import java.util.Objects;
@RestController
@RequestMapping("/pms/statationStat")
@Slf4j
@Api(tags = "变电站统计")
@Api(tags = "台账-变电站")
@RequiredArgsConstructor
public class StatationStatController extends BaseController {
public class PmsStatationStatController extends BaseController {
private final IStatationStatService statationStatService;

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

@@ -47,7 +47,7 @@ public class PmsTerminalController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("getTerminalList")
@ApiOperation("查询监测终端台账所有信息")
@ApiOperation("分页查询监测终端台账所有信息")
@ApiImplicitParam(name = "baseParam",value = "查询监测终端台账信息",required = true)
public HttpResult<Page<PmsTerminal>> getTerminalList(@RequestBody @Validated BaseParam baseParam){
String methodDescribe = getMethodDescribe("getTerminalList");
@@ -56,6 +56,15 @@ public class PmsTerminalController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("getTerminalSelectList")
@ApiOperation("查询监测终端台账所有信息")
public HttpResult<List<PmsTerminal>> getTerminalSelectList(){
String methodDescribe = getMethodDescribe("getTerminalSelectList");
List<PmsTerminal> res = iTerminalService.getTerminalSelectList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getTerminalById")
@ApiOperation("根据ID查询监测终端台账数据")

21
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/TractionStationController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/majornetwork/PmsTractionStationController.java
View File

@@ -1,6 +1,7 @@
package com.njcn.device.pms.controller.majornetwork;
import cn.hutool.core.collection.CollUtil;
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;
@@ -37,23 +38,33 @@ import java.util.Objects;
@Slf4j
@RestController
@RequestMapping("/pms/tractionStation")
@Api(tags = "牵引站信息")
@Api(tags = "台账-牵引站信息")
@RequiredArgsConstructor
@Validated
public class TractionStationController extends BaseController {
public class PmsTractionStationController extends BaseController {
private final ITractionStationService iTractionStationService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getTractionStationList")
@ApiOperation("获取牵引站列表")
@ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
public HttpResult<List<TractionStation>> getTractionStationList(@RequestBody BaseParam baseParam) {
public HttpResult<List<TractionStation>> getTractionStationList() {
String methodDescribe = getMethodDescribe("getTractionStationList");
List<TractionStation> result = iTractionStationService.getTractionStationList(baseParam);
List<TractionStation> result = iTractionStationService.getTractionStationList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getTractionStationPageList")
@ApiOperation("分页获取牵引站列表")
@ApiImplicitParam(name = "baseParam", value = "基本查询体", required = true)
public HttpResult<Page<TractionStation>> getTractionStationPageList(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("getTractionStationPageList");
Page<TractionStation> result = iTractionStationService.getTractionStationPageList(baseParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getTractionStationById")
@ApiOperation("根据id获取牵引站信息")

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

@@ -9,6 +9,7 @@ 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.PowerClientParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.service.majornetwork.IPowerClientService;
import com.njcn.web.pojo.param.BaseParam;
@@ -99,9 +100,9 @@ public class PowerClientController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getPowerClientList")
@ApiOperation("获取用电用户列表")
public HttpResult<List<PowerClient>> getPowerClientList() {
public HttpResult<List<PowerClient>> getPowerClientList(@RequestBody PowerClientParam powerClientParam) {
String methodDescribe = getMethodDescribe("getPowerClientList");
List<PowerClient> result = iPowerClientService.getPowerClientList();
List<PowerClient> result = iPowerClientService.getPowerClientList(powerClientParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@@ -115,5 +116,16 @@ public class PowerClientController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getPowerUtilizationUserList")
@ApiOperation("获取用户列表")
@ApiImplicitParam(name = "powerUserParam", value = "参数", required = true)
public HttpResult<List<PowerClient>> getPowerUtilizationUserList(@RequestBody PowerUserParam powerUserParam) {
String methodDescribe = getMethodDescribe("getPowerUtilizationUserList");
List<PowerClient> result = iPowerClientService.getPowerUtilizationUserList(powerUserParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

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

@@ -38,7 +38,7 @@ import java.util.Objects;
@Slf4j
@RestController
@RequestMapping("/pms/powerDistributionarea")
@Api(tags = "台区信息")
@Api(tags = "台账-台区信息")
@RequiredArgsConstructor
@Validated
public class PowerDistributionareaController extends BaseController {
@@ -47,7 +47,7 @@ public class PowerDistributionareaController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("getPowerDistributionAreaList")
@ApiOperation("查询台区所有信息")
@ApiOperation("分页查询台区所有信息")
@ApiImplicitParam(name = "baseParam",value = "查询台区信息",required = true)
public HttpResult<Page<PowerDistributionarea>> getList(@RequestBody @Validated BaseParam baseParam){
String methodDescribe = getMethodDescribe("getList");
@@ -56,6 +56,15 @@ public class PowerDistributionareaController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("getPowerDistributionList")
@ApiOperation("查询台区所有信息")
public HttpResult<List<PowerDistributionarea>> getPowerDistributionList(@RequestBody PowerDistributionareaParam powerDistributionareaParam){
String methodDescribe = getMethodDescribe("getPowerDistributionList");
List<PowerDistributionarea> res = iPowerDistributionareaService.getPowerDistributionList(powerDistributionareaParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,res,methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getPowerDistributionAreaById")

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

@@ -8,7 +8,9 @@ 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.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
import com.njcn.web.pojo.param.BaseParam;
@@ -34,7 +36,7 @@ import java.util.Objects;
*/
@RestController
@RequestMapping("/pms/powerGenerationUser")
@Api(tags = "发电用户")
@Api(tags = "台账-发电用户")
@RequiredArgsConstructor
public class PowerGenerationUserController extends BaseController {
@@ -99,9 +101,9 @@ public class PowerGenerationUserController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getPowerGenerationUserList")
@ApiOperation("获取发电用户列表")
public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList() {
public HttpResult<List<PowerGenerationUser>> getPowerGenerationUserList(@RequestBody PowerDistributionareaParam powerDistributionareaParam) {
String methodDescribe = getMethodDescribe("getPowerGenerationUserList");
List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList();
List<PowerGenerationUser> result = iPowerGenerationUserService.getPowerGenerationUserList(powerDistributionareaParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@@ -115,5 +117,15 @@ public class PowerGenerationUserController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getGenerateElectricityUserList")
@ApiOperation("获取用户列表")
@ApiImplicitParam(name = "powerUserParam", value = "参数", required = true)
public HttpResult<List<PowerGenerationUser>> getGenerateElectricityUserList(@RequestBody PowerUserParam powerUserParam) {
String methodDescribe = getMethodDescribe("getGenerateElectricityUserList");
List<PowerGenerationUser> result = iPowerGenerationUserService.getGenerateElectricityUserList(powerUserParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
}

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

@@ -1,14 +1,37 @@
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.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.TaiZhangParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerDistributionarea;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
import com.njcn.device.pms.service.majornetwork.ITerminalEliminateDataService;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.njcn.web.controller.BaseController;
import java.util.List;
/**
* <p>
* 前端控制器
* 台账操作界面
* </p>
*
* @author hongawen
@@ -16,7 +39,59 @@ import com.njcn.web.controller.BaseController;
*/
@RestController
@RequestMapping("/pms/terminalEliminateData")
@Slf4j
@RequiredArgsConstructor
@Api(tags = "台账-台账操作界面")
public class TerminalEliminateDataController extends BaseController {
private final ITerminalEliminateDataService iTerminalEliminateDataService;
/**
* 根据组织部门获取自身以及子部门的主网或配网监测点(I类监测点)
* @author cdf
* @date 2022/11/23
*/
@PostMapping("getOneMonitorByOrgId")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation(value = "(I类监测点)根据组织部门获取自身以及子部门的主网或配网监测点")
@ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
public HttpResult<Page<Monitor>> getOneMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
String methodDescribe = getMethodDescribe("getOneMonitorByOrgId");
Page<Monitor> page = iTerminalEliminateDataService.getOneMonitorByOrgId(taiZhangParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
/**
* 根据组织部门获取自身以及子部门的主网或配网监测点
* @author cdf
* @date 2022/11/23
*/
@PostMapping("getTwoMonitorByOrgId")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation(value = "(II类监测点)根据组织部门获取自身以及子部门的配网监测点")
@ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
public HttpResult<Page<PowerDistributionarea>> getTwoMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
String methodDescribe = getMethodDescribe("getOneMonitorByOrgId");
Page<PowerDistributionarea> page = iTerminalEliminateDataService.getTwoMonitorByOrgId(taiZhangParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
/**
* (III类监测点用电用户)根据组织部门获取自身以及子部门的主网或配网监测点
* @author cdf
* @date 2022/11/25
*/
@PostMapping("getThreeYongMonitorByOrgId")
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation(value = "(III类监测点)根据组织部门获取自身以及子部门的配网监测点")
@ApiImplicitParam(name = "taiZhangParam",value = "台账查询参数",required = true)
public HttpResult<Page<PmsPowerTreeMonitorVO>> getThreeYongMonitorByOrgId(@RequestBody @Validated TaiZhangParam taiZhangParam){
String methodDescribe = getMethodDescribe("getThreeYongMonitorByOrgId");
Page<PmsPowerTreeMonitorVO> page = iTerminalEliminateDataService.getThreeMonitorByOrgId(taiZhangParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
}
}

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

@@ -1,10 +1,16 @@
package com.njcn.device.pms.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.param.TaiZhangParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.po.PowerDistributionarea;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -33,5 +39,28 @@ public interface DistributionMonitorMapper extends BaseMapper<DistributionMonito
*/
List<DoubleUserVO> getDoubleUserByDept(@Param("orgId")String orgId);
/**
* 获取I类配网监测点
* @author cdf
* @date 2022/11/25
*/
Page<Monitor> getMonitorByOrg(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam,@Param("deptIds")List<String> deptIds);
/**
* 获取II类配网监测点
* @author cdf
* @date 2022/11/25
*/
Page<PowerDistributionarea> getPowerDisAreaMonitorByOrg(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
/**
* 获取III类配网监测点
* @author cdf
* @date 2022/11/25
*/
Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgIdYong(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgIdFa(Page<Monitor> page, @Param("taiZhangParam")TaiZhangParam taiZhangParam, @Param("deptIds")List<String> deptIds);
}

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

@@ -4,6 +4,7 @@ package com.njcn.device.pms.mapper.majornetwork;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.device.pms.pojo.po.Generatrix;
import com.njcn.device.pms.pojo.po.PowerDistributionarea;
import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
import com.njcn.system.pojo.vo.EventTemplateVO;
@@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Param;
/**
* <p>
* Mapper 接口
* Mapper 台区
* </p>
*
* @author hongawen
@@ -20,4 +21,13 @@ import org.apache.ibatis.annotations.Param;
public interface PowerDistributionareaMapper extends BaseMapper<PowerDistributionarea> {
Page<PowerDistributionareaVO> page(@Param("page")Page<PowerDistributionareaVO> page, @Param("ew") QueryWrapper<PowerDistributionareaVO> queryWrapper);
/**
* 获取台区电压等级（使用台区所属母线电压等级）
* @param distribution 台区编号
* @author cdf
* @date 2022/11/28
*/
Generatrix getGeneratrixByDistributionId(@Param("distribution") String distribution);
}

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

@@ -47,9 +47,69 @@
where fa.org_id = #{orgId}
and dis.status = 1
)
</select>
<select id="getMonitorByOrg" resultType="Monitor">
select a.* from pms_monitor a
inner join pms_distribution_monitor b on a.id = b.Monitor_Id
and b.Monitor_Sort = #{taiZhangParam.lineType}
where a.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
and a.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
and a.status = 1
</select>
<select id="getPowerDisAreaMonitorByOrg" resultType="PowerDistributionarea">
select a.* from pms_power_distributionarea a
inner join pms_distribution_monitor b on a.id = b.Monitor_Id
and b.Monitor_Sort = #{taiZhangParam.lineType}
where a.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
and a.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
and a.status = 1
</select>
<select id="getThreeMonitorByOrgIdYong" resultType="PmsPowerTreeMonitorVO">
select yong.*,0 as type
from pms_power_client yong
inner join pms_distribution_monitor dis on yong.id = dis.Monitor_Id and dis.If_Power_User = 0
where yong.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
and yong.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
and dis.status = 1
</select>
<select id="getThreeMonitorByOrgIdFa" resultType="PmsPowerTreeMonitorVO">
select fa.*,1 as type
from pms_power_generation_user fa
inner join pms_distribution_monitor dis
on fa.id = dis.Monitor_Id
and dis.If_Power_User = 1
where fa.org_id in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
<if test="taiZhangParam.searchValue!='' and taiZhangParam.searchValue !=nlll">
and fa.name like concat('%',#{taiZhangParam.searchValue},'%')
</if>
and dis.status = 1
</select>
</mapper>

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

@@ -7,4 +7,12 @@
FROM pms_power_distributionarea pms_power_distributionarea
WHERE ${ew.sqlSegment}
</select>
<select id="getGeneratrixByDistributionId" resultType="Generatrix">
select c.* from pms_power_distributionarea a
inner join pms_generatrix_wire b on a.Line_Id = b.Wire_Id
inner join pms_generatrix c on b.Generatrix_Id = c.Generatrix_Id
where a.id = #{distribution}
and a.status = 1
</select>
</mapper>

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

@@ -1,7 +1,12 @@
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.RStatPwAlarmDetailParam;
import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
import java.util.List;
/**
* @author jianghf
@@ -10,4 +15,5 @@ import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
*/
public interface RMpPwAlarmDetailDService extends IService<RMpPwAlarmDetailD> {
List<RStatAlarmDetailVO> getAllAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam);
}

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

@@ -1,6 +1,7 @@
package com.njcn.device.pms.service.distribution.impl;
import cn.hutool.core.collection.CollUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.device.pms.mapper.distribution.PwDataQualityCheckMapper;
@@ -65,17 +66,17 @@ public class PwDataQualityCheckServiceImpl implements PwDataQualityCheckService
// 创建集合封装返回数据
List<PwRStatAccountCheckDataVO> result = new ArrayList<>();
// 获取配网数据质量-台帐类数据质量核查
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = pwDataQualityCheckMapper.getYearInfo(deptIds, param, distributionPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = pwDataQualityCheckMapper.getSeasonInfo(deptIds, param, distributionPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = pwDataQualityCheckMapper.getMonthInfo(deptIds, param, distributionPoint);
break;
default:
@@ -114,17 +115,17 @@ public class PwDataQualityCheckServiceImpl implements PwDataQualityCheckService
// 创建集合封装返回数据
List<RStatTargetCheckDataVO> result = new ArrayList<>();
// 获取配网数据质量-监测指标数据质量核查
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = pwRStatTargetCheckDataMapper.getYearInfo(deptIds, param, distributionPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = pwRStatTargetCheckDataMapper.getSeasonInfo(deptIds, param, distributionPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = pwRStatTargetCheckDataMapper.getMonthInfo(deptIds, param, distributionPoint);
break;
default:

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

@@ -1,6 +1,7 @@
package com.njcn.device.pms.service.distribution.impl;
import cn.hutool.core.collection.CollUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
@@ -106,19 +107,19 @@ public class PwDataQualityStatServiceImpl implements PwDataQualityStatService {
// 创建集合封装数据
List<PwRDnOperatingVO> result = new ArrayList<>();
// 日期条件
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = rOperatingIndexMapper.getYearInfo(param,
data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = rOperatingIndexMapper.getSeasonInfo(param,
data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = rOperatingIndexMapper.getMonthInfo(param,
data.stream().map(PmsGeneralDeviceDTO::getIndex).collect(Collectors.toList()));
break;

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

@@ -1,18 +1,123 @@
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.dto.SimpleDTO;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.mapper.distribution.RMpPwAlarmDetailDMapper;
import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
import com.njcn.device.pms.pojo.param.RStatPwAlarmDetailParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.po.RMpPwAlarmDetailD;
import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
import com.njcn.device.pms.pojo.vo.RStatAlarmDetailVO;
import com.njcn.device.pms.service.distribution.IPwMonitorService;
import com.njcn.device.pms.service.distribution.RMpPwAlarmDetailDService;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.web.utils.RequestUtil;
import com.njcn.web.utils.WebUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author jianghf
* @description 针对表【r_mp_pw_alarm_detail_d】的数据库操作Service实现
* @createDate 2022-10-17 09:00:27
*/
@Service
@RequiredArgsConstructor
public class RMpPwAlarmDetailDServiceImpl extends ServiceImpl<RMpPwAlarmDetailDMapper, RMpPwAlarmDetailD>
implements RMpPwAlarmDetailDService{
private final IPmsGeneralDeviceService generalPmsDeviceService;
private final IPwMonitorService iPwMonitorService; //【配网监测点】
private final IMonitorService iMonitorService; //【主网监测点】服务类
@Override
public List<RStatAlarmDetailVO> getAllAlarmDetailList(RStatPwAlarmDetailParam rStatPwAlarmDetailParam) {
//提取参数
String startTime = rStatPwAlarmDetailParam.getStartTime(); //开始时间
String endTime = rStatPwAlarmDetailParam.getEndTime(); //结束时间
//获取登录人当前部门
String deptIndex = RequestUtil.getDeptIndex();
// String deptIndex = "5699e5916a18a6381e1ac92da5bd2628";
PmsDeviceInfoParam pmsDeviceInfoParam = new PmsDeviceInfoParam();
pmsDeviceInfoParam.setStatisticalType(new SimpleDTO());
pmsDeviceInfoParam.setDeptIndex(deptIndex);
//主网监测点id集合
ArrayList<String> zwMonitorIds = new ArrayList<>();
//获取主网台账信息
List<PmsGeneralDeviceDTO> pmsDeviceInfoWithInOrg = generalPmsDeviceService.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam);
pmsDeviceInfoWithInOrg.forEach(item -> {
zwMonitorIds.addAll(item.getMonitorIdList());
});
//查询主网监测点信息
LambdaQueryWrapper<Monitor> zwMonitorLambdaQueryWrapper = new LambdaQueryWrapper<>();
zwMonitorLambdaQueryWrapper.in(CollUtil.isNotEmpty(zwMonitorIds), Monitor::getId, zwMonitorIds);
//主网监测点集合
List<Monitor> zwMonitorList = iMonitorService.list(zwMonitorLambdaQueryWrapper);
Map<String, Monitor> zwMonitorMap = zwMonitorList.stream().collect(Collectors.toMap(Monitor::getId, item -> item));
//获取配网监测点
PwPmsMonitorParam pwPmsMonitorParam = new PwPmsMonitorParam();
pwPmsMonitorParam.setOrgId(deptIndex); //单位id
List<PwPmsMonitorDTO> pwMonitorList = iPwMonitorService.getPwMonitorList(pwPmsMonitorParam);
//配网监测点id集合
List<String> pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList());
//配网监测点Map集合
Map<String, PwPmsMonitorDTO> pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, item -> item));
//合并主网配网监测点id集合（并去重）
ArrayList<String> allMonitorIds = new ArrayList<>();
allMonitorIds.addAll(zwMonitorIds);
allMonitorIds.addAll(pwMonitorIds);
if (CollUtil.isEmpty(allMonitorIds)) {
return new ArrayList<>();
}
//查询告警明细
LambdaQueryWrapper<RMpPwAlarmDetailD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(RMpPwAlarmDetailD::getMeasurementPointId, allMonitorIds)
.ge(StringUtils.isNotBlank(startTime), RMpPwAlarmDetailD::getDataDate, startTime)
.le(StringUtils.isNotBlank(endTime), RMpPwAlarmDetailD::getDataDate, endTime);
List<RMpPwAlarmDetailD> list = this.list(lambdaQueryWrapper);
List<RStatAlarmDetailVO> resultList = list.stream().map(item -> {
RStatAlarmDetailVO rStatAlarmDetailVO = new RStatAlarmDetailVO();
BeanUtils.copyProperties(item, rStatAlarmDetailVO); //监测点id、告警类型、告警描述、告警持续时间
//监测点名称
if (zwMonitorMap.containsKey(item.getMeasurementPointId())) {
rStatAlarmDetailVO.setMeasurementPointName(zwMonitorMap.get(item.getMeasurementPointId()).getName());
} else if (pwMonitorMap.containsKey(item.getMeasurementPointId())) {
rStatAlarmDetailVO.setMeasurementPointName(pwMonitorMap.get(item.getMeasurementPointId()).getMonitorName());
} else {
rStatAlarmDetailVO.setMeasurementPointName("/");
}
return rStatAlarmDetailVO;
}).collect(Collectors.toList());
return resultList;
}
}

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

@@ -2,7 +2,9 @@ package com.njcn.device.pms.service.majornetwork;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
@@ -34,4 +36,26 @@ public interface IDistributionMonitorService extends IService<DistributionMonito
* @date 2022/11/15
*/
List<DoubleUserVO> getDoubleUserByDept(String orgId);
/**
* 新增配网监测点
* @author cdf
* @date 2022/11/23
*/
Boolean addDistributionMonitor(DistributionMonitorParam distributionMonitorParam);
/**
* 查询配网监测点
* @author cdf
* @date 2022/11/29
*/
List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds);
/**
* 删除配网监测点
* @author cdf
* @date 2022/12/5
*/
Boolean delDistributionMonitor(TaiZhangDelParam taiZhangDelParam);
}

12
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.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.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.response.HttpResult;
@@ -15,6 +16,7 @@ import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
import com.njcn.device.pms.pojo.po.Monitor;
import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.web.pojo.param.BaseParam;
import org.springframework.web.bind.annotation.RequestBody;
@@ -74,6 +76,14 @@ public interface IMonitorService extends IService<Monitor> {
Overlimit getOverLimitData(String id);
Page<Monitor> getAllMonitorPageList(BaseParam baseParam);
List<Monitor> getMonitorList(List<String> monitorIds);
List<Monitor> getMonitorListByParam(MonitorParam monitorParam);
/**
* 新增主网监测点
* @author cdf
@@ -90,7 +100,7 @@ public interface IMonitorService extends IService<Monitor> {
* @param monitorParam 主网监测点
* @return boolean
*/
boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam);
boolean updateMonitor(MonitorParam monitorParam);
/**
* 新增主网监测点

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

@@ -3,6 +3,7 @@ package com.njcn.device.pms.service.majornetwork;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.device.pms.pojo.param.PowerClientParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.web.pojo.param.BaseParam;
@@ -61,7 +62,7 @@ public interface IPowerClientService extends IService<PowerClient> {
* @date 2022/10/25
* @return boolean
*/
List<PowerClient> getPowerClientList();
List<PowerClient> getPowerClientList(PowerClientParam powerClientParam);
/**
* 查询用电用户列表
@@ -72,4 +73,9 @@ public interface IPowerClientService extends IService<PowerClient> {
*/
Page<PowerClient> getPowerClientPageList(BaseParam baseParam);
/**
* 查询用电用户列表
*/
List<PowerClient> getPowerUtilizationUserList(PowerUserParam powerUserParam);
}

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

@@ -23,11 +23,17 @@ import java.util.List;
public interface IPowerDistributionareaService extends IService<PowerDistributionarea> {
/**
* 查询所有
* 分页查询所有
* @return
*/
Page<PowerDistributionarea> getList(BaseParam baseParam);
/**
* 查询所有
* @return
*/
List<PowerDistributionarea> getPowerDistributionList(PowerDistributionareaParam powerDistributionareaParam);
/**
* 根据id查询
* @return

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

@@ -2,7 +2,9 @@ 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.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.web.pojo.param.BaseParam;
@@ -60,7 +62,7 @@ public interface IPowerGenerationUserService extends IService<PowerGenerationUse
* @date 2022/10/25
* @return boolean
*/
List<PowerGenerationUser> getPowerGenerationUserList();
List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam);
/**
* 分页查询发电用户列表
@@ -71,4 +73,9 @@ public interface IPowerGenerationUserService extends IService<PowerGenerationUse
*/
Page<PowerGenerationUser> getPowerGenerationUserPageList(BaseParam baseParam);
/**
* 查询发电用户列表
*/
List<PowerGenerationUser> getGenerateElectricityUserList(PowerUserParam powerUserParam);
}

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

@@ -1,11 +1,19 @@
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.po.TerminalEliminateData;
import com.njcn.device.pms.pojo.param.TaiZhangParam;
import com.njcn.device.pms.pojo.po.*;
import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
import io.swagger.annotations.ApiImplicitParam;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* <p>
* 服务类
* 终端操作
* </p>
*
* @author hongawen
@@ -13,4 +21,32 @@ import com.njcn.device.pms.pojo.po.TerminalEliminateData;
*/
public interface ITerminalEliminateDataService extends IService<TerminalEliminateData> {
/**
* 根据组织部门获取自身以及子部门的主网或配网监测点
* @author cdf
* @date 2022/11/23
*/
Page<Monitor> getOneMonitorByOrgId(TaiZhangParam taiZhangParam);
/**
* 根据组织部门获取自身以及子部门的主网或配网监测点
* @author cdf
* @date 2022/11/23
*/
Page<PowerDistributionarea> getTwoMonitorByOrgId(TaiZhangParam taiZhangParam);
/**
* 根据组织部门获取自身以及子部门的主网或配网监测点
* @author cdf
* @date 2022/11/23
*/
Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgId(TaiZhangParam taiZhangParam);
}

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

@@ -18,12 +18,20 @@ import java.util.List;
*/
public interface ITerminalService extends IService<PmsTerminal> {
/**
* 分页查询所有
* @return Page<PmsTerminal>
*/
Page<PmsTerminal> getTerminalList(BaseParam baseParam);
/**
* 查询所有
* @param baseParam
* @return
*/
Page<PmsTerminal> getTerminalList(BaseParam baseParam);
List<PmsTerminal> getTerminalSelectList();
/**
* 根据id查询

10
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITractionStationService.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.PmsTractionStationDTO;
import com.njcn.device.pms.pojo.param.PmsTractionStationParam;
@@ -24,7 +25,14 @@ public interface ITractionStationService extends IService<TractionStation> {
*
* @return boolean
*/
List<TractionStation> getTractionStationList(BaseParam baseParam);
List<TractionStation> getTractionStationList();
/**
* 分页查询牵引站列表
*
* @return boolean
*/
Page<TractionStation> getTractionStationPageList(BaseParam baseParam);
/**
* 查询牵引站

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

@@ -1,6 +1,7 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.collection.CollUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.device.pms.mapper.majornetwork.RStatAccountCheckDataMapper;
@@ -63,17 +64,17 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService {
// 获取主网字典id
String mainnetPoint = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData().getId();
// 获取主网数据质量-台帐类数据质量核查
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = rStatAccountCheckDataMapper.getRStatAccountCheckDataYearInfo(param, deptIdList, mainnetPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = rStatAccountCheckDataMapper.getRStatAccountCheckDataSeasonInfo(param, deptIdList, mainnetPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = rStatAccountCheckDataMapper.getRStatAccountCheckDataMonthInfo(param, deptIdList, mainnetPoint);
break;
default:
@@ -110,17 +111,17 @@ public class DataQualityCheckServiceImpl implements DataQualityCheckService {
// 创建集合封装数据
List<RStatTargetCheckDataVO> result = new ArrayList<>();
// 获取主网数据质量-台帐类数据质量核查
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = rStatTargetCheckDataMapper.getRStatTargetCheckDataYearInfo(param, deptIdList, mainnetPoint);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = rStatTargetCheckDataMapper.getRStatTargetCheckDataSeasonInfo(param, deptIdList, mainnetPoint);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = rStatTargetCheckDataMapper.getRStatTargetCheckDataMonthInfo(param, deptIdList, mainnetPoint);
break;
default:

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

@@ -1,6 +1,7 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.collection.CollUtil;
import com.njcn.common.pojo.constant.BizParamConstant;
import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.device.pms.mapper.majornetwork.ROperatingIndexMapper;
@@ -106,17 +107,17 @@ public class DataQualityStatServiceImpl implements DataQualityStatService {
// 创建集合封装返回数据
List<ROperatingIndexVO> result = new ArrayList<>();
// 获取主网数据质量-监测指标数据质量统计
switch (param.getType()) {
switch (param.getType().toString()) {
// 年
case 1:
case BizParamConstant.STAT_BIZ_YEAR:
result = rOperatingIndexMapper.getYearInfo(param, deptIdList);
break;
// 季
case 2:
case BizParamConstant.STAT_BIZ_QUARTER:
result = rOperatingIndexMapper.getSeasonInfo(param, deptIdList);
break;
// 月
case 3:
case BizParamConstant.STAT_BIZ_MONTH:
result = rOperatingIndexMapper.getMonthInfo(param, deptIdList);
break;
default:

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

@@ -1,26 +1,36 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper;
import com.njcn.device.pms.mapper.majornetwork.*;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
import com.njcn.device.pms.pojo.param.DistributionMonitorParam;
import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
import com.njcn.device.pms.pojo.po.DistributionMonitor;
import com.njcn.device.pms.pojo.param.TaiZhangDelParam;
import com.njcn.device.pms.pojo.po.*;
import com.njcn.device.pms.pojo.vo.DoubleUserVO;
import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.pojo.constant.DicDataConstant;
import com.njcn.system.pojo.po.DictData;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author hongawen
@@ -33,14 +43,136 @@ public class DistributionMonitorServiceImpl extends ServiceImpl<DistributionMoni
private final DicDataFeignClient dicDataFeignClient;
private final MonitorMapper monitorMapper;
private final PowerDistributionareaMapper powerDistributionareaMapper;
private final PowerClientMapper powerClientMapper;
private final PowerGenerationUserMapper powerGenerationUserMapper;
@Override
public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
return this.baseMapper.getIdByOrgId(deptIdList,pmsDeviceInfoParam);
return this.baseMapper.getIdByOrgId(deptIdList, pmsDeviceInfoParam);
}
@Override
public List<DoubleUserVO> getDoubleUserByDept(String orgId) {
return this.baseMapper.getDoubleUserByDept(orgId);
}
@Override
public Boolean addDistributionMonitor(DistributionMonitorParam distributionMonitorParam) {
DictData dictData = dicDataFeignClient.getDicDataById(distributionMonitorParam.getMonitorSort()).getData();
if (Objects.isNull(dictData)) {
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
DistributionMonitor distributionMonitor = new DistributionMonitor();
distributionMonitor.setMonitorSort(dictData.getId());
switch (dictData.getCode()) {
case DicDataConstant.ONE_LINE:
//一类监测点
Monitor monitor = monitorMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(monitor)) {
throw new BusinessException(PmsDeviceResponseEnum.ONE_MONITOR_NOT_FIND);
}
distributionMonitor.setMonitorId(monitor.getId());
distributionMonitor.setCreatedDate(LocalDateTime.now());
distributionMonitor.setIfPowerUser(0);
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setVoltageLevel(monitor.getVoltageLevel());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
this.save(distributionMonitor);
break;
case DicDataConstant.TWO_LINE:
//二类监测点(台区)
PowerDistributionarea powerDistributionarea = powerDistributionareaMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerDistributionarea)) {
throw new BusinessException(PmsDeviceResponseEnum.TWO_MONITOR_NOT_FIND);
}
Generatrix generatrix = powerDistributionareaMapper.getGeneratrixByDistributionId(powerDistributionarea.getId());
distributionMonitor.setMonitorId(powerDistributionarea.getId());
distributionMonitor.setCreatedDate(LocalDateTime.now());
distributionMonitor.setIfPowerUser(0);
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setVoltageLevel(generatrix.getScale());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
this.save(distributionMonitor);
break;
case DicDataConstant.THREE_LINE:
//三类监测点
if (distributionMonitorParam.getSmallType() == 1) {
//发电
PowerGenerationUser powerGenerationUser = powerGenerationUserMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerGenerationUser)) {
throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
}
distributionMonitor.setIfPowerUser(1);
distributionMonitor.setVoltageLevel(powerGenerationUser.getVoltageLevel());
} else {
//用电
PowerClient powerClient = powerClientMapper.selectById(distributionMonitorParam.getMonitorId());
if (Objects.isNull(powerClient)) {
throw new BusinessException(PmsDeviceResponseEnum.THREE_MONITOR_NOT_FIND);
}
distributionMonitor.setIfPowerUser(0);
distributionMonitor.setVoltageLevel(powerClient.getVoltageLevel());
}
distributionMonitor.setMonitorId(distributionMonitorParam.getMonitorId());
distributionMonitor.setCreatedDate(LocalDateTime.now());
distributionMonitor.setMonitorState(distributionMonitorParam.getMonitorState());
distributionMonitor.setStatus(DataStateEnum.ENABLE.getCode());
this.save(distributionMonitor);
break;
default:
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
return true;
}
@Override
public List<DistributionMonitor> distributionMonitorList(List<String> disMonitorIds) {
List<DistributionMonitor> distributionMonitorList = new ArrayList<>();
LambdaQueryWrapper<DistributionMonitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(DistributionMonitor::getStatus, DataStateEnum.ENABLE.getCode());
if (CollUtil.isEmpty(disMonitorIds)) {
distributionMonitorList = this.list(lambdaQueryWrapper);
} else {
lambdaQueryWrapper.in(DistributionMonitor::getMonitorId, disMonitorIds);
distributionMonitorList = this.list(lambdaQueryWrapper);
}
return distributionMonitorList;
}
/**
* 删除配网监测点
*
* @author cdf
* @date 2022/12/5
*/
@Override
public Boolean delDistributionMonitor(TaiZhangDelParam taiZhangDelParam) {
LambdaQueryWrapper<DistributionMonitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
String code = "";
if (taiZhangDelParam.getType().equals(1)) {
code = DicDataEnum.ONE_LINE.getCode();
} else if (taiZhangDelParam.getType().equals(2)) {
code = DicDataEnum.TWO_LINE.getCode();
} else {
code = DicDataEnum.THREE_LINE.getCode();
}
DictData dictData = dicDataFeignClient.getDicDataByCode(code).getData();
if(Objects.isNull(dictData)){
throw new BusinessException(PmsDeviceResponseEnum.NO_LINE_SORT);
}
lambdaQueryWrapper.eq(DistributionMonitor::getMonitorSort,dictData.getId());
lambdaQueryWrapper.in(DistributionMonitor::getMonitorId, taiZhangDelParam.getIds());
return this.remove(lambdaQueryWrapper);
}
}

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

@@ -92,6 +92,8 @@ public class GeneratrixWireImpl extends ServiceImpl<GeneratrixWireMapper, Genera
private void checkName(GeneratrixWireParam generatrixWireParam,Boolean updateFlag){
LambdaQueryWrapper<GeneratrixWire> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(GeneratrixWire::getGeneratrixName,generatrixWireParam.getWireName())
.eq(GeneratrixWire::getGeneratrixId,generatrixWireParam.getGeneratrixId())
@@ -100,6 +102,15 @@ public class GeneratrixWireImpl extends ServiceImpl<GeneratrixWireMapper, Genera
if(updateFlag){
//更新
lambdaQueryWrapper.ne(GeneratrixWire::getWireId,generatrixWireParam.getWireId());
}else {
//新增校验
LambdaQueryWrapper<GeneratrixWire> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.eq(GeneratrixWire::getWireId,generatrixWireParam.getWireId());
int count = this.count(lambdaQuery);
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.WIRE_SAME);
}
}
int count = this.count(lambdaQueryWrapper);
if(count > 0){

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

@@ -1,7 +1,9 @@
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.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -29,12 +31,15 @@ import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.SystemResponseEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.BaseParam;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -133,6 +138,40 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return overlimitMapper.selectById(id);
}
@Override
public Page<Monitor> getAllMonitorPageList(BaseParam baseParam) {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode())
.orderByDesc(Monitor::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}
@Override
public List<Monitor> getMonitorList(List<String> monitorIds) {
List<Monitor> monitorList = new ArrayList<>();
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode());
if(CollUtil.isEmpty(monitorIds)){
//为空查询所有监测点
monitorList = this.list(lambdaQueryWrapper);
}else {
lambdaQueryWrapper.in(Monitor::getId,monitorIds);
monitorList = this.list(lambdaQueryWrapper);
}
return monitorList;
}
@Override
public List<Monitor> getMonitorListByParam(MonitorParam monitorParam) {
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//根据部门
if(StrUtil.isNotBlank(monitorParam.getOrgId())){
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(monitorParam.getOrgId()).getData();
lambdaQueryWrapper.in(Monitor::getOrgId,deptIds).eq(Monitor::getStatus,DataStateEnum.ENABLE.getCode());
}
return this.list(lambdaQueryWrapper);
}
@Override
public boolean addMonitor(MonitorParam monitorParam) {
@@ -145,7 +184,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
}
@Override
public boolean updateMonitor(MonitorParam.UpdateMonitorParam monitorParam) {
public boolean updateMonitor(MonitorParam monitorParam) {
checkParam(monitorParam,true);
Monitor monitor = new Monitor();
BeanUtils.copyProperties(monitorParam,monitor);
@@ -156,7 +195,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
@Override
public boolean delMonitor(List<String> monitorIds) {
return false;
return this.removeByIds(monitorIds);
}
@Override

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

@@ -135,6 +135,14 @@ public class PmsGeneratrixServiceImpl extends ServiceImpl<PmsGeneratrixMapper, G
if(updateFlag){
//更新
lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
}else {
//新增校验
LambdaQueryWrapper<Generatrix> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId());
int count = this.count(lambdaQuery);
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME);
}
}
int count = this.count(lambdaQueryWrapper);
if(count > 0){

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

@@ -2,19 +2,28 @@ 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;
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.PowerClientMapper;
import com.njcn.device.pms.pojo.param.PowerClientParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.service.majornetwork.IPowerClientService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.user.api.DeptFeignClient;
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>
@@ -25,21 +34,36 @@ import java.util.List;
* @since 2022-10-14
*/
@Service
@RequiredArgsConstructor
public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, PowerClient> implements IPowerClientService {
private final DeptFeignClient deptFeignClient;
@Override
public boolean addPowerClient(PowerClientParam powerClientParam) {
LambdaQueryWrapper<PowerClient> che = new LambdaQueryWrapper<>();
che.eq(PowerClient::getId,powerClientParam.getId());
int powerClientCount = this.count(che);
if(powerClientCount>0){
throw new BusinessException(PmsDeviceResponseEnum.POWERCLINET_SAME);
}
checkParam(powerClientParam,false);
PowerClient powerClient = new PowerClient();
BeanUtils.copyProperties(powerClientParam,powerClient);
powerClient.setStatus(DataStateEnum.ENABLE.getCode());
return this.save(powerClient);
}
@Override
public boolean updatePowerClient(PowerClientParam powerClientParam) {
PowerClient powerClient = new PowerClient();
PowerClient powerClient = this.getById(powerClientParam.getId());
if(Objects.isNull(powerClient)){
throw new BusinessException(PmsDeviceResponseEnum.POWER_CLIENT_NOT_FIND);
}
checkParam(powerClientParam,true);
BeanUtils.copyProperties(powerClientParam,powerClient);
return this.save(powerClient);
return this.updateById(powerClient);
}
@Override
@@ -53,8 +77,13 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
}
@Override
public List<PowerClient> getPowerClientList() {
public List<PowerClient> getPowerClientList(PowerClientParam powerClientParam) {
LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(StrUtil.isNotBlank(powerClientParam.getOrgId())){
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerClientParam.getOrgId()).getData();
lambdaQueryWrapper.eq(PowerClient::getOrgId,deptIds).eq(PowerClient::getStatus,DataStateEnum.ENABLE.getCode());
}
lambdaQueryWrapper.select(PowerClient::getId,PowerClient::getName,PowerClient::getOrgId,PowerClient::getOrgName);
lambdaQueryWrapper.orderByDesc(PowerClient::getCreateTime).eq(PowerClient::getStatus, DataStateEnum.ENABLE.getCode());
return this.list(lambdaQueryWrapper);
}
@@ -70,4 +99,31 @@ public class PowerClientServiceImpl extends ServiceImpl<PowerClientMapper, Power
.like(StrUtil.isNotBlank(baseParam.getSearchValue()),PowerClient::getOrgName,baseParam.getSearchValue());
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}
@Override
public List<PowerClient> getPowerUtilizationUserList(PowerUserParam powerUserParam) {
LambdaQueryWrapper<PowerClient> queryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(powerUserParam.getId())){
queryWrapper.eq(PowerClient::getId,powerUserParam.getId());
}
return this.list(queryWrapper);
}
private void checkParam(PowerClientParam powerClientParam, Boolean updateFlag){
LambdaQueryWrapper<PowerClient> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PowerClient::getName,powerClientParam.getName());
if(updateFlag){
lambdaQueryWrapper.ne(PowerClient::getId,powerClientParam.getId());
}else {
lambdaQueryWrapper.or().eq(PowerClient::getId,powerClientParam.getId());
}
int count = this.count(lambdaQueryWrapper);
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
}
}
}

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

@@ -9,7 +9,9 @@ import com.njcn.common.pojo.exception.BusinessException;
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.PowerClient;
import com.njcn.device.pms.pojo.po.PowerDistributionarea;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.pojo.po.StatationStat;
import com.njcn.device.pms.pojo.vo.PowerDistributionareaVO;
import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService;
@@ -61,6 +63,18 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
}
@Override
public List<PowerDistributionarea> getPowerDistributionList(PowerDistributionareaParam powerDistributionareaParam) {
LambdaQueryWrapper<PowerDistributionarea> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
lambdaQueryWrapper.in(PowerDistributionarea::getOrgId,deptIds).eq(PowerDistributionarea::getStatus,DataStateEnum.ENABLE.getCode());
}
lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName);
lambdaQueryWrapper.orderByDesc(PowerDistributionarea::getCreateTime);
return this.list(lambdaQueryWrapper);
}
/**
* 根据id查询
* @author hany
@@ -78,6 +92,12 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
*/
@Override
public boolean add(PowerDistributionareaParam newParam) {
LambdaQueryWrapper<PowerDistributionarea> che = new LambdaQueryWrapper<>();
che.eq(PowerDistributionarea::getId,newParam.getId());
int count = this.count(che);
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.POWER_CODE_SAME);
}
checkName(newParam,true);
Dept dept = deptFeignClient.getDeptByCode(newParam.getOrgId()).getData();
@@ -110,8 +130,11 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
*/
@Override
public boolean update(PowerDistributionareaParam updateParam) {
PowerDistributionarea powerDistributionarea = this.getById(updateParam.getId());
if(Objects.isNull(powerDistributionarea)){
throw new BusinessException(PmsDeviceResponseEnum.POWER_DIS_NOT_FIND);
}
checkName(updateParam,false);
PowerDistributionarea powerDistributionarea = new PowerDistributionarea();
BeanUtils.copyProperties(updateParam,powerDistributionarea);
return this.updateById(powerDistributionarea);
}
@@ -133,9 +156,7 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
lambdaQueryWrapper.eq(PowerDistributionarea::getName,newParam.getName());
//修改
if(!flag){
if(newParam instanceof PowerDistributionareaParam){
lambdaQueryWrapper.ne(PowerDistributionarea::getId,newParam.getId());
}
lambdaQueryWrapper.ne(PowerDistributionarea::getId,newParam.getId());
}
int result = this.count(lambdaQueryWrapper);
//大于等于1个则表示重复

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

@@ -4,17 +4,25 @@ 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.PowerGenerationUserMapper;
import com.njcn.device.pms.pojo.param.PowerDistributionareaParam;
import com.njcn.device.pms.pojo.param.PowerGenerationUserParam;
import com.njcn.device.pms.pojo.param.PowerUserParam;
import com.njcn.device.pms.pojo.po.PowerClient;
import com.njcn.device.pms.pojo.po.PowerGenerationUser;
import com.njcn.device.pms.service.majornetwork.IPowerGenerationUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.user.api.DeptFeignClient;
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>
@@ -25,20 +33,35 @@ import java.util.List;
* @since 2022-10-14
*/
@Service
@RequiredArgsConstructor
public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationUserMapper, PowerGenerationUser> implements IPowerGenerationUserService {
private final DeptFeignClient deptFeignClient;
@Override
public boolean addPowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
LambdaQueryWrapper<PowerGenerationUser> che = new LambdaQueryWrapper<>();
che.eq(PowerGenerationUser::getId,powerGenerationUserParam.getId());
int powerClientCount = this.count(che);
if(powerClientCount>0){
throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
}
checkParam(powerGenerationUserParam,false);
PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
powerGenerationUser.setStatus(DataStateEnum.ENABLE.getCode());
return this.save(powerGenerationUser);
}
@Override
public boolean updatePowerGenerationUser(PowerGenerationUserParam powerGenerationUserParam) {
PowerGenerationUser powerGenerationUser = new PowerGenerationUser();
PowerGenerationUser powerGenerationUser = this.getById(powerGenerationUserParam.getId());
if(Objects.isNull(powerGenerationUser)){
throw new BusinessException(PmsDeviceResponseEnum.POWER_GEN_NOT_FIND);
}
checkParam(powerGenerationUserParam,true);
BeanUtils.copyProperties(powerGenerationUserParam,powerGenerationUser);
return this.save(powerGenerationUser);
return this.updateById(powerGenerationUser);
}
@Override
@@ -52,8 +75,13 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
}
@Override
public List<PowerGenerationUser> getPowerGenerationUserList() {
public List<PowerGenerationUser> getPowerGenerationUserList(PowerDistributionareaParam powerDistributionareaParam) {
LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
if(StrUtil.isNotBlank(powerDistributionareaParam.getOrgId())){
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(powerDistributionareaParam.getOrgId()).getData();
lambdaQueryWrapper.in(PowerGenerationUser::getOrgId,deptIds).eq(PowerGenerationUser::getStatus,DataStateEnum.ENABLE.getCode());
}
lambdaQueryWrapper.select(PowerGenerationUser::getName,PowerGenerationUser::getId,PowerGenerationUser::getOrgId,PowerGenerationUser::getOrgName);
lambdaQueryWrapper.orderByDesc(PowerGenerationUser::getCreateTime).eq(PowerGenerationUser::getStatus, DataStateEnum.ENABLE.getCode());
return this.list(lambdaQueryWrapper);
}
@@ -68,5 +96,33 @@ public class PowerGenerationUserServiceImpl extends ServiceImpl<PowerGenerationU
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}
@Override
public List<PowerGenerationUser> getGenerateElectricityUserList(PowerUserParam powerUserParam) {
LambdaQueryWrapper<PowerGenerationUser> queryWrapper = new LambdaQueryWrapper<>();
if (StrUtil.isNotBlank(powerUserParam.getId())){
queryWrapper.eq(PowerGenerationUser::getId,powerUserParam.getId());
}
return this.list(queryWrapper);
}
private void checkParam(PowerGenerationUserParam powerGenerationUserParam,Boolean updateFlag){
LambdaQueryWrapper<PowerGenerationUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PowerGenerationUser::getName,powerGenerationUserParam.getName());
if(updateFlag){
lambdaQueryWrapper.ne(PowerGenerationUser::getId,powerGenerationUserParam.getId());
}else {
lambdaQueryWrapper.or().eq(PowerGenerationUser::getId,powerGenerationUserParam.getId());
}
int count = this.count(lambdaQueryWrapper);
if(count>0){
throw new BusinessException(PmsDeviceResponseEnum.POWERGENERATIONUSER_SAME);
}
}
}

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

@@ -152,18 +152,28 @@ implements RStatZwAlarmCountWService {
.ge(StringUtils.isNotBlank(startTime), RMpTargetWarnD::getDataDate, startTime)
.le(StringUtils.isNotBlank(endTime), RMpTargetWarnD::getDataDate, endTime)
.groupBy(RMpTargetWarnD::getMeasurementPointId)
//拼接or条件
.or(qw ->
qw.eq(RMpTargetWarnD::getIsEffective, 1) //是否是有效接入监测点(0:否 1:是)
.eq(RMpTargetWarnD::getIsHarmonic, 1) //是否是稳态超标监测点(0:否 1:是)
//拼接条件
.and(qw ->
qw.eq(RMpTargetWarnD::getIsEffective, 0)//是否是有效接入监测点(0:否 1:是)
.or() //开始拼接or条件
.eq(RMpTargetWarnD::getIsHarmonic, 1)//是否是稳态超标监测点(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsEvent, 1) //是否是发生暂态的监测点(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsWarn, 1) //是否是告警监测点数(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsVDevWarn, 1) //电压偏差是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsFreqWarn, 1) //频率偏差是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsUnbalanceWarn, 1) //三相电压不平衡度是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsVWarn, 1) //谐波电压是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsFlickerWarn, 1) //闪变是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsSagWarn, 1) //电压暂降是否告警(0:否 1:是)
.or()
.eq(RMpTargetWarnD::getIsInterruptWarn, 1) //短时中断是否告警(0:否 1:是)
)
.having("count(measurement_point_id) >= {0}", 4);

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

@@ -2,6 +2,7 @@ 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.common.pojo.enums.common.DataStateEnum;
import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
import com.njcn.device.pms.pojo.dto.PmsStatationStatInfoDTO;
import com.njcn.device.pms.pojo.param.StatationStatParam;
@@ -47,6 +48,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
public boolean addStatationStat(StatationStatParam statationStatParam) {
StatationStat statationStat = new StatationStat();
BeanUtils.copyProperties(statationStatParam, statationStat);
statationStat.setStatus(DataStateEnum.ENABLE.getCode());
return this.save(statationStat);
}
@@ -54,7 +56,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
public boolean updateStatationStat(StatationStatParam statationStatParam) {
StatationStat statationStat = new StatationStat();
BeanUtils.copyProperties(statationStatParam, statationStat);
return this.save(statationStat);
return this.updateById(statationStat);
}
@Override

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

@@ -1,11 +1,34 @@
package com.njcn.device.pms.service.majornetwork.impl;
import com.njcn.device.pms.mapper.majornetwork.TerminalEliminateDataMapper;
import com.njcn.device.pms.pojo.po.TerminalEliminateData;
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.*;
import com.njcn.device.pms.pojo.param.TaiZhangParam;
import com.njcn.device.pms.pojo.po.*;
import com.njcn.device.pms.pojo.vo.PmsPowerTreeMonitorVO;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.device.pms.service.majornetwork.ITerminalEliminateDataService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.enums.DicDataTypeEnum;
import com.njcn.system.enums.SystemResponseEnum;
import com.njcn.system.pojo.constant.DicDataConstant;
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* <p>
* 服务实现类
@@ -15,6 +38,77 @@ import org.springframework.stereotype.Service;
* @since 2022-10-14
*/
@Service
@RequiredArgsConstructor
public class TerminalEliminateDataServiceImpl extends ServiceImpl<TerminalEliminateDataMapper, TerminalEliminateData> implements ITerminalEliminateDataService {
private final MonitorMapper monitorMapper;
private final DicDataFeignClient dicDataFeignClient;
private final DeptFeignClient deptFeignClient;
private final DistributionMonitorMapper distributionMonitorMapper;
private final PowerDistributionareaMapper powerDistributionareaMapper;
private final PowerClientMapper powerClientMapper;
private final PowerGenerationUserMapper powerGenerationUserMapper;
@Override
public Page<Monitor> getOneMonitorByOrgId(TaiZhangParam taiZhangParam) {
Page<Monitor> monitorPage = new Page<>();
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
if(taiZhangParam.getDataType() == 0){
//主网
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(Monitor::getOrgId,deptIds)
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).orderByDesc(Monitor::getCreateTime);
monitorPage = monitorMapper.selectPage(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),lambdaQueryWrapper);
}else {
//配网
DictData one = dicDataFeignClient.getDicDataByCode(DicDataEnum.ONE_LINE.getCode()).getData();
taiZhangParam.setLineType(one.getId());
monitorPage = distributionMonitorMapper.getMonitorByOrg(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
}
return monitorPage;
}
@Override
public Page<PowerDistributionarea> getTwoMonitorByOrgId(TaiZhangParam taiZhangParam) {
Page<PowerDistributionarea> monitorPage = new Page<>();
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
if(taiZhangParam.getDataType() == 0){
}else {
DictData two = dicDataFeignClient.getDicDataByCode(DicDataEnum.TWO_LINE.getCode()).getData();
taiZhangParam.setLineType(two.getId());
monitorPage = distributionMonitorMapper.getPowerDisAreaMonitorByOrg(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
}
return monitorPage;
}
@Override
public Page<PmsPowerTreeMonitorVO> getThreeMonitorByOrgId(TaiZhangParam taiZhangParam) {
Page<PmsPowerTreeMonitorVO> monitorPage = new Page<>();
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(taiZhangParam.getOrgId()).getData();
if(taiZhangParam.getDataType() == 0){
}else {
if(Objects.isNull(taiZhangParam.getTreeType())){
throw new BusinessException(PmsDeviceResponseEnum.POWER_CLIENT_DIS_EMPTY);
}
//配网
DictData three = dicDataFeignClient.getDicDataByCode(DicDataEnum.THREE_LINE.getCode()).getData();
taiZhangParam.setLineType(three.getId());
if(taiZhangParam.getTreeType().equals(0)){
//用电
monitorPage = distributionMonitorMapper.getThreeMonitorByOrgIdYong(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
}else {
//
monitorPage = distributionMonitorMapper.getThreeMonitorByOrgIdFa(new Page<>(PageFactory.getPageNum(taiZhangParam),PageFactory.getPageSize(taiZhangParam)),taiZhangParam,deptIds);
}
}
return monitorPage;
}
}

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

@@ -23,6 +23,8 @@ import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
@@ -59,6 +61,15 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
}
@Override
public List<PmsTerminal> getTerminalSelectList() {
LambdaQueryWrapper<PmsTerminal> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(PmsTerminal::getName,PmsTerminal::getOrgId,PmsTerminal::getOrgName,PmsTerminal::getId);
lambdaQueryWrapper.eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode())
.orderByDesc(PmsTerminal::getCreateTime);
return this.list(lambdaQueryWrapper);
}
/**
* 根据id查询
* @author hany
@@ -102,6 +113,8 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
pmsTerminal.setPowerrName(statationStat.getPowerName());
//设为正常状态
pmsTerminal.setStatus(DataStateEnum.ENABLE.getCode());
pmsTerminal.setVerificationDate(LocalDate.parse(terminalParam.getVerificationDate()));
pmsTerminal.setUseDate(LocalDate.parse(terminalParam.getUseDate()));
return this.save(pmsTerminal);
}
@@ -115,6 +128,8 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
checkName(updateParam,false);
PmsTerminal pmsTerminal = new PmsTerminal();
BeanUtils.copyProperties(updateParam, pmsTerminal);
pmsTerminal.setVerificationDate(LocalDate.parse(updateParam.getVerificationDate()));
pmsTerminal.setUseDate(LocalDate.parse(updateParam.getUseDate()));
return this.updateById(pmsTerminal);
}

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

@@ -1,6 +1,9 @@
package com.njcn.device.pms.service.majornetwork.impl;
import cn.hutool.core.collection.CollectionUtil;
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;
@@ -11,11 +14,14 @@ import com.njcn.device.pms.pojo.param.TractionStationParam;
import com.njcn.device.pms.pojo.po.TractionStation;
import com.njcn.device.pms.service.majornetwork.ITractionStationService;
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;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -34,13 +40,36 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
/**
* 查询牵引站列表
* @return
*/
@Override
public List<TractionStation> getTractionStationList() {
LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(TractionStation::getStatus,DataStateEnum.ENABLE.getCode())
.orderByDesc(TractionStation::getCreateTime);
return this.list();
}
/**
* 分页查询牵引站列表
*
* @param baseParam
* @return
*/
@Override
public List<TractionStation> getTractionStationList(BaseParam baseParam) {
return this.list();
public Page<TractionStation> getTractionStationPageList(BaseParam baseParam) {
LambdaQueryWrapper<TractionStation> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(TractionStation::getStatus,DataStateEnum.ENABLE.getCode())
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOrgName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getOperationName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.like(StrUtil.isNotEmpty(baseParam.getSearchValue()),TractionStation::getPowerName,baseParam.getSearchValue())
.or(StrUtil.isNotEmpty(baseParam.getSearchValue()))
.orderByDesc(TractionStation::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper);
}
/**
@@ -67,6 +96,7 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
BeanUtils.copyProperties(tractionStationParam, tractionStation);
//设为正常状态
tractionStation.setStatus(DataStateEnum.ENABLE.getCode());
tractionStation.setCreatedDate(LocalDate.parse(tractionStationParam.getCreatedDate()));
return this.save(tractionStation);
}
@@ -81,6 +111,7 @@ public class TractionStationServiceImpl extends ServiceImpl<TractionStationMappe
checkName(updateParam, false);
TractionStation tractionStation = new TractionStation();
BeanUtils.copyProperties(updateParam, tractionStation);
tractionStation.setCreatedDate(LocalDate.parse(updateParam.getCreatedDate()));
return this.updateById(tractionStation);
}