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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Lee
2023-04-03 16:31:36 +08:00
parent bdad44688b 7f6db2b66c
commit dcedbc54a6
8 changed files with 196 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-core/src/main/java/com/njcn/common/pojo/enums/response/CommonResponseEnum.java
View File

@@ -46,7 +46,7 @@ public enum CommonResponseEnum {
SM2_CIPHER_ERROR("A0015", "SM2获取秘钥对异常"), SM2_CIPHER_ERROR("A0015", "SM2获取秘钥对异常"),
UN_DECLARE("A0016", "未声明异常"), UN_DECLARE("A0016", "后台接口异常"),
DIC_DATA("A0017", "获取字典数据失败"), DIC_DATA("A0017", "获取字典数据失败"),

163
pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java
View File

@@ -2,6 +2,7 @@ package com.njcn.device.biz.utils;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -28,6 +29,7 @@ public class COverlimit {
private static float[] fUDevL_Limit = {-3, -7, -10}; private static float[] fUDevL_Limit = {-3, -7, -10};
//谐波电流幅值系数
private static final double[][] ARR = { private static final double[][] ARR = {
{78, 62, 39, 62, 26, 44, 19, 21, 16, 28, 13, 24, 11, 12, 9.7, 18, 8.6, 16, 7.8, 8.9, 7.1, 14, 6.5, 12, 6.0, 6.9, 5.6, 11, 5.2, 10, 4.9, 5.6, 4.6, 8.9, 4.3, 8.4, 4.1, 4.8, 3.9, 7.6, 3.7, 7.2, 3.5, 4.1, 3.4, 6.6, 3.3, 6.3, 3.1}, {78, 62, 39, 62, 26, 44, 19, 21, 16, 28, 13, 24, 11, 12, 9.7, 18, 8.6, 16, 7.8, 8.9, 7.1, 14, 6.5, 12, 6.0, 6.9, 5.6, 11, 5.2, 10, 4.9, 5.6, 4.6, 8.9, 4.3, 8.4, 4.1, 4.8, 3.9, 7.6, 3.7, 7.2, 3.5, 4.1, 3.4, 6.6, 3.3, 6.3, 3.1},
{43, 34, 21, 34, 14, 24, 11, 11, 8.5, 16, 7.1, 13, 6.1, 6.8, 5.3, 10, 4.7, 9, 4.3, 4.9, 3.9, 7.4, 3.6, 6.8, 3.3, 3.8, 3.1, 5.9, 2.9, 5.5, 2.7, 3.1, 2.5, 4.9, 2.4, 4.6, 2.3, 2.6, 2.2, 4.1, 2.0, 4.0, 2.0, 2.3, 1.9, 3.6, 1.8, 3.5, 1.7}, {43, 34, 21, 34, 14, 24, 11, 11, 8.5, 16, 7.1, 13, 6.1, 6.8, 5.3, 10, 4.7, 9, 4.3, 4.9, 3.9, 7.4, 3.6, 6.8, 3.3, 3.8, 3.1, 5.9, 2.9, 5.5, 2.7, 3.1, 2.5, 4.9, 2.4, 4.6, 2.3, 2.6, 2.2, 4.1, 2.0, 4.0, 2.0, 2.3, 1.9, 3.6, 1.8, 3.5, 1.7},
@@ -38,9 +40,6 @@ public class COverlimit {
}; };
private static float[] fILimitCoe = {
2.0f, 1.1f, 2.0f, 1.2f, 2.0f, 1.4f, 2.0f, 2.0f, 2.0f, 1.8f, 2.0f, 1.9f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f
};
//间谐波含有率 //间谐波含有率
private static float[] InharmLimit1 = { private static float[] InharmLimit1 = {
@@ -52,10 +51,12 @@ public class COverlimit {
private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率 private static float GetVoltageLimit(int nHarm, int iScaleSelect)//谐波含有率
{ {
if (nHarm < 0) if (nHarm < 0) {
return 0.0f; return 0.0f;
if (iScaleSelect >= MAX_SCALE_NO) }
if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f; return 0.0f;
}
switch (iScaleSelect) { switch (iScaleSelect) {
case 6: case 6:
iScaleSelect = 4; iScaleSelect = 4;
@@ -67,13 +68,16 @@ public class COverlimit {
iScaleSelect = 0; iScaleSelect = 0;
break; break;
} }
if (iScaleSelect < 2) if (iScaleSelect < 2) {
iScaleSelect = 0; iScaleSelect = 0;
else }
else {
iScaleSelect--; iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 1; int nSelect = iScaleSelect * 4 + 1;
if (nHarm % 2 == 0) if (nHarm % 2 == 0) {
nSelect = iScaleSelect * 4 + 2; nSelect = iScaleSelect * 4 + 2;
}
return fULimit[nSelect]; return fULimit[nSelect];
} }
@@ -93,18 +97,21 @@ public class COverlimit {
iScaleSelect = 0; iScaleSelect = 0;
break; break;
} }
if (iScaleSelect < 2) if (iScaleSelect < 2) {
iScaleSelect = 0; iScaleSelect = 0;
else }
else {
iScaleSelect--; iScaleSelect--;
}
int nSelect = iScaleSelect * 4; int nSelect = iScaleSelect * 4;
return fULimit[nSelect]; return fULimit[nSelect];
} }
private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差 private static float GetVoltageDevationLimit(int iScaleSelect)//电压偏差
{ {
if (iScaleSelect >= MAX_SCALE_NO) if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f; return 0.0f;
}
switch (iScaleSelect) { switch (iScaleSelect) {
case 6: case 6:
iScaleSelect = 4; iScaleSelect = 4;
@@ -116,23 +123,28 @@ public class COverlimit {
iScaleSelect = 0; iScaleSelect = 0;
break; break;
} }
if (iScaleSelect < 2) if (iScaleSelect < 2) {
iScaleSelect = 0; iScaleSelect = 0;
else }
else {
iScaleSelect--; iScaleSelect--;
}
int nSelect = iScaleSelect * 4 + 3; int nSelect = iScaleSelect * 4 + 3;
return fULimit[nSelect]; return fULimit[nSelect];
} }
private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数 private static float GetVoltageDevationLimit_L(int iScaleSelect)//电压偏差负数
{ {
if (iScaleSelect >= MAX_SCALE_NO) if (iScaleSelect >= MAX_SCALE_NO) {
return 0.0f; return 0.0f;
}
int nReturn = 0; int nReturn = 0;
if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) if (iScaleSelect == 3 || iScaleSelect == 4 || iScaleSelect == 5 || iScaleSelect == 6) {
nReturn = 1; nReturn = 1;
else if (iScaleSelect == -1) }
else if (iScaleSelect == -1) {
nReturn = 2; nReturn = 2;
}
return fUDevL_Limit[nReturn]; return fUDevL_Limit[nReturn];
} }
@@ -194,40 +206,40 @@ public class COverlimit {
public static float GetFCurrentLimit(String strScale, float fDLRL) { public static float GetFCurrentLimit(String strScale, float fDLRL) {
float uL = 0.0f; float uL = 0.0f;
switch (strScale) { switch (strScale) {
case "0.38kV": case "0.38":
uL = 0.4f; uL = 0.4f;
break; break;
case "6kV": case "6":
uL = 6.3f; uL = 6.3f;
break; break;
case "10kV": case "10":
uL = 10.5f; uL = 10.5f;
break; break;
case "20kV": case "20":
uL = 21.0f; uL = 21.0f;
break; break;
case "35kV": case "35":
uL = 36.5f; uL = 36.5f;
break; break;
case "66kV": case "66":
uL = 69.0f; uL = 69.0f;
break; break;
case "110kV": case "110":
uL = 115.0f; uL = 115.0f;
break; break;
case "220kV": case "220":
uL = 230.0f; uL = 230.0f;
break; break;
case "330kV": case "330":
uL = 345.0f; uL = 345.0f;
break; break;
case "500kV": case "500":
uL = 520.0f; uL = 520.0f;
break; break;
case "515kV": case "515":
uL = 535.0f; uL = 535.0f;
break; break;
case "800kV": case "800":
uL = 825.0f; uL = 825.0f;
break; break;
default: default:
@@ -246,20 +258,26 @@ public class COverlimit {
} }
public static int TransStringScaleToInt(String strScale) { public static int TransStringScaleToInt(String strScale) {
if (strScale.equals("110kV")) if (strScale.equals("110"))
return 1; return 1;
else if (strScale.equals("35kV") || strScale.equals("66kV")) else if (strScale.equals("35") || strScale.equals("66")) {
return 2; return 2;
else if (strScale.equals("10kV")) }
else if (strScale.equals("10")) {
return 3; return 3;
else if (strScale.equals("6kV")) }
else if (strScale.equals("6")) {
return 4; return 4;
else if (strScale.equals("0.38kV")) }
else if (strScale.equals("0.38")) {
return 5; return 5;
else if (strScale.equals("20kV")) }
else if (strScale.equals("20")) {
return 6; return 6;
else if (strScale.equals("220kV") || strScale.equals("500kV")) }
else if (strScale.equals("220") || strScale.equals("500")) {
return -1; return -1;
}
return 0; return 0;
@@ -268,9 +286,9 @@ public class COverlimit {
/*单独处理闪变的*/ /*单独处理闪变的*/
public static float dealFlickerByScale(String strScale) { public static float dealFlickerByScale(String strScale) {
if (strScale.equals("110kV") || strScale.equals("35kV") || strScale.equals("66kV") || strScale.equals("10kV") || strScale.equals("6kV") || strScale.equals("0.38kV") || strScale.equals("20kV")) { if (strScale.equals("110") || strScale.equals("35") || strScale.equals("66") || strScale.equals("10") || strScale.equals("6") || strScale.equals("0.38") || strScale.equals("20")) {
return 1.0f; return 1.0f;
} else if (strScale.equals("220kV") || strScale.equals("500kV")) { } else if (strScale.equals("220") || strScale.equals("500")) {
return 0.8f; return 0.8f;
} else { } else {
return 1.0f; return 1.0f;
@@ -295,11 +313,13 @@ public class COverlimit {
//畸变率 //畸变率
fLimit[4] = GetVoltageJBLimit(nScale); fLimit[4] = GetVoltageJBLimit(nScale);
//24谐波电压幅值 //24谐波电压幅值
for (i = 0; i < 24; i++) for (i = 0; i < 24; i++) {
fLimit[5 + i] = GetVoltageLimit(i, nScale); fLimit[5 + i] = GetVoltageLimit(i, nScale);
}
//24谐波电流幅值 //24谐波电流幅值
for (i = 0; i < 24; i++) for (i = 0; i < 24; i++) {
fLimit[5 + 24 + i] = GetCurrentLimit(i+2, strScale, fDLRL, fJZRL, fXYRL, fSBRL); fLimit[5 + 24 + i] = GetCurrentLimit(i + 2, strScale, fDLRL, fJZRL, fXYRL, fSBRL);
}
/**************************** /****************************
* Modify by yexb 20181015 * Modify by yexb 20181015
*此项为电压下偏差 *此项为电压下偏差
@@ -312,11 +332,72 @@ public class COverlimit {
fLimit[COverlimit.MAXOVERLIMITNUM - 1 - 16] = GetFCurrentLimit(strScale, fDLRL); fLimit[COverlimit.MAXOVERLIMITNUM - 1 - 16] = GetFCurrentLimit(strScale, fDLRL);
//间谐波电压含有率 //间谐波电压含有率
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++) {
fLimit[55 + i] = GetInHarm(i, nScale); fLimit[55 + i] = GetInHarm(i, nScale);
}
return fLimit; return fLimit;
} }
//处理基准容量
public static float getStandShortCap(String voltageLevel){
if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){
return 10;
}else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){
return 10;
}else if(DicDataEnum.V022.getCode().equalsIgnoreCase(voltageLevel)){
return 10;
}else if(DicDataEnum.KV04.getCode().equalsIgnoreCase(voltageLevel)){
return 100;
}else if(DicDataEnum.V400.getCode().equalsIgnoreCase(voltageLevel)){
return 100;
}else if(DicDataEnum.KV6.getCode().equalsIgnoreCase(voltageLevel)){
return 100;
}else if(DicDataEnum.KV10.getCode().equalsIgnoreCase(voltageLevel)){
return 100;
}else if(DicDataEnum.KV20.getCode().equalsIgnoreCase(voltageLevel)){
return 200;
}else if(DicDataEnum.KV30.getCode().equalsIgnoreCase(voltageLevel)){
//非标准
return 250;
}else if(DicDataEnum.KV35.getCode().equalsIgnoreCase(voltageLevel)){
return 250;
}else if(DicDataEnum.KV50.getCode().equalsIgnoreCase(voltageLevel)){
return 500;
}else if(DicDataEnum.KV66.getCode().equalsIgnoreCase(voltageLevel)){
return 500;
}else if(DicDataEnum.KV72_5.getCode().equalsIgnoreCase(voltageLevel)){
return 500;
}else if(DicDataEnum.KV110.getCode().equalsIgnoreCase(voltageLevel)){
return 750;
}else if(DicDataEnum.KV125.getCode().equalsIgnoreCase(voltageLevel)){
return 750;
}else if(DicDataEnum.KV200.getCode().equalsIgnoreCase(voltageLevel)){
return 2000;
}else if(DicDataEnum.KV220.getCode().equalsIgnoreCase(voltageLevel)){
return 2000;
}else if(DicDataEnum.KV320.getCode().equalsIgnoreCase(voltageLevel)){
return 3000;
}else if(DicDataEnum.KV330.getCode().equalsIgnoreCase(voltageLevel)){
return 3000;
}else if(DicDataEnum.KV500.getCode().equalsIgnoreCase(voltageLevel)){
return 4500;
}else if(DicDataEnum.KV600.getCode().equalsIgnoreCase(voltageLevel)){
return 4500;
}else if(DicDataEnum.KV660.getCode().equalsIgnoreCase(voltageLevel)){
return 7000;
}else if(DicDataEnum.KV750.getCode().equalsIgnoreCase(voltageLevel)){
return 7000;
}else if(DicDataEnum.KV1000.getCode().equalsIgnoreCase(voltageLevel)){
return 7000;
}else if(DicDataEnum.KV1100.getCode().equalsIgnoreCase(voltageLevel)){
return 7000;
}else {
throw new BusinessException("没有对应电压等级,请先完善字典");
}
}
} }

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

@@ -1,5 +1,6 @@
package com.njcn.device.pms.pojo.po; package com.njcn.device.pms.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import lombok.Data; import lombok.Data;
@@ -101,6 +102,12 @@ public class Monitor extends BaseEntity {
*/ */
private Float userAgreementCapacity; private Float userAgreementCapacity;
/**
* 基准短路容量
*/
@TableField(exist = false)
private Float standShortCapacity;
/** /**
* 电压偏差限值（上） * 电压偏差限值（上）
*/ */

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.utils.COverlimit;
import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
import com.njcn.device.pms.mapper.majornetwork.*; import com.njcn.device.pms.mapper.majornetwork.*;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
@@ -71,6 +72,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
private final IDistributionMonitorService iDistributionMonitorService; private final IDistributionMonitorService iDistributionMonitorService;
@Override @Override
public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) { public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam); return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam);
@@ -158,7 +160,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
.like(Monitor::getOrgName, baseParam.getSearchValue())) .like(Monitor::getOrgName, baseParam.getSearchValue()))
.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()) .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
.orderByDesc(Monitor::getCreateTime); .orderByDesc(Monitor::getCreateTime);
return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper); Page<Monitor> page = this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
Map<String, DictData> map = dictDataList.stream().collect(Collectors.toMap(DictData::getId,Function.identity()));
List<Monitor> tem = page.getRecords().stream().peek(item-> item.setStandShortCapacity(COverlimit.getStandShortCap(map.get(item.getVoltageLevel()).getValue()))).collect(Collectors.toList());
page.setRecords(tem);
return page;
} }
@Override @Override
@@ -203,6 +211,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
specialMonitor.setCapacity(100f); specialMonitor.setCapacity(100f);
specialMonitor.setType(1); specialMonitor.setType(1);
specialMonitorMapper.insert(specialMonitor); specialMonitorMapper.insert(specialMonitor);
//主网测点限值计算
DictData dictData = dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData();
float standShort = COverlimit.getStandShortCap(dictData.getValue());
Overlimit overlimit = new Overlimit(monitor.getId(),dictData.getValue(),monitor.getMinShortCircuitCapacity(),standShort,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity());
overlimitMapper.deleteById(monitor.getId());
overlimitMapper.insert(overlimit);
return true; return true;
} }
@@ -222,6 +237,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
specialMonitor.setCapacity(100f); specialMonitor.setCapacity(100f);
specialMonitor.setType(1); specialMonitor.setType(1);
specialMonitorMapper.updateById(specialMonitor); specialMonitorMapper.updateById(specialMonitor);
//主网测点限值计算
DictData dictData = dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData();
float standShort = COverlimit.getStandShortCap(dictData.getValue());
Overlimit overlimit = new Overlimit(monitor.getId(),dictData.getValue(),monitor.getMinShortCircuitCapacity(),standShort,monitor.getUserAgreementCapacity(),monitor.getPowerSupplyEqCapacity());
overlimitMapper.deleteById(monitor.getId());
overlimitMapper.insert(overlimit);
return true; return true;
} }
@@ -233,6 +255,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
iDistributionMonitorService.removeByIds(monitorIds); iDistributionMonitorService.removeByIds(monitorIds);
this.removeByIds(monitorIds); this.removeByIds(monitorIds);
specialMonitorMapper.deleteBatchIds(monitorIds); specialMonitorMapper.deleteBatchIds(monitorIds);
overlimitMapper.deleteBatchIds(monitorIds);
return true; return true;
} }
@@ -387,4 +410,8 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
} }
} }

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

