From 28dc7dc6eab44e3988886e9b0304c95d1ffb281d Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 20 三月 2025 17:51:58 +0800
Subject: [PATCH] 重点设备能耗年优化
---
zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java | 5
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java | 5
zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java | 7
zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/YearKeyEquipmentMapper.java | 10
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java | 5
zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java | 7
zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/DailyKeyEquipmentMapper.java | 5
zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml | 39 +++--
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/MonthlyComprehensiveServiceImpl.java | 6
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/DailyComprehensiveServiceImpl.java | 5
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java | 7
zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/MonthlyKeyEquipmentMapper.java | 5
zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/YearKeyEquipmentServiceImpl.java | 21 ++-
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IDailyComprehensiveService.java | 5
zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java | 7
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/ImonthlyComprehensive.java | 5
zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/DailyKeyEquipmentServiceImpl.java | 15 ++
zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java | 43 ++++++
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IyearComprehensive.java | 5
zhitan-common/src/main/java/com/zhitan/common/utils/TypeTime.java | 29 ++++
zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/YearComprehensiveMapper.java | 5
zhitan-system/src/main/java/com/zhitan/keyequipment/service/IDailyKeyEquipmentService.java | 5
zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java | 39 ++----
zhitan-system/src/main/java/com/zhitan/realtimedata/domain/dto/DataItemQueryDTO.java | 21 +++
24 files changed, 193 insertions(+), 113 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
index 4d24ed4..03ff12b 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/keyequipment/YearKeyEquipmentController.java
@@ -1,14 +1,18 @@
package com.zhitan.web.controller.keyequipment;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.zhitan.common.core.controller.BaseController;
import com.zhitan.common.core.domain.AjaxResult;
+import com.zhitan.common.utils.DateTimeUtil;
+import com.zhitan.common.utils.TypeTime;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import com.zhitan.keyequipment.service.IYearKeyEquipmentService;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.ModelNode;
import com.zhitan.model.service.IModelNodeService;
import com.zhitan.realtimedata.domain.DataItem;
+import com.zhitan.realtimedata.domain.dto.DataItemQueryDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
@@ -17,13 +21,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.text.DateFormat;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
-
/**
*閲嶇偣璁惧鑳借�楃粺璁� 骞�
*
@@ -52,38 +54,21 @@
return success(new ArrayList<>());
}
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.getDataTime());
- String bb="";
- int i = 1;
- while (i <= 12) {
- if(i>9){
- bb=aa+"-"+i+"-01 00:00:00";
- }else{
- bb=aa+"-0"+i+"-01 00:00:00";
- }
- YearKeyEquipment report=new YearKeyEquipment();
- report.setDataTime(sf.parse(bb));
- report.setValue("value"+i);
- dataList.add(report);
- i++;
- }
-
- List<YearKeyEquipment> list = yearKeyEquipmentService.getYearKeyEquipmentList(indexIds, dataList,dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ Date convertTime = DateTimeUtil.getEndTimeByType(dataItem.getTimeType(),dataItem.getDataTime());
+ DateTime beginTime = DateUtil.beginOfYear(convertTime);
+ DateTime endTime = DateUtil.endOfYear(convertTime);
+ List<TypeTime> typeTimeList = DateTimeUtil.getDateTimeList(dataItem.getTimeType(),convertTime);
+ List<YearKeyEquipment> list = yearKeyEquipmentService.getYearKeyEquipmentList(indexIds, typeTimeList,beginTime,endTime, dataItem.getTimeType(),dataItem.getEnergyType());
return success(list);
}
@GetMapping("/listChart")
@ApiOperation(value = "閲嶇偣璁惧鑳借�楃粺璁★紙骞达級鍥捐〃")
- public AjaxResult listChart(DataItem dataItem){
+ public AjaxResult listChart(DataItemQueryDTO queryDto){
- List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(dataItem.getIndexId(),dataItem.getBeginTime(),dataItem.getEndTime(), dataItem.getTimeType(),dataItem.getEnergyType());
+ List<YearKeyEquipment> list = yearKeyEquipmentService.getListChart(queryDto);
return AjaxResult.success(list);
}
}
diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
index 248cb2f..48091c1 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/DateTimeUtil.java
@@ -10,10 +10,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
+import java.util.*;
/**
* @Description: 鏃堕棿宸ュ叿绫�
* @author: yxw
@@ -745,4 +742,42 @@
}
return momDate;
}
+ public static List<TypeTime> getDateTimeList(String timeType,Date dataTime){
+ List<TypeTime> resultlist = new ArrayList<>();
+ Date beginTime = DateUtil.beginOfDay(dataTime);
+ switch (timeType){
+ case TimeTypeConst.TIME_TYPE_DAY:
+ for(int i = 0;i<24;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setDateTime(DateTimeUtil.toDateTime(typeTime.getDataTime()));
+ typeTime.setTimeCode(CommonConst.WORD_H + DateUtil.format(beginTime,COMMON_PATTERN_HOUR));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ case TimeTypeConst.TIME_TYPE_MONTH:
+ for(int i = 0;i<31;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setTimeCode(CommonConst.WORD_D + DateUtil.format(beginTime,COMMON_PATTERN_DAY));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ case TimeTypeConst.TIME_TYPE_YEAR:
+ for(int i = 0;i<12;i++){
+ TypeTime typeTime = new TypeTime();
+ typeTime.setDataTime(DateUtil.format(beginTime,COMMON_PATTERN));
+ typeTime.setTimeCode(CommonConst.WORD_M + DateUtil.format(beginTime,COMMON_PATTERN_MONTH));
+ typeTime.setValue("value" + i);
+ resultlist.add(typeTime);
+ beginTime = addHours(beginTime,1);
+ }
+ break;
+ }
+ return resultlist;
+ }
}
diff --git a/zhitan-common/src/main/java/com/zhitan/common/utils/TypeTime.java b/zhitan-common/src/main/java/com/zhitan/common/utils/TypeTime.java
new file mode 100644
index 0000000..a50a0d5
--- /dev/null
+++ b/zhitan-common/src/main/java/com/zhitan/common/utils/TypeTime.java
@@ -0,0 +1,29 @@
+package com.zhitan.common.utils;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * [
+ * {"dataTime":"2025-01-01 00:00:00","value":"value0"}
+ * {"dataTime":"2025-02-01 00:00:00","value":"value1"}
+ * {"dataTime":"2025-03-01 00:00:00","value":"value2"}
+ * {"dataTime":"2025-04-01 00:00:00","value":"value3"}
+ * {"dataTime":"2025-05-01 00:00:00","value":"value4"}
+ * {"dataTime":"2025-06-01 00:00:00","value":"value5"}
+ * {"dataTime":"2025-07-01 00:00:00","value":"value6"}
+ * {"dataTime":"2025-08-01 00:00:00","value":"value7"}
+ * {"dataTime":"2025-09-01 00:00:00","value":"value8"}
+ * {"dataTime":"2025-10-01 00:00:00","value":"value9"}
+ * {"dataTime":"2025-11-01 00:00:00","value":"value10"}
+ * {"dataTime":"2025-12-01 00:00:00","value":"value11"}
+ * }
+ */
+@Data
+public class TypeTime {
+ private String dataTime;
+ private String value;
+ private String timeCode;
+
+ private Date dateTime;
+}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
index 3a4de64..4ce024d 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/DailyComprehensiveMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.DailyComprehensive;
import org.apache.ibatis.annotations.Param;
@@ -18,13 +17,13 @@
@Param("dataList") List<DailyComprehensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<DailyComprehensive> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
index ca9a75c..15af3ff 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/MonthlyComprehensiveMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.MonthlyComprehensive;
import org.apache.ibatis.annotations.Param;
@@ -29,7 +28,7 @@
@Param("dataList") List<MonthlyComprehensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
/**
@@ -45,7 +44,7 @@
List<MonthlyComprehensive> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/YearComprehensiveMapper.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/YearComprehensiveMapper.java
index 7293dd7..2e6d632 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/YearComprehensiveMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/mapper/YearComprehensiveMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.YearComperhensive;
import org.apache.ibatis.annotations.Param;
@@ -29,7 +28,7 @@
@Param("dataList") List<YearComperhensive> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
/**
@@ -45,7 +44,7 @@
List<YearComperhensive> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IDailyComprehensiveService.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IDailyComprehensiveService.java
index 5378839..c46d162 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IDailyComprehensiveService.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IDailyComprehensiveService.java
@@ -1,7 +1,6 @@
package com.zhitan.comprehensivestatistics.service;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.DailyComprehensive;
import java.util.Date;
@@ -14,6 +13,6 @@
* @date 2020-03-25
*/
public interface IDailyComprehensiveService {
- public List<DailyComprehensive> getDailyComprehensiveList(String nodeId, List<DailyComprehensive> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
- List<DailyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ public List<DailyComprehensive> getDailyComprehensiveList(String nodeId, List<DailyComprehensive> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+ List<DailyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/ImonthlyComprehensive.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/ImonthlyComprehensive.java
index 13221a0..1527ce3 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/ImonthlyComprehensive.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/ImonthlyComprehensive.java
@@ -1,7 +1,6 @@
package com.zhitan.comprehensivestatistics.service;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.MonthlyComprehensive;
import java.util.Date;
@@ -25,7 +24,7 @@
* @param indexStorageId
* @return
*/
- List<MonthlyComprehensive> getMonthlyComprehensiveList(String nodeId, List<MonthlyComprehensive> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ List<MonthlyComprehensive> getMonthlyComprehensiveList(String nodeId, List<MonthlyComprehensive> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
/**
* 鍏ㄥ巶缁煎悎鑳借�楃粺璁� 鏈�
@@ -37,5 +36,5 @@
* @param indexStorageId
* @return
*/
- List<MonthlyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ List<MonthlyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IyearComprehensive.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IyearComprehensive.java
index 2c3a979..566ea94 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IyearComprehensive.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/IyearComprehensive.java
@@ -1,7 +1,6 @@
package com.zhitan.comprehensivestatistics.service;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.YearComperhensive;
import java.util.Date;
@@ -26,7 +25,7 @@
* @return
*/
List<YearComperhensive> getYearComprehensiveList(String nodeId, List<YearComperhensive> dataList,
- Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ Date beginTime, Date endTime, String timeType, String indexStorageId);
/**
* 鑾峰彇缁煎悎鎸囨爣鍒嗘瀽锛堝勾锛夊浘琛ㄦ暟鎹�
@@ -38,5 +37,5 @@
* @param indexStorageId
* @return
*/
- List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/DailyComprehensiveServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/DailyComprehensiveServiceImpl.java
index 19fd4b5..c67511e 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/DailyComprehensiveServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/DailyComprehensiveServiceImpl.java
@@ -1,6 +1,5 @@
package com.zhitan.comprehensivestatistics.service.impl;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.DailyComprehensive;
import com.zhitan.comprehensivestatistics.mapper.DailyComprehensiveMapper;
import com.zhitan.comprehensivestatistics.service.IDailyComprehensiveService;
@@ -24,7 +23,7 @@
private DailyComprehensiveMapper dailyMapper;
public List<DailyComprehensive> getDailyComprehensiveList(String nodeId, List<DailyComprehensive> dataList,
- Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ Date beginTime, Date endTime, String timeType, String indexStorageId){
if (StringUtils.isNotEmpty(nodeId)) {
return dailyMapper.getDailyComprehensiveList(nodeId, dataList, beginTime, endTime, timeType, indexStorageId);
@@ -32,7 +31,7 @@
return Collections.emptyList();
}
@Override
- public List<DailyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<DailyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexId != null && !indexId.isEmpty()) {
return dailyMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/MonthlyComprehensiveServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/MonthlyComprehensiveServiceImpl.java
index 04beef7..64d2bb3 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/MonthlyComprehensiveServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/MonthlyComprehensiveServiceImpl.java
@@ -1,11 +1,9 @@
package com.zhitan.comprehensivestatistics.service.impl;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.comprehensivestatistics.domain.MonthlyComprehensive;
import com.zhitan.comprehensivestatistics.mapper.MonthlyComprehensiveMapper;
import com.zhitan.comprehensivestatistics.service.ImonthlyComprehensive;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -25,7 +23,7 @@
private MonthlyComprehensiveMapper monthMapper;
public List<MonthlyComprehensive> getMonthlyComprehensiveList(String nodeId, List<MonthlyComprehensive> dataList,
- Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ Date beginTime, Date endTime, String timeType, String indexStorageId){
if (StringUtils.isNotEmpty(nodeId)) {
return monthMapper.getMonthlyComprehensiveList(nodeId, dataList, beginTime, endTime, timeType, indexStorageId);
}
@@ -33,7 +31,7 @@
}
@Override
- public List<MonthlyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<MonthlyComprehensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexId != null && !indexId.isEmpty()) {
return monthMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java
index df2ac97..6cf4ac0 100644
--- a/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/comprehensivestatistics/service/impl/YearComprehensiveServiceImpl.java
@@ -2,7 +2,6 @@
import cn.hutool.core.date.DateUtil;
import com.zhitan.common.constant.CommonConst;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.common.utils.DateTimeUtil;
import com.zhitan.comprehensivestatistics.domain.YearComperhensive;
import com.zhitan.comprehensivestatistics.mapper.YearComprehensiveMapper;
@@ -29,14 +28,14 @@
@Override
public List<YearComperhensive> getYearComprehensiveList(String nodeId, List<YearComperhensive> dataList,
- Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ Date beginTime, Date endTime, String timeType, String indexStorageId){
if (StringUtils.isNotEmpty(nodeId)) {
return yearMapper.getYearComprehensiveList(nodeId, dataList, beginTime, endTime, timeType, indexStorageId);
}
return Collections.emptyList();
}
@Override
- public List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<YearComperhensive> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){
List<YearComperhensive> dataList = new ArrayList<>();
if (StringUtils.isNotEmpty(indexId)) {
List<YearComperhensive> listChart = yearMapper.getListChart(indexId, beginTime, endTime, timeType, indexStorageId);
@@ -54,7 +53,7 @@
} else {
yearComperhensive.setTimeCode(format);
yearComperhensive.setIndexId(indexId);
- yearComperhensive.setTimeType(timeType.name());
+ yearComperhensive.setTimeType(timeType);
yearComperhensive.setUnitId(first.getUnitId());
yearComperhensive.setIndexName(first.getIndexName());
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/DailyKeyEquipmentMapper.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/DailyKeyEquipmentMapper.java
index 4ef9af3..f317bc0 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/DailyKeyEquipmentMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/DailyKeyEquipmentMapper.java
@@ -1,7 +1,6 @@
package com.zhitan.keyequipment.mapper;
import com.zhitan.basicdata.domain.FacilityArchives;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.DailyKeyEquipment;
import org.apache.ibatis.annotations.Param;
@@ -19,12 +18,12 @@
@Param("dataList") List<DailyKeyEquipment> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<DailyKeyEquipment> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<FacilityArchives> getFacilityArchives();
List<FacilityArchives> getPointFacility();
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/MonthlyKeyEquipmentMapper.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/MonthlyKeyEquipmentMapper.java
index 557bbdb..db4c6da 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/MonthlyKeyEquipmentMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/MonthlyKeyEquipmentMapper.java
@@ -1,6 +1,5 @@
package com.zhitan.keyequipment.mapper;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.MonthlyKeyEquipment;
import org.apache.ibatis.annotations.Param;
@@ -18,12 +17,12 @@
@Param("dataList") List<MonthlyKeyEquipment> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<MonthlyKeyEquipment> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/YearKeyEquipmentMapper.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/YearKeyEquipmentMapper.java
index 12e61dd..6bc97ad 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/YearKeyEquipmentMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/mapper/YearKeyEquipmentMapper.java
@@ -1,6 +1,6 @@
package com.zhitan.keyequipment.mapper;
-import com.zhitan.common.enums.TimeType;
+import com.zhitan.common.utils.TypeTime;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import org.apache.ibatis.annotations.Param;
@@ -15,15 +15,15 @@
*/
public interface YearKeyEquipmentMapper {
public List<YearKeyEquipment> getYearKeyEquipmentList(@Param("indexIds") List<String> indexIds,
- @Param("dataList") List<YearKeyEquipment> dataList,
+ @Param("dataList") List<TypeTime> dataList,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
+ @Param("timeType") String timeType,
@Param("indexStorageId") String indexStorageId);
List<YearKeyEquipment> getListChart(@Param("indexId") String indexId,
@Param("beginTime") Date beginTime,
@Param("endTime") Date endTime,
- @Param("timeType") TimeType timeType,
- @Param("indexStorageId") String indexStorageId);
+ @Param("timeType") String timeType
+ );
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IDailyKeyEquipmentService.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IDailyKeyEquipmentService.java
index feb1c27..dad2d88 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IDailyKeyEquipmentService.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IDailyKeyEquipmentService.java
@@ -1,7 +1,6 @@
package com.zhitan.keyequipment.service;
import com.zhitan.basicdata.domain.FacilityArchives;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.DailyKeyEquipment;
import java.util.Date;
@@ -14,8 +13,8 @@
* @date 2021-01-11
*/
public interface IDailyKeyEquipmentService {
- public List<DailyKeyEquipment> getdailyKeyEquipmentList(List<String> indexIds, List<DailyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
- public List<DailyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ public List<DailyKeyEquipment> getdailyKeyEquipmentList(List<String> indexIds, List<DailyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+ public List<DailyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId);
public List<FacilityArchives> getFacilityArchives();
public List<FacilityArchives> getPointFacility();
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java
index e3a2cbc..b57380c 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IMonthlyKeyEquipmentService.java
@@ -1,7 +1,6 @@
package com.zhitan.keyequipment.service;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.MonthlyKeyEquipment;
import java.util.Date;
@@ -14,6 +13,8 @@
* @date 2021-01-11
*/
public interface IMonthlyKeyEquipmentService {
- public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
- List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+
+ List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+
+ List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
index e97d0c3..62f5f62 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/IYearKeyEquipmentService.java
@@ -1,8 +1,9 @@
package com.zhitan.keyequipment.service;
-import com.zhitan.common.enums.TimeType;
+import com.zhitan.common.utils.TypeTime;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
+import com.zhitan.realtimedata.domain.dto.DataItemQueryDTO;
import java.util.Date;
import java.util.List;
@@ -14,6 +15,6 @@
* @date 2021-01-11
*/
public interface IYearKeyEquipmentService {
- public List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<YearKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
- List<YearKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId);
+ public List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<TypeTime> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId);
+ List<YearKeyEquipment> getListChart(DataItemQueryDTO queryDto);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/DailyKeyEquipmentServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/DailyKeyEquipmentServiceImpl.java
index d0acd5b..def03eb 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/DailyKeyEquipmentServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/DailyKeyEquipmentServiceImpl.java
@@ -1,7 +1,6 @@
package com.zhitan.keyequipment.service.impl;
import com.zhitan.basicdata.domain.FacilityArchives;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.DailyKeyEquipment;
import com.zhitan.keyequipment.mapper.DailyKeyEquipmentMapper;
import com.zhitan.keyequipment.service.IDailyKeyEquipmentService;
@@ -23,15 +22,25 @@
@Autowired
private DailyKeyEquipmentMapper dailyKeyEquipmentMapper;
+ /**
+ *
+ * @param indexIds
+ * @param dataList
+ * @param beginTime
+ * @param endTime
+ * @param timeType
+ * @param indexStorageId
+ * @return
+ */
@Override
- public List<DailyKeyEquipment> getdailyKeyEquipmentList(List<String> indexIds, List<DailyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<DailyKeyEquipment> getdailyKeyEquipmentList(List<String> indexIds, List<DailyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexIds != null && !indexIds.isEmpty()) {
return dailyKeyEquipmentMapper.getdailyKeyEquipmentList(indexIds, dataList, beginTime, endTime, timeType, indexStorageId);
}
return Collections.emptyList();
}
@Override
- public List<DailyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<DailyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexId != null && !indexId.isEmpty()) {
return dailyKeyEquipmentMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java
index d76e549..577484e 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/MonthlyKeyEquipmentServiceImpl.java
@@ -1,6 +1,5 @@
package com.zhitan.keyequipment.service.impl;
-import com.zhitan.common.enums.TimeType;
import com.zhitan.keyequipment.domain.MonthlyKeyEquipment;
import com.zhitan.keyequipment.mapper.MonthlyKeyEquipmentMapper;
import com.zhitan.keyequipment.service.IMonthlyKeyEquipmentService;
@@ -23,7 +22,7 @@
private MonthlyKeyEquipmentMapper monthlyKeyEquipmentMapper;
@Override
- public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<MonthlyKeyEquipment> getMonthlyKeyEquipmentList(List<String> indexIds, List<MonthlyKeyEquipment> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexIds != null && !indexIds.isEmpty()) {
return monthlyKeyEquipmentMapper.getMonthlyKeyEquipmentList(indexIds, dataList, beginTime, endTime, timeType, indexStorageId);
}
@@ -31,7 +30,7 @@
}
@Override
- public List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<MonthlyKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexId != null && !indexId.isEmpty()) {
return monthlyKeyEquipmentMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/YearKeyEquipmentServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/YearKeyEquipmentServiceImpl.java
index 15c24d6..ce6878b 100644
--- a/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/YearKeyEquipmentServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/keyequipment/service/impl/YearKeyEquipmentServiceImpl.java
@@ -1,9 +1,14 @@
package com.zhitan.keyequipment.service.impl;
-import com.zhitan.common.enums.TimeType;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.zhitan.common.utils.DateTimeUtil;
+import com.zhitan.common.utils.TypeTime;
import com.zhitan.keyequipment.domain.YearKeyEquipment;
import com.zhitan.keyequipment.mapper.YearKeyEquipmentMapper;
import com.zhitan.keyequipment.service.IYearKeyEquipmentService;
+import com.zhitan.realtimedata.domain.dto.DataItemQueryDTO;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,17 +27,19 @@
@Autowired
private YearKeyEquipmentMapper yearKeyEquipmentMapper;
- public List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<YearKeyEquipment> dataList, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
+ public List<YearKeyEquipment> getYearKeyEquipmentList(List<String> indexIds, List<TypeTime> dataList, Date beginTime, Date endTime, String timeType, String indexStorageId){
if (indexIds != null && !indexIds.isEmpty()) {
return yearKeyEquipmentMapper.getYearKeyEquipmentList(indexIds, dataList, beginTime, endTime, timeType, indexStorageId);
}
return Collections.emptyList();
}
@Override
- public List<YearKeyEquipment> getListChart(String indexId, Date beginTime, Date endTime, TimeType timeType, String indexStorageId){
- if (indexId != null && !indexId.isEmpty()) {
- return yearKeyEquipmentMapper.getListChart(indexId,beginTime,endTime,timeType,indexStorageId);
+ public List<YearKeyEquipment> getListChart(DataItemQueryDTO queryDto){
+ if(ObjectUtils.isEmpty(queryDto.getIndexId())){
+ return Collections.emptyList();}
+ Date convertTime = DateTimeUtil.getTime(queryDto.getTimeType(), queryDto.getDataTime());
+ DateTime beginTime = DateUtil.beginOfYear(convertTime);
+ DateTime endTime = DateUtil.endOfYear(convertTime);
+ return yearKeyEquipmentMapper.getListChart(queryDto.getIndexId(),beginTime,endTime,queryDto.getTimeType());
}
- return Collections.emptyList();
- }
}
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
index 08eac67..65e01e4 100644
--- a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/DataItem.java
@@ -1,7 +1,6 @@
package com.zhitan.realtimedata.domain;
import com.zhitan.common.enums.Quality;
-import com.zhitan.common.enums.TimeType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -32,7 +31,7 @@
@ApiModelProperty(value = "鏃堕棿绫诲瀷缂栫爜")
private String timeCode;
@ApiModelProperty(value = "鏃堕棿绫诲瀷")
- private TimeType timeType;
+ private String timeType;
@ApiModelProperty(value = "鍊�")
private Double value;
@ApiModelProperty(value = "璐ㄩ噺")
@@ -110,11 +109,11 @@
this.timeCode = timeCode;
}
- public TimeType getTimeType() {
+ public String getTimeType() {
return timeType;
}
- public void setTimeType(TimeType timeType) {
+ public void setTimeType(String timeType) {
this.timeType = timeType;
}
diff --git a/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/dto/DataItemQueryDTO.java b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/dto/DataItemQueryDTO.java
new file mode 100644
index 0000000..fdf53b1
--- /dev/null
+++ b/zhitan-system/src/main/java/com/zhitan/realtimedata/domain/dto/DataItemQueryDTO.java
@@ -0,0 +1,21 @@
+package com.zhitan.realtimedata.domain.dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鍛ㄦ湡鏁版嵁椤�.
+ */
+@Data
+public class DataItemQueryDTO {
+ @ApiModelProperty(value ="鎸囨爣id")
+ private String indexId;
+
+ @ApiModelProperty(value="妯″瀷code")
+ private String indexCode;
+ @ApiModelProperty(value ="鏃堕棿瀛楃涓�")
+ private String dataTime;
+ @ApiModelProperty(value ="鏃堕棿绫诲瀷")
+ private String timeType;
+ @ApiModelProperty(value = "鑳芥簮绫诲瀷")
+ private String energyType;
+}
diff --git a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
index 6a2316e..3d4e35e 100644
--- a/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/keyequipment/YearKeyEquipmentMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhitan.keyequipment.mapper.YearKeyEquipmentMapper">
<resultMap id="dataItemMap" type="com.zhitan.keyequipment.domain.YearKeyEquipment">
<result column="index_id" property="indexId"/>
@@ -28,14 +28,14 @@
aa.index_id,
aa.index_name,
<foreach item="item" index="index" collection="dataList">
- MAX ( CASE WHEN data_time = #{item.dataTime} THEN "value" END ) AS ${item.value},
+ MAX ( CASE WHEN data_time = #{item.dateTime} THEN "value" END ) AS ${item.value},
</foreach>
aa.time_type
FROM
(
SELECT
ci.index_id,
- ci.NAME AS "index_name",
+ ci.NAME AS "index_name",
di."value",
di.data_time,
di.time_type
@@ -43,9 +43,12 @@
data_item di LEFT JOIN energy_index ci ON di.index_id = ci.index_id
LEFT JOIN facility_archives f ON f."id"=ci.equipment
WHERE
- di.data_time >= #{beginTime}
+ di.data_time >= #{beginTime}
AND di.data_time < #{endTime}
- AND di.index_id IN <foreach item="indexId" index="index" collection="indexIds" open="(" separator="," close=")">#{indexId} </foreach>
+ AND di.index_id IN
+ <foreach item="indexId" index="index" collection="indexIds" open="(" separator="," close=")">
+ #{indexId}
+ </foreach>
AND di.time_type = #{timeType}
<if test="indexStorageId !='' and indexStorageId !=null">
and ci.equipment=#{indexStorageId}
@@ -57,20 +60,24 @@
<select id="getListChart" resultMap="dataItemMap">
SELECT
- di.index_id,
- ci.name AS "index_name",
- ci.unit_id,
- di."value",
- di.data_time,
- di.time_type,
- di.time_code
+ di.index_id,
+ ci.name AS "index_name",
+ ci.unit_id,
+ di."value",
+ di.data_time,
+ di.time_type,
+ di.time_code
FROM
data_item di LEFT JOIN energy_index ci ON di.index_id = ci.index_id
WHERE
- di.index_id =#{indexId}
- AND di.data_time < #{endTime}
- AND di.data_time >= #{beginTime}
+ di.index_id =#{indexId}
+ AND di.data_time < #{endTime}
+ <if test="endTime != null">
+ AND di.data_time >= #{beginTime}
+ </if>
+ <if test="beginTime != null">
AND di.time_type = #{timeType}
+ </if>
order by di.data_time
</select>
</mapper>
--
Gitblit v1.9.3