修改传参能源品种的过滤条件

VVT789

2025-02-12 1ac2a7601fe71f960f1f544bc5b029d555866660

 zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java

@@ -1,5 +1,6 @@
package com.zhitan.web.controller.comprehensivestatistics;

import cn.hutool.core.date.DateUtil;
import com.zhitan.common.annotation.Log;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
@@ -51,25 +52,29 @@
                return AjaxResult.success("暂无数据");
            }
            List<YearComperhensive> dataList = new ArrayList<>();

            dataItem.setBeginTime(DateUtil.beginOfYear(dataItem.getDataTime()));
            dataItem.setEndTime(DateUtil.endOfYear(dataItem.getDataTime()));

            DateFormat df = new SimpleDateFormat("yyyy");
            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String aa= df.format(dataItem.getBeginTime());
            String bb="";
            String aa = df.format(dataItem.getDataTime());
            String bb = "";
            int i = 1;
            while (i <= 12) {
                if(i>9){
                    bb=aa+"-"+i+"-01 00:00:00";
                if(i > 9){
                    bb = aa + "-" + i + "-01 00:00:00";
                }else{
                    bb=aa+"-0"+i+"-01 00:00:00";
                    bb = aa + "-0" + i + "-01 00:00:00";
                }
                YearComperhensive report = new YearComperhensive();
                report.setDataTime(sf.parse(bb));
                report.setValue("value"+i);
                report.setValue("value" + i);
                dataList.add(report);
                i++;
            }
            List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(),
                    dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
                    dataList,dataItem.getBeginTime(), dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
            return AjaxResult.success(list);
        } catch (Exception ex) {
            logger.error("获取出错！", ex);
@@ -83,7 +88,11 @@
    @GetMapping("/listChart")
    @ApiOperation(value = "获取综合指标分析图表（年）数据")
    public AjaxResult listChart(DataItem dataItem){
        List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());

        dataItem.setBeginTime(DateUtil.beginOfYear(dataItem.getDataTime()));
        dataItem.setEndTime(DateUtil.endOfYear(dataItem.getDataTime()));

        List<YearComperhensive> list = yearComprehensive.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
        return AjaxResult.success(list);
    }

@@ -118,7 +127,7 @@
                i++;
            }
            List<YearComperhensive> list = yearComprehensive.getYearComprehensiveList(modelNode.getNodeId(),
                    dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId());
                    dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
            if(CollectionUtils.isNotEmpty(list)){
                list.forEach(this::valueRep);
            }