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 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>().ok(businessList); } - @GetMapping("adjustSort") + @PostMapping("adjustSort") @Operation(summary="拖动修改排序") - public Result adjustSort(AdjustSortInfo sortInfo){ + public Result adjustSort(@RequestBody AdjustSortInfo sortInfo){ String data = iotVisualComponentService.adjustSort(sortInfo); return new Result().ok(data); }