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

@@ -12,6 +12,7 @@
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.framework.tenant.core.context.TenantContextHolder;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.vo.PowerCapacitorHisPageReqVO;
import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
import com.iailab.module.ansteel.common.utils.DecimalUtil;
import com.iailab.module.ansteel.job.dto.ScheduleJobDTO;
@@ -520,8 +521,30 @@
    @GetMapping("/capacitor-his/list")
    @Operation(summary = "功率因数-电容器投退历史")
    public CommonResult<List<PowerCapacitorHisDTO>> getPowerCapacitorHisList(@RequestParam Map<String, Object> params) {
        List<PowerCapacitorHisEntity> list = powerCapacitorHisService.list(params);
        String statusId = (String) params.get("statusId");
        if (StringUtils.isBlank(statusId)) {
            return success(new ArrayList<>());
        }

        List<PowerCapacitorDetEntity> detList = powerCapacitorDetService.list(statusId);
        List<String> detIds = detList.stream().map(PowerCapacitorDetEntity::getId).collect(Collectors.toList());
        List<PowerCapacitorHisEntity> list = powerCapacitorHisService.list(detIds);
        return success(ConvertUtils.sourceToTarget(list, PowerCapacitorHisDTO.class));
    }

    @PostMapping("/capacitor-his/page")
    @Operation(summary = "功率因数-电容器投退历史（分页）")
    public CommonResult<PageResult<PowerCapacitorHisDTO>> getPowerCapacitorHisPage(@RequestParam PowerCapacitorHisPageReqVO reqVO) {
        if (StringUtils.isBlank(reqVO.getStatusId())) {
            return error(GlobalErrorCodeConstants.BAD_REQUEST);
        }

        List<PowerCapacitorDetEntity> detList = powerCapacitorDetService.list(reqVO.getStatusId());
        List<String> detIds = detList.stream().map(PowerCapacitorDetEntity::getId).collect(Collectors.toList());
        reqVO.setDetIdList(detIds);

        PageResult<PowerCapacitorHisEntity> data = powerCapacitorHisService.page(reqVO);
        return success(BeanUtils.toBean(data, PowerCapacitorHisDTO.class));
    }

    @GetMapping("/control-main/list")
@@ -716,6 +739,7 @@
        ApiPointValueQueryDTO queryCodeValue = new ApiPointValueQueryDTO();
        queryCodeValue.setStart(startTime);
        queryCodeValue.setEnd(endTime);
        queryCodeValue.setPointNo(entity.getCurDemand());
        List<ApiPointValueDTO> codeValueList = dataPointApi.queryPointHistoryValue(queryCodeValue);
        if (CollectionUtils.isEmpty(codeValueList)) {
            return success(result);