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

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/upload/PqEvaluationCreateDTO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.dto.upload;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
/**
@@ -95,7 +96,7 @@ public class PqEvaluationCreateDTO {
/**
* 统计层级(3:省 4:市 5:县)
*/
private String statisticalLevel;
private String statisticsLevel;
/**
* 统计类型(01:年 02:月 03:日)

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadEvaluationDataD.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.po.upload;
import cn.hutool.core.annotation.Alias;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Data;
@@ -109,6 +110,7 @@ public class RUploadEvaluationDataD {
* 统计层级(3:省 4:市 5:县)
*/
@MppMultiId
@Alias("statisticsLevel")
private String statisticalLevel;
/**

19
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
View File

@@ -16,6 +16,8 @@ import com.njcn.harmonic.pojo.po.upload.RUploadEvaluationDataD;
import com.njcn.harmonic.pojo.po.upload.RUploadPointStatisticalDataD;
import com.njcn.harmonic.pojo.vo.upload.UploadEvaluationDataVo;
import com.njcn.harmonic.service.upload.IEvaluationDataService;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.enums.GWSendEnum;
@@ -48,6 +50,7 @@ import java.util.stream.Collectors;
public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDataDMapper, RUploadEvaluationDataD> implements IEvaluationDataService {
private final DeptFeignClient deptFeignClient;
private final DicDataFeignClient dicDataFeignClient;
@Override
public Page<UploadEvaluationDataVo> getEvaluationData(UploadDataParam param) {
@@ -116,9 +119,13 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
if (Objects.equals(item.getStandardDeviation(),3.1415926)){
item.setStandardDeviation(0d);
}
if (Objects.equals(item.getHarmonicNum(),0)){
item.setHarmonicNum(null);
}
BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate());
double value = four.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
item.setMonitorBusRate(value);
item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
}).collect(Collectors.toList());
//组装数据
SendParam sp = new SendParam();
@@ -219,4 +226,16 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
this.update(lambdaUpdateWrapper);
}
/**
* 电压等级转换
*/
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);
}
}

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);
}
}