Merge pull request '峰谷分析，峰谷报表，bug修复' (#29) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/29

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() {

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());

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;