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

河北超高压算法调整

Browse Source
This commit is contained in:
xuyang
2024-01-08 11:17:02 +08:00
parent 6e799fc1a4
commit 34a52ef1be
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadEvaluationDataDServiceImpl.java
View File

@@ -90,7 +90,6 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
RUploadEvaluationDataD dto = getLineNum(allDept,item2.getVoltageType(),item.getUnitId());
if (dto.getMonitorBusNum() !=0 ){
RUploadEvaluationDataD rUploadEvaluationDataD = new RUploadEvaluationDataD();
//rUploadEvaluationDataD.setId(IdUtil.simpleUUID());
rUploadEvaluationDataD.setProvinceId(dept.getCode());
rUploadEvaluationDataD.setProvinceName(dept.getName());
rUploadEvaluationDataD.setDataSources(UploadEnum.DATA_SOURCES_01.getCode());
@@ -129,7 +128,6 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
}
});
if (CollectionUtil.isNotEmpty(result)){
result.forEach(item->item.setId(IdUtil.simpleUUID()));
this.saveOrUpdateBatchByMultiId(result,1000);
}
}
@@ -292,6 +290,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
public RUploadEvaluationDataD channelData(RUploadEvaluationDataD rUploadEvaluationDataD,Double value, String indexType, Integer harmonicNum, String voltage,RUploadEvaluationDataD rUploadEvaluationDataD2) {
RUploadEvaluationDataD dto = new RUploadEvaluationDataD();
BeanUtils.copyProperties(rUploadEvaluationDataD,dto);
dto.setId(IdUtil.simpleUUID());
dto.setAvgValue(value);
dto.setIndexType(indexType);
dto.setHarmonicNum(harmonicNum);
@@ -310,6 +309,7 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
for (int i = 0; i < valueList.size(); i++) {
RUploadEvaluationDataD dto = new RUploadEvaluationDataD();
BeanUtils.copyProperties(rUploadEvaluationDataD,dto);
dto.setId(IdUtil.simpleUUID());
dto.setAvgValue(valueList.get(i));
dto.setIndexType(indexType);
dto.setHarmonicNum(i+2);
@@ -321,17 +321,4 @@ public class RUploadEvaluationDataDServiceImpl extends MppServiceImpl<RUploadEva
result.add(dto);
}
}
/**
* 电压等级转换
*/
public String getVoltage(String voltage) {
DictData dictData = dicDataFeignClient.getDicDataById(voltage).getData();
Integer code = dictData.getAlgoDescribe();
if (Objects.isNull(code)){
return "99";
}
return (code < 10) ? "0" + code : String.valueOf(code);
}
}