ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.微调实体信息

Browse Source
This commit is contained in:
wr
2024-12-20 08:55:46 +08:00
parent b0f54b0cde
commit 5dafcad3fa
8 changed files with 63 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java
View File

@@ -53,12 +53,12 @@ public class PqDev extends BaseEntity implements Serializable {
/**
* 额定电压（V）
*/
private Float devVolt;
private Double devVolt;
/**
* 额定电流（A）
*/
private Float devCurr;
private Double devCurr;
/**
* 设备厂家，字典表

2
device/src/main/java/com/njcn/gather/device/script/controller/PqScriptController.java
View File

@@ -151,7 +151,7 @@ public class PqScriptController extends BaseController {
String jsonString = JSON.toJSONString(sourceIssue,SerializerFeature.WriteNullStringAsEmpty);
System.out.println();
}
String jsonString = JSON.toJSONString(sourceIssues, SerializerFeature.WriteMapNullValue);
String jsonString =sourceIssues.get(0).toString();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sourceIssues, methodDescribe);
}
}

12
device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptDtls.java
View File

@@ -49,12 +49,12 @@ public class PqScriptDtls implements Serializable {
/**
* 值
*/
private Float value;
private Double value;
/**
* 相角
*/
private Float angle;
private Double angle;
/**
* （间）谐波次数
@@ -66,25 +66,25 @@ public class PqScriptDtls implements Serializable {
* 暂态幅度（%）
*/
@TableField("TransValue")
private Float transValue;
private Double transValue;
/**
* 持续时间（周波）
*/
@TableField("RetainTime")
private Float retainTime;
private Double retainTime;
/**
* 变动频度（次/min）
*/
@TableField("ChagFre")
private Float chagFre;
private Double chagFre;
/**
* 变动量（%）
*/
@TableField("ChagValue")
private Float chagValue;
private Double chagValue;
/**
* 状态：0-不启用 1-启用

32
device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java
View File

@@ -43,19 +43,19 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
private final static String DIP = "Dip";
private final static String FLICKER = "Flicker";
@Value("${Dip.fPreTime}")
private Float fPreTime;
private Double fPreTime;
@Value("${Dip.fRampIn}")
private Float fRampIn;
private Double fRampIn;
@Value("${Dip.fRampOut}")
private Float fRampOut;
private Double fRampOut;
@Value("${Dip.fAfterTime}")
private Float fAfterTime;
private Double fAfterTime;
@Value("${Flicker.waveFluType}")
private String waveFluType;
@Value("${Flicker.waveType}")
private String waveType;
@Value("${Flicker.fDutyCycle}")
private Float fDutyCycle;
private Double fDutyCycle;
private final IPqDevService pqDevService;
@@ -109,12 +109,12 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
.eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
);
//额定电压信息
Set<Float> voltSet = list.stream().map(PqDev::getDevVolt).collect(Collectors.toSet());
Set<Double> voltSet = list.stream().map(PqDev::getDevVolt).collect(Collectors.toSet());
//额定电流信息
Set<Float> currSet = list.stream().map(PqDev::getDevCurr).collect(Collectors.toSet());
Set<Double> currSet = list.stream().map(PqDev::getDevCurr).collect(Collectors.toSet());
if (voltSet.size() == 1 && currSet.size() == 1) {
Float volt = voltSet.stream().collect(Collectors.toList()).stream().findFirst().get();
Float curr = currSet.stream().collect(Collectors.toList()).stream().findFirst().get();
Double volt = voltSet.stream().collect(Collectors.toList()).stream().findFirst().get();
Double curr = currSet.stream().collect(Collectors.toList()).stream().findFirst().get();
List<PqScriptDtls> pqScriptDtls = this.pqScriptDtls(param.getScriptId(),param.getIsPhaseSequence(), volt, curr);
if (CollUtil.isNotEmpty(pqScriptDtls)) {
/**
@@ -182,7 +182,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
return sourceIssues;
}
private List<PqScriptDtls> pqScriptDtls(String scriptId,Boolean isPhaseSequence,Float volt, Float curr) {
private List<PqScriptDtls> pqScriptDtls(String scriptId,Boolean isPhaseSequence,Double volt, Double curr) {
List<PqScriptDtls> pqScriptDtls;
if(isPhaseSequence){
pqScriptDtls = this.list(new MPJLambdaWrapper<PqScriptDtls>()
@@ -226,7 +226,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
List<PqScriptDtls> dtlsOtherList,
String harm,
String inHarm,
Float fFreq,
Double fFreq,
String code,
List<SourceIssue.ChannelListDTO> channelListDTOS) {
for (PqScriptDtls dtls : dtlsList) {
@@ -243,8 +243,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
channelListDTO.setInharmList(new ArrayList<>());
//暂态数据
SourceIssue.ChannelListDTO.DipDataDTO dipDataDTO = new SourceIssue.ChannelListDTO.DipDataDTO();
dipDataDTO.setFTransValue(0.0f);
dipDataDTO.setFRetainTime(0.0f);
dipDataDTO.setFTransValue(0.0);
dipDataDTO.setFRetainTime(0.0);
dipDataDTO.setFPreTime(fPreTime);
dipDataDTO.setFRampIn(fRampIn);
@@ -259,8 +259,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
flickerDataDTO.setWaveType(waveType);
flickerDataDTO.setFDutyCycle(fDutyCycle);
flickerDataDTO.setFChagFre(0.0f);
flickerDataDTO.setFChagValue(0.0f);
flickerDataDTO.setFChagFre(0.0);
flickerDataDTO.setFChagValue(0.0);
channelListDTO.setFlickerData(flickerDataDTO);
@@ -290,7 +290,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
PqScriptDtls dip = dipList.get(0);
dipDataDTO.setFTransValue(dip.getTransValue());
// 1.0/频率*持续时间（周波）= 暂态持续时间（s）
dipDataDTO.setFRetainTime(NumberUtil.round(1.0 / fFreq * dip.getRetainTime(), 3).floatValue());
dipDataDTO.setFRetainTime(NumberUtil.round(1.0 / fFreq * dip.getRetainTime(), 3).doubleValue());
channelListDTO.setDipFlag(true);
channelListDTO.setDipData(dipDataDTO);
}