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

代码调整

Browse Source
This commit is contained in:
chendaofei
2025-08-29 16:07:05 +08:00
parent 43e7688d9a
commit 59aad2c89c
6 changed files with 109 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/enums/RunFlagEnum.java
View File

@@ -16,7 +16,19 @@ public enum RunFlagEnum {
CHECK(1, "检修"),
STOP(2, "停运"),
TEST(3, "调试"),
QUIT(4, "退运");
QUIT(4, "退运"),
GW_FLAG(0,"主网"),
PW_FLAG(1,"配网"),
;
/**
* 状态

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

@@ -1,10 +1,13 @@
package com.njcn.device.biz.utils;
import com.njcn.device.biz.enums.RunFlagEnum;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.system.enums.DicDataEnum;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Objects;
/**
* pqs
@@ -50,7 +53,7 @@ public class COverlimitUtil {
threeVoltageUnbalance(overlimit);
interharmonicCurrent(overlimit,voltageLevel);
if(lineType == 1) {
if(Objects.equals(lineType, RunFlagEnum.PW_FLAG.getStatus())) {
//配网
Float[] iHarmTem = new Float[49];
for (int i = 0; i <= 48; i++) {

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

@@ -2947,7 +2947,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(terminalBaseExcel.getSubvScale(), DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
lineDetailMapper.insert(lineDetail);
Overlimit overlimit = new Overlimit(temp.getId(), dictData.getValue(), terminalBaseExcel.getShortCapacity(), terminalBaseExcel.getStandardCapacity(), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity());
Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(dictData.getValue()),terminalBaseExcel.getDealCapacity(),terminalBaseExcel.getDevCapacity(),terminalBaseExcel.getShortCapacity(),null,null);
overlimit.setId(temp.getId());
overlimitMapper.insert(overlimit);
}