@@ -324,7 +324,7 @@ public class TerminalBaseController extends BaseController {
if (Objects.isNull(scaleResult.getData())) { if (Objects.isNull(scaleResult.getData())) {
throw new BusinessException(CommonResponseEnum.DIC_DATA); throw new BusinessException(CommonResponseEnum.DIC_DATA);
} }
Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getName(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); Overlimit overlimit = new Overlimit(line.getId(), scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
count++; count++;
} }

1
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalMaintainController.java
View File

@@ -56,6 +56,7 @@ public class TerminalMaintainController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getTerminalMainList") @PostMapping("/getTerminalMainList")
@ApiOperation("获取终端运维主列表") @ApiOperation("获取终端运维主列表")
@ApiImplicitParam(name = "terminalMainQueryParam",required = true)
public HttpResult<List<TerminalMaintainVO>> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) { public HttpResult<List<TerminalMaintainVO>> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) {
String methodDescribe = getMethodDescribe("getTerminalMainList"); String methodDescribe = getMethodDescribe("getTerminalMainList");
List<TerminalMaintainVO> resList = terminalMaintainService.getTerminalMainList(terminalMainQueryParam); List<TerminalMaintainVO> resList = terminalMaintainService.getTerminalMainList(terminalMainQueryParam);

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

@@ -407,7 +407,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
Voltage voltage = lineMapper.getVoltageByLineId(line.getId()); Voltage voltage = lineMapper.getVoltageByLineId(line.getId());
//监测点限值 //监测点限值
HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale()); HttpResult<DictData> scaleResult = dicDataFeignClient.getDicDataById(voltage.getScale());
String scaTmp = scaleResult.getData().getName(); String scaTmp = scaleResult.getData().getValue();
Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); Overlimit overlimit = new Overlimit(line.getId(), scaTmp, lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.deleteById(line.getId()); overlimitMapper.deleteById(line.getId());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
@@ -690,7 +690,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(scaleResult.getData())) { if (Objects.isNull(scaleResult.getData())) {
throw new BusinessException(CommonResponseEnum.DIC_DATA); throw new BusinessException(CommonResponseEnum.DIC_DATA);
} }
Overlimit overlimit = new Overlimit(line.getId(),scaleResult.getData().getName(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity()); Overlimit overlimit = new Overlimit(line.getId(),scaleResult.getData().getValue(), lineDetail.getShortCapacity(), lineDetail.getStandardCapacity(), lineDetail.getDealCapacity(), lineDetail.getDevCapacity());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
} }
} }
@@ -1990,9 +1990,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
lineDetail.setCt1(Float.valueOf(ct[0])); lineDetail.setCt1(Float.valueOf(ct[0]));
lineDetail.setCt2(Float.valueOf(ct[1])); lineDetail.setCt2(Float.valueOf(ct[1]));
DictData dictData = dicDataFeignClient.getDicDataByNameAndTypeName(terminalBaseExcel.getSubvScale(),DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
lineDetailMapper.insert(lineDetail); lineDetailMapper.insert(lineDetail);
Overlimit overlimit = new Overlimit(temp.getId(), terminalBaseExcel.getSubvScale(), terminalBaseExcel.getShortCapacity(), terminalBaseExcel.getStandardCapacity(), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity()); Overlimit overlimit = new Overlimit(temp.getId(), dictData.getValue(), terminalBaseExcel.getShortCapacity(), terminalBaseExcel.getStandardCapacity(), terminalBaseExcel.getDealCapacity(), terminalBaseExcel.getDevCapacity());
overlimit.setId(temp.getId()); overlimit.setId(temp.getId());
overlimitMapper.insert(overlimit); overlimitMapper.insert(overlimit);
} }

