From 10655d5461e8fa5d57d1174b8807ee7ca9e8f720 Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期四, 27 三月 2025 11:33:25 +0800
Subject: [PATCH] 支路用能分析优化

---
 zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
index fecff12..848a1bc 100644
--- a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
@@ -4,15 +4,14 @@
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.zhitan.branchanalysis.domain.BranchAnalysisVO;
+import com.zhitan.branchanalysis.service.IBranchAnalysisService;
 import com.zhitan.common.constant.TimeTypeConst;
 import com.zhitan.common.exception.ServiceException;
 import com.zhitan.common.utils.DateTimeUtil;
-import com.zhitan.branchanalysis.service.IBranchAnalysisService;
 import com.zhitan.common.utils.PropUtils;
 import com.zhitan.common.utils.TypeTime;
 import com.zhitan.dataitem.mapper.DataItemMapper;
 import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
 import com.zhitan.model.mapper.ModelNodeMapper;
 import com.zhitan.realtimedata.domain.DataItem;
 import com.zhitan.realtimedata.domain.dto.BranchAnalysisDTO;
@@ -21,16 +20,14 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * c
+ * 鏀矾鐢ㄨ兘鍒嗘瀽
  *
- * @author sys
- * @date 2021-01-11
+ * @author zt
+ * @date 2025-03-27
  */
 @Service
 @AllArgsConstructor
@@ -53,26 +50,22 @@
             return new BranchAnalysisVO();
         }
 
-        String pattern;
         List<TypeTime> dateTimeList;
         //鏍规嵁鏃堕棿绫诲瀷璋冩暣鏃堕棿鑼冨洿
         switch (dto.getTimeType()) {
             case TimeTypeConst.TIME_TYPE_DAY:
                 timeType = TimeTypeConst.TIME_TYPE_HOUR;
                 endTime = DateUtil.endOfDay(beginTime);
-                pattern = "HH";
                 dateTimeList = DateTimeUtil.getDateTimeListSame(TimeTypeConst.TIME_TYPE_DAY, beginTime);
                 break;
             case TimeTypeConst.TIME_TYPE_MONTH:
                 timeType = TimeTypeConst.TIME_TYPE_DAY;
                 endTime = DateUtil.endOfMonth(beginTime);
-                pattern = "dd";
                 dateTimeList = DateTimeUtil.getDateTimeListSame(TimeTypeConst.TIME_TYPE_MONTH, beginTime);
                 break;
             case TimeTypeConst.TIME_TYPE_YEAR:
                 timeType = TimeTypeConst.TIME_TYPE_MONTH;
                 endTime = DateUtil.endOfYear(beginTime);
-                pattern = "MM";
                 dateTimeList = DateTimeUtil.getDateTimeListSame(TimeTypeConst.TIME_TYPE_YEAR, beginTime);
                 break;
             default:

--
Gitblit v1.9.3