fix: fix empty data generate excel bug [DEFECT-603]

黄 x
1 parent c13654b6
Showing 4 changed files with 86 additions and 46 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportFormConfigController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/request/QueryConditionDTO.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportFormConfigController.java
View file @95a0d8a
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtReportFormConfigController.java
View file @95a0d8a
@@ -124,6 +124,19 @@ public class YtReportFormConfigController extends BaseController {
   private ResponseResult<ReportFormConfigDTO> saveOrUpdate(ReportFormConfigDTO configDTO)
       throws ThingsboardException, SchedulerException {
     configDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    Long startTs = configDTO.getQueryCondition().getStartTs();
+    Long endTs = configDTO.getQueryCondition().getEndTs();
+    if (null == startTs || null == endTs) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    if (startTs < 946656000000L || endTs < 946656000000L) {
+      throw new YtDataValidationException(
+          ErrorMessage.START_TIME_OR_END_TIME_EXCEPTION.getMessage());
+    }
+    if (startTs > endTs) {
+      throw new YtDataValidationException(
+          ErrorMessage.START_TIME_NOT_MORE_THAN_END_TIME.getMessage());
+    }
     ReportFormConfigDTO newDTO = reportFormConfigService.saveOrUpdateReportFormConfig(configDTO);
     return ResponseResult.success(newDTO);
   }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @95a0d8a
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @95a0d8a
@@ -72,6 +72,7 @@ public enum ErrorMessage {
   CRON_INVALID(400052,"cron表达式无效"),
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),
   START_TIME_NOT_MORE_THAN_END_TIME(400054,"开始时间不能大于结束时间"),
+  START_TIME_OR_END_TIME_EXCEPTION(400055,"开始时间或结束时间异常"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/request/QueryConditionDTO.java
View file @95a0d8a
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/request/QueryConditionDTO.java
View file @95a0d8a
@@ -26,13 +26,15 @@ public class QueryConditionDTO {
   @ApiModelProperty("启用/禁用遥测值到字符串的转换。默认情况下启用转换。设置参数为'true'以禁用转换")
   private boolean useStrictDataTypes;
-  /** 数据周期：单位毫秒 */
-  @ApiModelProperty(value = "开始时间", required = true)
+  @ApiModelProperty(value = "开始时间:单位毫秒", required = true)
   @NotNull(message = "开始时间不能为空", groups = AddGroup.class)
   private Long startTs;
-  /** 时间间隔：单位毫秒 */
-  @ApiModelProperty(value = "结束时间", required = true)
+  @ApiModelProperty(value = "结束时间:单位毫秒", required = true)
   @NotNull(message = "结束时间不能为空", groups = AddGroup.class)
   private Long endTs ;
+
+  @ApiModelProperty(value = "查询方式:0 周期查询 1自定查询", required = true)
+  @NotNull(message = "查询方式不能为空", groups = AddGroup.class)
+  private Integer queryMode;
 }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
View file @95a0d8a
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtReportGenerateRecordServiceImpl.java
View file @95a0d8a
@@ -156,7 +156,7 @@ public class YtReportGenerateRecordServiceImpl
   @Override
   public void generateExcelUpdateReportRecord(
-      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId,int surplus) {
+      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId, int surplus) {
     Long startTs = formConfigDTO.getQueryCondition().getStartTs();
     Long endTs = formConfigDTO.getQueryCondition().getEndTs();
     // 如果报表配置是定时执行,获取当前定时任务的执行时间,并计算新的开始时间、结束时间
@@ -166,19 +166,18 @@ public class YtReportGenerateRecordServiceImpl
       long differenceTs = endTs - startTs;
       endTs = recordDTO.getExecuteTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
       startTs = endTs - differenceTs;
+      formConfigDTO.getQueryCondition().setStartTs(startTs);
+      formConfigDTO.getQueryCondition().setEndTs(endTs);
     }
-    Long finalStartTs = startTs;
-    Long finalEndTs = endTs;
-    getTsKvValuesOrGenerateExcel(null, formConfigDTO, finalStartTs, finalEndTs, dto, recordId,surplus);
+    getTsKvValuesOrGenerateExcel(null, formConfigDTO, dto, recordId, surplus);
   }
   private void getTsKvValuesOrGenerateExcel(
       final DeferredResult<ResponseEntity> result,
       ReportFormConfigDTO formConfigDTO,
-      Long finalStartTs,
-      Long finalEndTs,
       ExecuteAttributesDTO dto,
-      String recordId,int surplus) {
+      String recordId,
+      int surplus) {
     QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
     boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
     Long interval = queryCondition.getInterval();
@@ -189,6 +188,8 @@ public class YtReportGenerateRecordServiceImpl
     DeviceId entityId = DeviceId.fromString(dto.getDevice());
     String reportTenantId = formConfigDTO.getTenantId();
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(reportTenantId));
+    Long finalStartTs = queryCondition.getStartTs();
+    Long finalEndTs = queryCondition.getEndTs();
     List<ReadTsKvQuery> queries =
         keys.stream()
             .map(
@@ -200,10 +201,11 @@ public class YtReportGenerateRecordServiceImpl
     queryCondition.setEndTs(finalEndTs);
     ObjectNode executeCondition = JacksonUtil.newObjectNode();
     executeCondition.replace(
-        FastIotConstants.CHART_EXECUTE_CONDITION, JacksonUtil.convertValue(queryCondition,JsonNode.class));
+        FastIotConstants.CHART_EXECUTE_CONDITION,
+        JacksonUtil.convertValue(queryCondition, JsonNode.class));
     executeCondition.replace(
         FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
-        JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(),JsonNode.class));
+        JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(), JsonNode.class));
     Futures.addCallback(
         tsService.findAll(tenantId, entityId, queries),
         getTsKvListCallback(
@@ -213,7 +215,9 @@ public class YtReportGenerateRecordServiceImpl
             dto.getName(),
             recordId,
             reportTenantId,
-            executeCondition,surplus),
+            executeCondition,
+            surplus,
+            keys),
         MoreExecutors.directExecutor());
   }
