ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java

@@ -375,7 +375,7 @@
        if (StringUtils.isBlank(queryType)) {
            return CommonResult.error(GlobalErrorCodeConstants.BAD_REQUEST);
        }
        PowerNetFactorEntity powerNetFactor = powerNetFactorService.getByNodeName(nodeCode);
        PowerNetFactorEntity powerNetFactor = powerNetFactorService.getByNodeCode(nodeCode);
        PowerHistoryDTO result = new PowerHistoryDTO();
        if (powerNetFactor == null) {
            log.info("powerNetFactor is null");
@@ -464,7 +464,7 @@
    }

    @GetMapping("/adjust-factor")
    @Operation(summary = "负荷移植-调整后的功率因数与无功倒送量")
    @Operation(summary = "功率因数-调整后的功率因数与无功倒送量")
    public CommonResult<Map<String, Double>> getPowerAdjustFactor(@RequestParam Map<String, Object> params) {
        List<PowerAdjustedFactorEntity> list = powerAdjustedFactorService.list(params);
        List<PowerAdjustedFactorDTO> dtoList = ConvertUtils.sourceToTarget(list, PowerAdjustedFactorDTO.class);
@@ -475,11 +475,16 @@
        List<String> points = new ArrayList<>();
        Map<String, Object> dataMap = new HashMap<>();
        for (PowerAdjustedFactorDTO dto : dtoList) {
            points.add(dto.getPointNo());
            if (StringUtils.isNotBlank(dto.getPointNo())) {
                points.add(dto.getPointNo());
            }
        }
        dataMap = dataPointApi.queryPointsRealValue(points);
        if (!CollectionUtils.isEmpty(points)) {
            dataMap = dataPointApi.queryPointsRealValue(points);
        }
        for (PowerAdjustedFactorDTO powerAdjustedFactorDTO : dtoList) {
            result.put(powerAdjustedFactorDTO.getName(), Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString()));
            Double value = dataMap.get(powerAdjustedFactorDTO.getPointNo()) == null ? 0 : Double.parseDouble(dataMap.get(powerAdjustedFactorDTO.getPointNo()).toString());
            result.put(powerAdjustedFactorDTO.getName(), value);
        }
        return success(result);
    }