合并代码

This commit is contained in:
2022-12-07 10:52:13 +08:00
parent cdf75aaea1
commit 60c2779fe0
156 changed files with 6242 additions and 644 deletions

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

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

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

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

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类监测点信息"),

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

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

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 = "测量信号输入形式")

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;
/**
* 用户分类(字典)
*/

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;
/**
* 电源类别(字典)
*/

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

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

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

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

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

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;

View File

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

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;

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

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

View File

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

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

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;