算法调整
This commit is contained in:
@@ -420,6 +420,7 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
*/
|
||||
private Map<String, DataPollutionD> getHarmonicVoltage(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) {
|
||||
List<DataPollutionD> list = new ArrayList<>();
|
||||
lineCountEvaluateParam.setColumnName("");
|
||||
lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
|
||||
lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
|
||||
Map<String, DataPollutionD> threePhase = getThreePhaseData(lineCountEvaluateParam, limitMap);
|
||||
@@ -520,6 +521,7 @@ public class PollutionServiceImpl implements IPollutionService {
|
||||
*/
|
||||
private Map<String, DataPollutionD> getHarmonicCurrent(LineCountEvaluateParam lineCountEvaluateParam, Map<String, Overlimit> limitMap) {
|
||||
Map<String, DataPollutionD> map = new HashMap();
|
||||
lineCountEvaluateParam.setColumnName("");
|
||||
lineCountEvaluateParam.setValueType(Stream.of("CP95").collect(Collectors.toList()));
|
||||
lineCountEvaluateParam.setPhasicType(Stream.of("A", "B", "C").collect(Collectors.toList()));
|
||||
List<DataIDto> list = dataIFeignClient.getDataI(lineCountEvaluateParam).getData();
|
||||
|
||||
@@ -157,9 +157,9 @@ public class DataVController extends BaseController {
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/getDataV")
|
||||
@ApiOperation("获取原始数据")
|
||||
public HttpResult<List<DataVDto>> getDataV(LineCountEvaluateParam lineParam) {
|
||||
String methodDescribe = getMethodDescribe("getMeasurementCount");
|
||||
List<DataVDto> dataV = dataVQuery.getDataV(lineParam);
|
||||
public HttpResult<List<DataVDto>> getDataV(@RequestBody LineCountEvaluateParam lineParam) {
|
||||
String methodDescribe = getMethodDescribe("getDataV");
|
||||
List<DataVDto> dataV = dataVInsert.getDataV(lineParam);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, dataV, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user