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-15 10:36:12 +08:00
parent c43b64faa5
commit 339cf9c75e
85 changed files with 4172 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,13 @@ public interface DistributionMonitorClient {
*/
@PostMapping("distributionMonitorList")
HttpResult<List<DistributionMonitor>> distributionMonitorList(@RequestBody List<String> monitorIds);
/**
* @Description: 获取配网所有监测点数据
* @Param: []
* @return: com.njcn.common.pojo.response.HttpResult<java.util.List<com.njcn.device.pms.pojo.po.DistributionMonitor>>
* @Author: clam
* @Date: 2022/12/13
*/
@PostMapping("distributionMonitorListByCondition")
public HttpResult<List<DistributionMonitor>> distributionMonitorListByCondition(@RequestParam("orgId")String orgId,@RequestParam("monitorSort")String monitorSort);
}

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

@@ -31,4 +31,12 @@ public interface PwMonitorClient {
*/
@PostMapping("/getPwMonitorList")
HttpResult<List<PwPmsMonitorDTO>> getPwMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
/**
* 获取分布式光伏配网所有监测点信息
* @param pwPmsMonitorParam 参数条件
* @return 配网所有监测点信息
*/
@PostMapping("/getPwPhotovoltaicMonitorList")
HttpResult<List<PwPmsMonitorDTO>> getPwPhotovoltaicMonitorList(@RequestBody PwPmsMonitorParam pwPmsMonitorParam);
}

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

@@ -53,6 +53,12 @@ public class DistributionMonitorClientFallbackFactory implements FallbackFactory
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<DistributionMonitor>> distributionMonitorListByCondition(@RequestParam("orgId")String orgId,@RequestParam("monitorSort")String monitorSort) {
log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}

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