@@ -237,7 +241,9 @@ public class YtReportGenerateRecordServiceImpl
       String deviceName,
       String reportGenerateRecordId,
       String tenantId,
-      JsonNode executeCondition,int surplus) {
+      JsonNode executeCondition,
+      int surplus,
+      List<String> keys) {
     return new FutureCallback<>() {
       @Override
       public void onSuccess(List<TsKvEntry> data) {
@@ -255,7 +261,9 @@ public class YtReportGenerateRecordServiceImpl
               result,
               reportGenerateRecordId,
               tenantId,
-              executeCondition,surplus);
+              executeCondition,
+              surplus,
+              keys);
         } else {
           response.setResult(new ResponseEntity<>(result, HttpStatus.OK));
         }
@@ -282,39 +290,18 @@ public class YtReportGenerateRecordServiceImpl
       Map<String, List<BasicData>> result,
       String reportGenerateRecordId,
       String tenantId,
-      JsonNode executeCondition,int surplus) {
+      JsonNode executeCondition,
+      int surplus,
+      List<String> keys) {
     List<List<String>> heads = new ArrayList<>();
     List<List<Object>> values = new ArrayList<>();
-    int firstKey = 0;
-    for (String key : result.keySet()) {
-      List<String> headValue = new ArrayList<>();
-      headValue.add(deviceName);
-      headValue.add(key + "采集值");
-      List<String> tsValue = new ArrayList<>();
-      tsValue.add(deviceName);
-      tsValue.add(key + "采集时间");
-      heads.add(headValue);
-      heads.add(tsValue);
-      List<BasicData> basicData = result.get(key);
-      for (int i = 0; i < basicData.size(); i++) {
-        BasicData item = basicData.get(i);
-        List<Object> listValue;
-        if (firstKey == 0) {
-          listValue = new ArrayList<>();
-        } else {
-          listValue = values.get(i);
-        }
-        Object value = item.getValue();
-        listValue.add(value);
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        Timestamp t = new Timestamp(item.getTs());
-        listValue.add(t.toLocalDateTime().format(dtf));
-        if (firstKey == 0) {
-          values.add(listValue);
-        }
+    if (result.isEmpty()) {
+      for (String key : keys) {
+        List<BasicData> data = new ArrayList<>();
+        result.put(key, data);
       }
-      firstKey++;
     }
+    generateExcelHeadAndValues(result, deviceName, heads, values);
     ByteArrayOutputStream byteArrayOutputStream =
         ExcelUtil.noModelWrite(reportFormName, heads, values);
     String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
@@ -340,11 +327,48 @@ public class YtReportGenerateRecordServiceImpl
       } else {
         status = StatusEnum.FAIL.getIndex();
       }
-      if(surplus == FastIotConstants.MagicNumber.ONE){
+      if (surplus == FastIotConstants.MagicNumber.ONE) {
         recordDTO.setExecuteStatus(status);
       }
       recordDTO.setExecuteCondition(executeCondition);
       saveOrUpdateReportGenerateRecord(recordDTO);
     }
   }
+
+  private void generateExcelHeadAndValues(
+      Map<String, List<BasicData>> result,
+      String deviceName,
+      List<List<String>> heads,
+      List<List<Object>> values) {
+    int firstKey = 0;
+    for (String key : result.keySet()) {
+      List<String> headValue = new ArrayList<>();
+      headValue.add(deviceName);
+      headValue.add(key + "采集值");
+      List<String> tsValue = new ArrayList<>();
+      tsValue.add(deviceName);
+      tsValue.add(key + "采集时间");
+      heads.add(headValue);
+      heads.add(tsValue);
+      List<BasicData> basicData = result.get(key);
+      for (int i = 0; i < basicData.size(); i++) {
+        BasicData item = basicData.get(i);
+        List<Object> listValue;
+        if (firstKey == 0) {
+          listValue = new ArrayList<>();
+        } else {
+          listValue = values.get(i);
+        }
+        Object value = item.getValue();
+        listValue.add(value);
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        Timestamp t = new Timestamp(item.getTs());
+        listValue.add(t.toLocalDateTime().format(dtf));
+        if (firstKey == 0) {
+          values.add(listValue);
+        }
+      }
+      firstKey++;
+    }
+  }
 }