zhitan-admin/src/main/java/com/zhitan/web/controller/comprehensivestatistics/YearComprehensiveController.java
@@ -88,6 +88,10 @@ @GetMapping("/listChart") @ApiOperation(value = "获取综合指标分析图表（年）数据") public AjaxResult listChart(DataItem dataItem){ 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.getIndexStorageId()); return AjaxResult.success(list); } zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
@@ -1,8 +1,10 @@ package com.zhitan.web.controller.keyequipment; import cn.hutool.core.date.DateUtil; import com.zhitan.common.core.controller.BaseController; import com.zhitan.common.core.domain.AjaxResult; import com.zhitan.common.core.page.TableDataInfo; import com.zhitan.comprehensivestatistics.domain.YearComperhensive; import com.zhitan.keyequipment.domain.YearKeyEquipment; import com.zhitan.keyequipment.service.IYearKeyEquipmentService; import com.zhitan.model.domain.EnergyIndex; @@ -53,9 +55,13 @@ } List<String> indexIds = energyList.stream().map(EnergyIndex::getIndexId).collect(Collectors.toList()); List<YearKeyEquipment> 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 aa= df.format(dataItem.getDataTime()); String bb=""; int i = 1; while (i <= 12) { @@ -78,6 +84,7 @@ @GetMapping("/listChart") @ApiOperation(value = "重点设备能耗统计（年）图表") public AjaxResult listChart(DataItem dataItem){ List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getIndexStorageId()); return AjaxResult.success(list); } zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java
@@ -1,5 +1,7 @@ package com.zhitan.dataitem.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhitan.common.enums.TimeType; import com.zhitan.dataitem.domain.StagseDataEntry; import com.zhitan.dataitem.domain.vo.NodeIndexValueVO; @@ -149,7 +151,16 @@ public FlowChartsVO getFlowCharts(FlowChartsDTO dto) { FlowChartsVO flowChartsVO = new FlowChartsVO(); // 父节点id String nodeId = dto.getNodeId(); LambdaQueryWrapper<ModelNode> wrapper = Wrappers.<ModelNode>lambdaQuery() .eq(ModelNode::getModelCode, dto.getModelCode()) .isNull(ModelNode::getParentId); List<ModelNode> modelNodes = modelNodeMapper.selectList(wrapper); if(ObjectUtils.isEmpty(modelNodes)){ throw new RuntimeException("未查询到模型信息"); } Optional<ModelNode> modelNodeInfo = modelNodes.stream().findFirst(); String nodeId = modelNodeInfo.map(ModelNode::getNodeId).toString(); dto.setNodeId(nodeId); String energyType = dto.getEnergyType(); LocalDate queryTime = dto.getQueryTime(); TimeType timeType = dto.getTimeType(); zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
@@ -44,10 +44,13 @@ /** * 节点id */ @NotBlank(message = "节点id不能为空") @ApiModelProperty(value = "节点id") private String nodeId; @NotBlank(message = "模型编码不能为空") @ApiModelProperty(value = "模型编码") private String modelCode; public TimeType getTimeType() { if (ObjectUtils.isEmpty(timeType)) { return TimeType.DAY;