@@ -38,6 +38,12 @@ public class PwMonitorClientFallbackFactory implements FallbackFactory<PwMonitor
log.error("{}异常，降级处理，异常为：{}", "获取配网所有监测点信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<PwPmsMonitorDTO>> getPwPhotovoltaicMonitorList(PwPmsMonitorParam pwPmsMonitorParam) {
log.error("{}异常，降级处理，异常为：{}", "获取分布式光伏配网所有监测点信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

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

@@ -3,7 +3,7 @@ package com.njcn.device.pms.pojo.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.time.LocalDateTime;
/**
* (PmsTractionStation)实体类
@@ -22,6 +22,10 @@ public class PmsTractionStationDTO implements Serializable {
* 牵引站名称
*/
private String name;
/**
* 铁路类型
*/
private Integer railwayType;
/**
* 组织机构名称
*/
@@ -77,7 +81,7 @@ public class PmsTractionStationDTO implements Serializable {
/**
* 创建日期
*/
private Date createdDate;
private LocalDateTime createdDate;
/**
* 用户标签
*/
@@ -97,7 +101,7 @@ public class PmsTractionStationDTO implements Serializable {
/**
* 创建时间
*/
private Date createTime;
private LocalDateTime createTime;
/**
* 更新用户
*/
@@ -105,7 +109,7 @@ public class PmsTractionStationDTO implements Serializable {
/**
* 更新时间
*/
private Date updateTime;
private LocalDateTime updateTime;
}

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

@@ -0,0 +1,51 @@
package com.njcn.device.pms.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* <专项分析-入参>
*
* @author wr
* @createTime: 2022-12-01
*/
@Data
public class SpecialAnalysisParam {
// @ApiModelProperty(name = "id", value = "按单位统计，id为单位索引")
// private String id;
@ApiModelProperty(name = "type", value = "类型(0-风电场 1-光伏电站 2冶炼负荷)")
private Integer type;
/**
* 数据传参
*/
@Data
public static class CompareDateParam {
@ApiModelProperty(name = "year", value = "年份")
private String year;
@ApiModelProperty(name = "month", value = "月份")
private List<String> month;
}
/**
* 数据传参
*/
@Data
public static class CompareParam {
@ApiModelProperty(name = "powerVoltageLevel", value = "电压等级")
private List<String> powerVoltageLevel;
@ApiModelProperty(name = "year", value = "年份")
private String year;
@ApiModelProperty(name = "month", value = "月份")
private List<String> month;
}
}

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* 牵引站台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类
* 台账数据质量问题-核查详情(RStatTractionStationAccountDetail)实体类
*
* @author yzh
* @since 2022-11-09 09:42:42

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

@@ -0,0 +1,222 @@
package com.njcn.device.pms.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 专项分析
* @author wr
*/
@Data
public class SpecialAnalysisMonitorVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 监测点信息
*/
@ApiModelProperty(name = "specialAnalysisVOList", value = "监测点信息")
List<SpecialAnalysisMonitorVO.SpecialAnalysisVO> specialAnalysisVOList;
/**
* 电压等级分布（监测点）
*/
@ApiModelProperty(name = "voltageLevelMap", value = "电压等级分布（监测点）")
List<Map<String,String>> voltageLevelMap;
/**
* 同环比详细数据
*/
// @ApiModelProperty(name = "compareVOMap", value = "同比环比详细数据")
// Map<String,CompareVO> compareVOMap;
/**
* 监测点信息
*/
@Data
public static class SpecialAnalysisVO {
private static final long serialVersionUID = 1L;
/**
* 监测点ID
*/
@ApiModelProperty(name = "id", value = "监测点ID")
private String id;
/**
* 监测点名称
*/
@ApiModelProperty(name = "name", value = "监测点名称")
private String name;
/**
* 电站ID(外键)
*/
@ApiModelProperty(name = "powerrId", value = "电站ID(外键)")
private String powerrId;
/**
* 变电站名称
*/
@ApiModelProperty(name = "powerrName", value = "变电站名称")
private String powerrName;
/**
* 经度
*/
@ApiModelProperty(name = "longitude", value = "经度")
private Double longitude;
/**
* 维度
*/
@ApiModelProperty(name = "latitude", value = "维度")
private Double latitude;
/**
* 电压等级(字典)
*/
@ApiModelProperty(name = "voltageLevel", value = "电压等级(字典)")
private String voltageLevel;
/**
* 监测点容量
*/
@ApiModelProperty(name = "capacity", value = "监测点容量")
private Double capacity;
/**
* 监测点标签
*/
@ApiModelProperty(name = "monitorTag", value = "监测点标签")
private String monitorTag;
/**
* 关联的监测终端编号(外键)
*/
@ApiModelProperty(name = "terminalId", value = "关联的监测终端编号(外键)")
private String terminalId;
}
/**
* 数据比较
*/
@Data
public static class CompareVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "tractionStation", value = "名称")
private String name;
@ApiModelProperty(name = "tractionStation", value = "牵引站数量")
private String tractionStation;
@ApiModelProperty(name = "num", value = "监测点数量")
private String num;
@ApiModelProperty(name = "ytbSumNum", value = "同比数量")
private String ytbSumNum;
@ApiModelProperty(name = "yhbSumNum", value = "环比数量")
private String yhbSumNum;
@ApiModelProperty(name = "sameNum", value = "监测点数量同比")
private String sameNum;
@ApiModelProperty(name = "ringNum", value = "监测点数量环比")
private String ringNum;
}
/**
* 接线类型详细信息
*/
@Data
public static class WiringTypeDetail {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "connet_group_way", value = "接线类型")
private String connetGroupWay;
@ApiModelProperty(name = "num", value = "牵引站数量")
private String num;
@ApiModelProperty(name = "rateAvg", value = "负载量（平均值）")
private String rateAvg;
@ApiModelProperty(name = "rate95", value = "负载量（95值）")
private String rate95;
@ApiModelProperty(name = "rate99", value = "负载量（99值）")
private String rate99;
}
@Data
public static class CompareDetailVO {
private static final long serialVersionUID = 1L;
/**
* 风电场 same同比 ring环比
*/
private String sumNum;
private String ytbSumNum;
private String yhbSumNum;
private String sameNum;
private String ringNum;
private String capacity;
private String ytbCapacity;
private String yhbCapacity;
private String sameCapacity;
private String ringCapacity;
/**
* 光伏电站 same同比 ring环比
*/
private String sumNum2;
private String ytbSumNum2;
private String yhbSumNum2;
private String sameNum2;
private String ringNum2;
private String capacity2;
private String ytbCapacity2;
private String yhbCapacity2;
private String sameCapacity2;
private String ringCapacity2;
/**
* 电气化铁路 same同比 ring环比
*/
private String sumNum3;
private String ytbSumNum3;
private String yhbSumNum3;
private String sameNum3;
private String ringNum3;
private String capacity3;
private String ytbCapacity3;
private String yhbCapacity3;
private String sameCapacity3;
private String ringCapacity3;
/**
* 冶炼负荷 same同比 ring环比
*/
private String sumNum4;
private String ytbSumNum4;
private String yhbSumNum4;
private String sameNum4;
private String ringNum4;
private String capacity4;
private String ytbCapacity4;
private String yhbCapacity4;
private String sameCapacity4;
private String ringCapacity4;
}
}