From 8128e8eba27a250a867e65a3c38df38769ba3727 Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Thu, 29 Aug 2024 17:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B3=B0=E8=B0=B7=E5=88=86=E6=9E=90=EF=BC=8C?=
 =?UTF-8?q?=E5=B3=B0=E8=B0=B7=E6=8A=A5=E8=A1=A8=EF=BC=8Cbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/thing/carbon/peakvalley/dto/PeakValleyParam.java  | 2 ++
 .../peakvalley/service/impl/PeakValleyServiceImpl.java    | 8 ++++----
 .../material/controller/IotVisualMaterialController.java  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/dto/PeakValleyParam.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/dto/PeakValleyParam.java
index c12b88c..f191a9c 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/dto/PeakValleyParam.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/dto/PeakValleyParam.java
@@ -45,6 +45,8 @@ public class PeakValleyParam {
 
     @Schema(description = "结束时间")
     private String endTime;
+    private String timeType;
+
 
     @SuppressWarnings("Duplicates")
     public LocalDateTime getBeginTime() {
diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
index b3a565a..e01635d 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/peakvalley/service/impl/PeakValleyServiceImpl.java
@@ -65,7 +65,7 @@ public class PeakValleyServiceImpl implements PeakValleyService {
         long startTs;
         long endTs;
         if(param.getDateType().equals("any")||param.getDateType().equals("week")){
-            if(param.getStartTime()!=null){
+            if(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
                 startTs = DateTimeUtils.dateToTimestamp(param.getStartTime());
                 endTs = DateTimeUtils.dateToTimestamp(param.getEndTime());
             }else {
@@ -73,7 +73,7 @@ public class PeakValleyServiceImpl implements PeakValleyService {
                 startTs = param.getBeginTime().minusDays(30).atZone(ZoneOffset.UTC).toInstant().toEpochMilli();
             }
         }else {
-            if(param.getStartTime()!=null){
+            if(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
                 startTs = DateTimeUtils.dateToTimestamp(param.getStartTime());
                 endTs = DateTimeUtils.dateToTimestamp(param.getEndTime());
             }else {
@@ -314,14 +314,14 @@ public class PeakValleyServiceImpl implements PeakValleyService {
         }
         List<LocalDateTime> timeRange;
         if(dataType.equals("week")||dataType.equals("any")){
-            if(param.getStartTime()!=null){
+            if(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
                 timeRange= AttributeTypeEnum.getTimeRange(DateTimeUtils.parseDateTime(param.getStartTime()),(DateTimeUtils.parseDateTime(param.getEndTime())));
             }else {
                 param.setDateType("week");
                 timeRange= AttributeTypeEnum.getTimeRange(param.getBeginTime().minusDays(30),param.getBeginTime());
             }
         }else {
-            if(param.getStartTime()!=null){
+            if(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
                 timeRange= AttributeTypeEnum.getTimeRange(DateTimeUtils.parseDateTime(param.getStartTime()),(DateTimeUtils.parseDateTime(param.getEndTime())));
             }else {
                 AttributeTypeEnum attributeTypeEnum = AttributeTypeEnum.match(param.getDateType());
diff --git a/modules/visual-design/src/main/java/com/thing/visual/material/controller/IotVisualMaterialController.java b/modules/visual-design/src/main/java/com/thing/visual/material/controller/IotVisualMaterialController.java
index aee25bb..70ff008 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/material/controller/IotVisualMaterialController.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/material/controller/IotVisualMaterialController.java
@@ -37,7 +37,7 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("v2/visual/material")
-@Tag(name="新素材管理")
+@Tag(name="素材管理-新的")
 public class IotVisualMaterialController {
     @Autowired
     private IotVisualMaterialService iotVisualMaterialService;