diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java index 9d5638d..d6d658c 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionReportController.java @@ -20,11 +20,13 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.MapUtils; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 产品碳足迹报告 @@ -68,6 +70,10 @@ public class CarbonPubProductionReportController { @Parameter(name = "tenantCode", description = "租户编码"), }) public Result> list(@Parameter(hidden = true) @RequestParam Map params){ + Long tenantCode = MapUtils.getLong(params, "tenantCode"); + if (Objects.isNull(tenantCode)) { + return new Result>().ok(List.of()); + } List list = carbonPubProductionReportService.listAs(params, CarbonPubProductionReportDTO.class); return new Result>().ok(list); } diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java index 76a15c0..e2d74d0 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java @@ -45,7 +45,7 @@ public class CarbonPubProductionResultController { public Result> getSimpleAggResult(@Parameter(hidden = true) @RequestParam Map params){ String tenantCodes = MapUtils.getString(params, "tenantCodes"); if (StringUtils.isBlank(tenantCodes)) { - throw new IllegalArgumentException("租户编码不能为空"); + return new Result>().ok(Collections.emptyList()); } List tenantCodeList = Arrays.stream(tenantCodes.split(",")).map(s -> Long.parseLong(s.trim())).toList(); diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java index f2e7d8b..bc61c1e 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/CarbonPubProductionReportServiceImpl.java @@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.springframework.stereotype.Service; @@ -76,7 +77,7 @@ public class CarbonPubProductionReportServiceImpl extends BaseServiceImplcarbon-track carbon-public cqc-service + visual-design modules diff --git a/modules/visual-design/pom.xml b/modules/visual-design/pom.xml new file mode 100644 index 0000000..dbccc95 --- /dev/null +++ b/modules/visual-design/pom.xml @@ -0,0 +1,31 @@ + + 4.0.0 + + com.thing + modules + 5.1 + + + com.thing.modules + visual-design + jar + ThingBI Server Modules visual-design + + + + UTF-8 + + + + + org.projectlombok + lombok + + + + com.thing.modules + thing + + +