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

@@ -747,20 +747,18 @@
        }

        // 所有关口进线的二级界面（表格/曲线）均增加（CCPP/135/CDQ/TRT/余热）的选项。
        if(entity.getSort() <= 14) {
            Map<String, Object> params1 = new HashMap<>();
            params1.put("groupName", "COMMON1");
            List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1);
            if (!CollectionUtils.isEmpty(list1)) {
                list.addAll(list1);
            }
        Map<String, Object> params1 = new HashMap<>();
        params1.put("groupName", "COMMON1");
        List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1);
        if (!CollectionUtils.isEmpty(list1)) {
            list.addAll(list1);
        }

            Map<String, Object> params2 = new HashMap<>();
            params2.put("groupName", "COMMON2");
            List<PowerNetDropdownEntity> list2 = powerNetDropdownService.list(params2);
            if (!CollectionUtils.isEmpty(list2)) {
                list.addAll(list2);
            }
        Map<String, Object> params2 = new HashMap<>();
        params2.put("groupName", "COMMON2");
        List<PowerNetDropdownEntity> list2 = powerNetDropdownService.list(params2);
        if (!CollectionUtils.isEmpty(list2)) {
            list.addAll(list2);
        }

        List<String> points = list.stream().map(item -> {
@@ -1217,19 +1215,36 @@
            String[] pointNoArr = new String[2];
            switch (queryType.toUpperCase()) {
                case "P":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurP())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurP();
                    break;
                case "Q":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurQ())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurQ();
                    break;
                case "COS":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurCos())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurCos();
                    break;
                case "DAYCOS":
                    if (powerNetFactorEntity == null ||
                            StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getQDay())) {
                        continue;
                    }
                    pointNoArr[0] = powerNetFactorEntity.getPDay();
                    pointNoArr[1] = powerNetFactorEntity.getQDay();
                    break;
                case "MONTHCOS":
                    if (powerNetFactorEntity == null ||
                            StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
                        continue;
                    }
                    pointNoArr[0] = powerNetFactorEntity.getPMon();
                    pointNoArr[1] = powerNetFactorEntity.getQMon();
                    break;
@@ -1342,19 +1357,36 @@
            String[] pointNoArr = new String[2];
            switch (queryType.toUpperCase()) {
                case "P":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurP())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurP();
                    break;
                case "Q":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurQ())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurQ();
                    break;
                case "COS":
                    if (StringUtils.isBlank(powerNetFactorQuery.getCurCos())) {
                        continue;
                    }
                    pointNo = powerNetFactorQuery.getCurCos();
                    break;
                case "DAYCOS":
                    if (powerNetFactorEntity == null ||
                            StringUtils.isBlank(powerNetFactorEntity.getPDay()) || StringUtils.isBlank(powerNetFactorEntity.getQDay())) {
                        continue;
                    }
                    pointNoArr[0] = powerNetFactorEntity.getPDay();
                    pointNoArr[1] = powerNetFactorEntity.getQDay();
                    break;
                case "MONTHCOS":
                    if (powerNetFactorEntity == null ||
                            StringUtils.isBlank(powerNetFactorEntity.getPMon()) || StringUtils.isBlank(powerNetFactorEntity.getQMon())) {
                        continue;
                    }
                    pointNoArr[0] = powerNetFactorEntity.getPMon();
                    pointNoArr[1] = powerNetFactorEntity.getQMon();
                    break;
@@ -1809,9 +1841,6 @@
        calendar.set(Calendar.SECOND, 0);
        calendar.set(Calendar.MINUTE, 0);

        if (!CollectionUtils.isEmpty(powerFactorReqVO.getContentList())) {

        }
        MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
        dto.setScheduleTime(calendar.getTime());
        dto.setScheduleCode("AnsteelOffPowerAC");