47
pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
View File

@@ -169,27 +169,44 @@ public enum DicDataEnum {
DY_10KV("交流10kV","10kV"), DY_10KV("交流10kV","10kV"),
DY_35KV("交流35kV","35kV"), DY_35KV("交流35kV","35kV"),
DY_110KV("交流110kV","110kV"), DY_110KV("交流110kV","110kV"),
/** /**
* 电压等级 * 电压等级
* 此电压用于计算,真实code请使用上面枚举
* @author cdf * @author cdf
* @date 2023/3/24 * @date 2023/3/24
*/ */
KV038("0.38kV","0.38kV"), V022("0.22kV","0.22"),
V380("380V","380V"), KV038("0.38kV","0.38"),
KV04("0.4kV","0.4kV"), V380("380V","0.38"),
V400("400V","400V"), KV04("0.4kV","0.4"),
KV6("6kV","6kV"), KV06("0.6kV","0.6"),
KV10("10kV","10kV"), V400("400V","0.4"),
KV20("20kV","20kV"), KV6("6kV","6"),
KV35("35kV","35kV"), KV10("10kV","10"),
KV66("66kV","66kV"), KV20("20kV","20"),
KV110("110kV","110kV"), KV30("30kV","30"),
KV220("220kV","220kV"), KV35("35kV","35"),
KV330("330kV","330kV"), KV50("50kV","50"),
KV500("500kV","500kV"), KV66("66kV","66"),
KV750("750kV","750kV"), KV72_5("72.5kV","725"),
KV1000("1000kV","1000kV"), KV110("110kV","110"),
KV120("120kV","120"),
KV125("125kV","125"),
KV200("200kV","200"),
KV220("220kV","220"),
KV320("320kV","320"),
KV330("330kV","330"),
KV400("400kV","400"),
KV500("500kV","500"),
KV600("600kV","600"),
KV660("660kV","660"),
KV750("750kV","750"),
KV1000("1000kV","1000"),
KV1100("1100kV","1100"),
/** /**
* 计划采取实施 * 计划采取实施