国网侧bug修复，新增新组态设计model

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<CarbonPubProductionReportDTO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        Long tenantCode = MapUtils.getLong(params, "tenantCode");
+        if (Objects.isNull(tenantCode)) {
+            return new Result<List<CarbonPubProductionReportDTO>>().ok(List.of());
+        }
         List<CarbonPubProductionReportDTO> list = carbonPubProductionReportService.listAs(params, CarbonPubProductionReportDTO.class);
         return new Result<List<CarbonPubProductionReportDTO>>().ok(list);
     }

modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/CarbonPubProductionResultController.java

@@ -45,7 +45,7 @@ public class CarbonPubProductionResultController {
     public Result<List<CarbonPubLibRecordSimpleAgg>> getSimpleAggResult(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
         String tenantCodes = MapUtils.getString(params, "tenantCodes");
         if (StringUtils.isBlank(tenantCodes)) {
-            throw new IllegalArgumentException("租户编码不能为空");
+            return new Result<List<CarbonPubLibRecordSimpleAgg>>().ok(Collections.emptyList());
         }
         List<Long> tenantCodeList =
                 Arrays.stream(tenantCodes.split(",")).map(s -> Long.parseLong(s.trim())).toList();

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 BaseServiceImpl<Carbon
                 .leftJoin(CARBON_PUB_PRODUCTION_REPORT_CONFIG_ENTITY)
                 .on(CARBON_PUB_PRODUCTION_REPORT_ENTITY.CONFIG_ID.eq(CARBON_PUB_PRODUCTION_REPORT_CONFIG_ENTITY.ID))
                 .eq(CarbonPubProductionReportEntity::getId, id, Objects::nonNull)
-                .in(CarbonPubProductionReportEntity::getProductId, productIds, CollectionUtils.isNotEmpty(productIds))
+                .in(CarbonPubProductionReportEntity::getProductId, productIds, ObjectUtils.isNotEmpty(productIds))
                 .ge(CarbonPubProductionReportEntity::getCreateDate, startTs, Objects::nonNull)
                 .le(CarbonPubProductionReportEntity::getCreateDate, endTs, Objects::nonNull)
                 .eq(CarbonPubProductionReportEntity::getTenantCode, tenantCode, Objects::nonNull);

modules/pom.xml

@@ -28,6 +28,7 @@
         <module>carbon-track</module>
         <module>carbon-public</module>
         <module>cqc-service</module>
+        <module>visual-design</module>
     </modules>
 
     <artifactId>modules</artifactId>

modules/visual-design/pom.xml

@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.thing</groupId>
+        <artifactId>modules</artifactId>
+        <version>5.1</version>
+    </parent>
+
+    <groupId>com.thing.modules</groupId>
+    <artifactId>visual-design</artifactId>
+    <packaging>jar</packaging>
+    <name>ThingBI Server Modules visual-design</name>
+
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.thing.modules</groupId>
+            <artifactId>thing</artifactId>
+        </dependency>
+    </dependencies>
+</project>