实测需量有功功率历史

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

@@ -999,20 +999,28 @@
        }

        for (String code : dto.getCodeList()) {
            PowerDemandEntity powerDemand = powerDemandService.getByCode(code);
            if (powerDemand == null) {
            PowerNetFactorQuery powerNetFactorQuery = null;
            PowerDemandEntity powerDemandEntity = powerDemandService.getByCode(code);
            PowerNetDropdownEntity powerNetDropdownEntity = powerNetDropdownService.getByNodeCode(code);
            if (powerDemandEntity != null) {
                powerNetFactorQuery.setCurP(powerDemandEntity.getActivePower());
                powerNetFactorQuery.setCurDem(powerDemandEntity.getCurDemand());
            } else if (powerNetDropdownEntity != null) {
                powerNetFactorQuery.setCurP(powerNetDropdownEntity.getCurP());
                powerNetFactorQuery.setCurDem(powerNetDropdownEntity.getExt1());
            } else {
                log.info("未找到code对应的数据: {}", dto.getCode());
                return success(new LinkedHashMap<>());
                continue;
            }

            String queryType = dto.getQueryType().toUpperCase();
            String pointNo;
            switch (queryType.toUpperCase()) {
                case "D":
                    pointNo = powerDemand.getCurDemand();
                    pointNo = powerNetFactorQuery.getCurDem();
                    break;
                case "P":
                    pointNo = powerDemand.getActivePower();
                    pointNo = powerNetFactorQuery.getCurP();
                    break;
                default:
                    throw new IllegalArgumentException("不支持的queryType: " + queryType);

 ansteel-biz/src/main/java/com/iailab/module/ansteel/api/dto/PowerNetFactorQuery.java

@@ -25,4 +25,9 @@
     * 当前功率因数
     */
    private String curCos;

    /**
     * 当前需量
     */
    private String curDem;
}