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

pms代码调整

Browse Source
This commit is contained in:
雨木c
2023-10-12 12:38:51 +08:00
parent 51acc3edf7
commit 5e44908641
13 changed files with 176 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/commApi/fallback/CommTerminalGeneralClientFallbackFactory.java
View File

@@ -126,7 +126,7 @@ public class CommTerminalGeneralClientFallbackFactory implements FallbackFactory
@Override
public HttpResult<LineDevGetDTO> getMonitorDetail(String lineId) {
log.error("{}异常，降级处理，异常为：{}", "获取监测点详细信息集合", throwable.toString());
log.error("{}异常，降级处理，异常为：{}", "获取监测点详细信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}

2
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetDeviceDTO.java
View File

@@ -16,7 +16,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class DeptGetDeviceDTO extends DeptGetBase {
@ApiModelProperty(name = "deviceList",value = "装置信息")
@ApiModelProperty(name = "deviceList",value = "主网装置信息")
private List<LineDevGetDTO> deviceList;
@ApiModelProperty(name = "pwDeviceList",value = "配网装置信息")

3
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimitUtil.java
View File

@@ -41,7 +41,8 @@ public class COverlimitUtil {
* @param powerFlag 0.用户侧 1.电网侧
* @param lineType 0.主网 1.配网 需要注意配网目前没有四种容量，谐波电流幅值限值,负序电流限值无法计算默认-3.14159
*/
public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity, Float shortCapacity, Integer powerFlag, Integer lineType) {
public static Overlimit globalAssemble(Float voltageLevel, Float protocolCapacity, Float devCapacity,
Float shortCapacity, Integer powerFlag, Integer lineType) {
Overlimit overlimit = new Overlimit();
voltageDeviation(overlimit,voltageLevel);
frequency(overlimit);