From a788241e0c575c89b12e9c5d9aff2a8e1de66e7d Mon Sep 17 00:00:00 2001
From: xiachao <xiachao@qq.com>
Date: Fri, 30 Aug 2024 10:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B3=B0=E8=B0=B7,=E4=BB=A5=E5=8F=8A=E7=A2=B3?=
 =?UTF-8?q?=E8=B6=B3=E8=BF=B9=E8=AE=A1=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardcal/listener/ProductionResultListener.java    | 6 +++++-
 .../service/impl/IotCarbonProcessStepsServiceImpl.java    | 6 +++++-
 .../peakvalley/service/impl/PeakValleyServiceImpl.java    | 8 ++++----
 .../controller/IotVisualComponentController.java          | 4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java
index 4d2fbae..81c84b5 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/event/standardcal/listener/ProductionResultListener.java
@@ -72,7 +72,11 @@ public class ProductionResultListener {
     public synchronized void calculate(ProductionPage production){
         try {
             QuantityDto quantityDto = iotCarbonProductionRecordService.getQuantityByMidAndPrCode(production.getMId(),production.getPrCode());
-            production.setFinalNum(quantityDto.getFinalNum());
+            try {
+                production.setFinalNum(quantityDto.getFinalNum());
+            } catch (Exception e) {
+                production.setFinalNum(0L);
+            }
             production.setPNum(production.getPNum());
             //bom 原料计算
             calculateBom(production);
diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/steps/service/impl/IotCarbonProcessStepsServiceImpl.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/steps/service/impl/IotCarbonProcessStepsServiceImpl.java
index 457fa31..ddbd40a 100644
--- a/modules/carbon-track/src/main/java/com/thing/carbontrack/steps/service/impl/IotCarbonProcessStepsServiceImpl.java
+++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/steps/service/impl/IotCarbonProcessStepsServiceImpl.java
@@ -81,7 +81,11 @@ public class IotCarbonProcessStepsServiceImpl extends BaseServiceImpl<IotCarbonP
     @Override
     public Long evNumByMid(Long mId) {
         String evIds = this.mapper.evStrByMid(mId);
-        return (long) evIds.split(",").length;
+        try {
+            return (long) evIds.split(",").length;
+        } catch (Exception e) {
+            return 0L;
+        }
     }
 
     @Override
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 e01635d..346a925 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(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
+            if(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(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
+            if(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(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
+            if(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(!"year".equals(param.getTimeType())||ObjectUtil.isNotEmpty(param.getStartTime())){
+            if(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/component/controller/IotVisualComponentController.java b/modules/visual-design/src/main/java/com/thing/visual/component/controller/IotVisualComponentController.java
index bcecaaf..4a838f2 100644
--- a/modules/visual-design/src/main/java/com/thing/visual/component/controller/IotVisualComponentController.java
+++ b/modules/visual-design/src/main/java/com/thing/visual/component/controller/IotVisualComponentController.java
@@ -100,9 +100,9 @@ public class IotVisualComponentController {
         return new Result<List<GroupInfo>>().ok(businessList);
     }
 
-    @GetMapping("adjustSort")
+    @PostMapping("adjustSort")
     @Operation(summary="拖动修改排序")
-    public Result<String> adjustSort(AdjustSortInfo sortInfo){
+    public Result<String> adjustSort(@RequestBody AdjustSortInfo sortInfo){
         String data = iotVisualComponentService.adjustSort(sortInfo);
         return new Result<String>().ok(data);
     }