Merge branch 'master_dev' into 'master'

报表生成时,将多个设备用不同的sheet页来存储数据

See merge request yunteng/thingskit!243

@@ -306,11 +306,13 @@ public class TkDeviceController extends BaseController {
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    List<String> tdIds = tkdeviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
-    for (String id : tdIds) {
-      deleteTbDevice(id);
+    List<String> tdIds = tkdeviceService.findTbDeviceIdAndCheckForDelete(currentTenantId, deleteDTO.getIds());
+    if(null !=tdIds){
+      for (String id : tdIds) {
+        deleteTbDevice(id);
+      }
+      tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
     }
-    tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
   }
 
   private void deleteTbDevice(String id) throws ThingsboardException {

@@ -176,9 +176,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         save(deviceId, LAST_CONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, CONNECT_EVENT);
         checkAndUpdateState(deviceId, stateData);
-        //ThingsKit
-        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.ONLINE);
-
     }
 
     @Override
@@ -204,8 +201,12 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                 save(deviceId, ACTIVITY_STATE, true);
                 pushRuleEngineMessage(stateData, ACTIVITY_EVENT);
                 //thingkit function
-                tkDeviceService.updateDeviceStateByTbDeviceId(stateData.getTenantId().getId().toString(),deviceId.getId().toString(),
+                String tenantId = stateData.getTenantId().getId().toString();
+                String tbDeviceId = deviceId.getId().toString();
+                tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
                         org.thingsboard.server.common.data.yunteng.enums.DeviceState.ONLINE);
+                //ThingsKit
+                saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.ONLINE);
             }
         } else {
             log.debug("updateActivityState - fetched state IN NULL for device {}, lastReportedActivity {}", deviceId, lastReportedActivity);
@@ -223,8 +224,6 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
         stateData.getState().setLastDisconnectTime(ts);
         save(deviceId, LAST_DISCONNECT_TIME, ts);
         pushRuleEngineMessage(stateData, DISCONNECT_EVENT);
-        //ThingsKit
-        saveDeviceStateLog(tenantId.toString(),deviceId.toString(), FastIotConstants.StateValue.OFFLINE);
     }
 
     @Override
@@ -422,8 +421,11 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     pushRuleEngineMessage(stateData, INACTIVITY_EVENT);
                     //thingskit update tkDevice state
                     if(stateData.getState().getLastActivityTime()>0){
-                        tkDeviceService.updateDeviceStateByTbDeviceId(stateData.getTenantId().getId().toString(),
-                                deviceId.getId().toString(),org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
+                        String tenantId = stateData.getTenantId().getId().toString();
+                        String tbDeviceId = deviceId.getId().toString();
+                        tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
+                                org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
+                        saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
                     }
                 } else {
                     cleanupEntity(deviceId);

@@ -1191,14 +1191,8 @@ management:
         include: '${METRICS_ENDPOINTS_EXPOSE:info}'
 file:
   storage:
-    type: ${FILE_STORAGE_TYPE:minio}                         #local, minio, or other to be implemented
-    randomFileName: ${FILE_STORAGE_FILENAME:true}                    #是否重命名文件名字，防止冲突
-    local:
-      uploadDir: ${FILE_LOCAL_UPLOAD_DIR:/var/thingskit/upload/}     #文件上传地址 只有type = local需要
-      downloadPath: ${FILE_LOCAL_DOWN_PATH:/download_file/}      #与controller里面下载文件GetMapping的path一致, 只有type = local需要
-      uploadPath: ${FILE_LOCAL_UPLOAD_PATH:/upload}                   #与controller里面下载文件GetMapping的path一致, 只有type = local需要
-      staticUrl: ${FILE_LOCAL_STATIC_URL:/static/files/**}              #oss静态访问路径 只有type = local需要
-      randomFileName: ${file.storage.randomFileName}
+    type: ${FILE_STORAGE_TYPE:minio}                         #minio, or other to be implemented
+    randomFileName: ${FILE_STORAGE_FILENAME:true}            #是否重命名文件名字，防止冲突
     minio:
       minioUrl: ${MINIO_URL:http://127.0.0.1:9000}  #minio储存地址
       minioName: ${MINIO_NAME:xxxxxx}                    #minio账户

@@ -3,5 +3,5 @@ package org.thingsboard.server.common.data.yunteng.config.sms;
 import java.util.LinkedHashMap;
 
 public interface SmsSender {
-    String sendSms(String phone, String templateCode, LinkedHashMap<String,String> param,String signName);
+    String sendSms(String phone, String templateCode, LinkedHashMap<String,Object> param,String signName);
 }

@@ -47,7 +47,7 @@ public class AliSmsSender extends AbstractSmsSender {
 
   @Override
   public String sendSms(
-      String phone, String templateCode, LinkedHashMap<String, String> param, String signName) {
+      String phone, String templateCode, LinkedHashMap<String, Object> param, String signName) {
     validatePhoneNumber(phone);
     IAcsClient client = new DefaultAcsClient(profile);
     SendSmsRequest request = new SendSmsRequest();

@@ -13,7 +13,7 @@ public class TencentSmsSender extends AbstractSmsSender {
 
   @Override
   public String sendSms(
-      String phone, String templateCode, LinkedHashMap<String, String> param, String signName) {
+      String phone, String templateCode, LinkedHashMap<String, Object> param, String signName) {
     return "";
   }
 }

@@ -112,8 +112,9 @@ public enum ErrorMessage {
   MESSAGE_TEMPLATE_DELETED(400020,"消息模板不存在！"),
   NEED_MAIN_PARAMETER(400021, "缺少必要参数【%s】"),
   REGISTER_VALUE_IS_NONE(400022, "寄存器值不能为空"),
+  GATE_WAY_DEVICE_HAS_SENSOR(400023, "网关设备【%s】有下挂网关子设备"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
-  MESSAGE_TEMPLATE_USING_CONFIG(500004,"删除消息配置前，需要禁用使用消息配置的消息模板%s。");
+  MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用");
   private final int code;
   private String message;
 

+package org.thingsboard.server.common.data.yunteng.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CustomDataForExcelDTO {
+  /** sheet页名称 */
+  String sheetName;
+  /** sheet页的头 */
+  List<List<String>> sheetHeads;
+  /** sheet的数据 */
+  List<?> sheetData;
+
+  public CustomDataForExcelDTO(String sheetName, List<List<String>> sheetHeads, List<?> sheetData) {
+    this.sheetName = sheetName;
+    this.sheetHeads = sheetHeads;
+    this.sheetData = sheetData;
+  }
+}

@@ -11,7 +11,7 @@ import java.util.LinkedHashMap;
 public class SmsReqDTO {
 
   /** 模板参数 */
-  private LinkedHashMap<String, String> params;
+  private LinkedHashMap<String, Object> params;
 
   /** 手机号码 */
   @Pattern(regexp = FastIotConstants.MOBILE, message = "请输入正确的手机号")

@@ -6,6 +6,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.thingsboard.server.common.data.yunteng.dto.report.CustomDataForExcelDTO;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
@@ -79,4 +80,26 @@ public class ExcelUtil {
     excelWriter.write(data, writeSheet);
   }
 
+  /**
+   * 生成多sheet页的excel,一个设备用一个sheet页
+   * @param list 自定义数据
+   * @return 输出流
+   */
+  public static ByteArrayOutputStream manySheetWrite(List<CustomDataForExcelDTO> list) {
+    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+    if (null != list && !list.isEmpty()) {
+      try (ExcelWriter excelWriter = EasyExcel.write(byteArrayOutputStream).build()) {
+        int i = 0;
+        for (CustomDataForExcelDTO customDataForExcel : list) {
+          WriteSheet writeSheet =
+              EasyExcel.writerSheet(i, customDataForExcel.getSheetName())
+                  .head(customDataForExcel.getSheetHeads())
+                  .build();
+          excelWriter.write(customDataForExcel.getSheetData(), writeSheet);
+          i++;
+        }
+      }
+    }
+    return byteArrayOutputStream;
+  }
 }

@@ -8,11 +8,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
-import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.TkReportFormConfigService;
 import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
 import java.util.*;
@@ -25,8 +22,6 @@ public class ReportTask {
 
   private final TkReportGenerateRecordService tkReportGenerateRecordService;
 
-  private final TkDeviceService tkDeviceService;
-
   public void multipleParams(String s, Boolean b, Long l, Double d, Integer i) {
     System.out.println("执行多参方法： s=" + s + "b=" + b + "l=" + l + "d" + d + "i=" + i);
   }
@@ -51,23 +46,8 @@ public class ReportTask {
             // 关联设备
             List<ExecuteAttributesDTO> dtoList = reportFormConfigDTO.getExecuteAttributes();
             if (!dtoList.isEmpty()) {
-              if (dtoList.size() == FastIotConstants.MagicNumber.ONE) {
-                try {
-                  ExecuteAttributesDTO attributesDTO = dtoList.get(0);
-                  getTsKvForGenerateExcel(
-                      reportFormConfigDTO, attributesDTO, reportGenerateRecordId, dtoList.size());
-
-                } catch (Exception e) {
-                  log.error(e.getMessage());
-                }
-              } else {
-                int surplus = dtoList.size();
-                for (ExecuteAttributesDTO dto : dtoList) {
-                  getTsKvForGenerateExcel(
-                      reportFormConfigDTO, dto, reportGenerateRecordId, surplus);
-                  surplus--;
-                }
-              }
+              tkReportGenerateRecordService.generateExcelUpdateReportRecord(
+                  reportFormConfigDTO, dtoList, reportGenerateRecordId);
             }
           }
 
@@ -76,17 +56,4 @@ public class ReportTask {
         },
         MoreExecutors.directExecutor());
   }
-
-  private void getTsKvForGenerateExcel(
-      ReportFormConfigDTO formConfigDTO,
-      ExecuteAttributesDTO dto,
-      String reportGenerateRecordId,
-      int surplus) {
-    //检查设备是否存在
-    DeviceDTO deviceDTO = tkDeviceService.findDeviceInfoByTbDeviceId(formConfigDTO.getTenantId(),dto.getDevice());
-    if(null != deviceDTO){
-      tkReportGenerateRecordService.generateExcelUpdateReportRecord(
-              formConfigDTO, dto, reportGenerateRecordId, surplus);
-    }
-  }
 }

 package org.thingsboard.server.dao.yunteng.entities;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,6 +25,7 @@ public class SysTenantEntity extends AuditRelatedEntity {
 
   private String defaultConfig;
 
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
   private LocalDateTime tenantExpireTime;
 
   /** TB的租户ID */

@@ -249,13 +249,17 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
                           .eq(SysRoleEntity::getRoleType, RoleEnum.CUSTOMER_USER.name()));
               customerRoles.forEach(cr -> menuMapper.removeMenuFromRole(cr.getId(), removeMenus));
             }
-            newMenus.forEach(
-                menu -> {
-                  SysTenantMenuEntity tenantMenu = new SysTenantMenuEntity();
-                  tenantMenu.setMenuId(menu);
-                  tenantMenu.setTenantId(updateTenantId);
-                  tenantMenuMapper.insert(tenantMenu);
-                });
+            if (!newMenus.isEmpty()) {
+              // 如果新增的菜单，在该租户下的另外一个角色已经存在了，就不需要再插入数据库
+              List<String> chechResultList = checkNewMenus(updateTenantId, newMenus);
+              chechResultList.forEach(
+                  menu -> {
+                    SysTenantMenuEntity tenantMenu = new SysTenantMenuEntity();
+                    tenantMenu.setMenuId(menu);
+                    tenantMenu.setTenantId(updateTenantId);
+                    tenantMenuMapper.insert(tenantMenu);
+                  });
+            }
           });
     }
     cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
@@ -283,4 +287,27 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
     }
     return baseMapper.findRoleInfo(roleDTO);
   }
+
+  private List<String> checkNewMenus(String tenantId, List<String> newMenus) {
+    List<SysTenantMenuEntity> existEntities =
+        tenantMenuMapper.selectList(
+            new LambdaQueryWrapper<SysTenantMenuEntity>()
+                .eq(SysTenantMenuEntity::getTenantId, tenantId)
+                .in(SysTenantMenuEntity::getMenuId, newMenus));
+    if (!existEntities.isEmpty()) {
+      List<String> existMenuIds =
+          existEntities.stream().map(SysTenantMenuEntity::getMenuId).collect(Collectors.toList());
+      List<String> tempList = existMenuIds;
+      for (String newMenu : newMenus) {
+        for (String menuId : existMenuIds) {
+          if (Objects.equals(menuId, newMenu)) {
+            tempList.remove(newMenu);
+            break;
+          }
+        }
+      }
+      return tempList;
+    }
+    return newMenus;
+  }
 }

@@ -563,7 +563,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       SmsReqDTO smsReqDTO = new SmsReqDTO();
       smsReqDTO.setPhoneNumbers(user.getPhoneNumber());
       smsReqDTO.setId(templateDTOList.get(0).getId());
-      LinkedHashMap<String, String> params = new LinkedHashMap<>();
+      LinkedHashMap<String, Object> params = new LinkedHashMap<>();
       params.put("code", accountProperties.getDefaultPassword());
       smsReqDTO.setParams(params);
       smsReqDTO.setTemplatePurpose(messageTemplateDTO.getTemplatePurpose());

@@ -9,7 +9,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -94,7 +93,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO)  throws RuntimeException{
+  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO)
+      throws RuntimeException {
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String deviceTenantId;
     if (StringUtils.isBlank(deviceDTO.getName())) {
@@ -132,25 +132,30 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
     OrganizationDTO organization =
-            organizationService.findOrganizationById(deviceDTO.getOrganizationId(),deviceTenantId);
+        organizationService.findOrganizationById(deviceDTO.getOrganizationId(), deviceTenantId);
     if (null == deviceProfile || null == organization) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
       throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
-    //如果是TCP的网关子设备,要验证其Code是否已在网关的其他子设备存在
-    if(Objects.equals(deviceDTO.getDeviceType(),DeviceTypeEnum.SENSOR) && Objects.equals(deviceProfile.getTransportType(),
-            DeviceTransportType.TCP)){
+    // 如果是TCP的网关子设备,要验证其Code是否已在网关的其他子设备存在
+    if (Objects.equals(deviceDTO.getDeviceType(), DeviceTypeEnum.SENSOR)
+        && Objects.equals(deviceProfile.getTransportType(), DeviceTransportType.TCP)) {
       String gateWayId = deviceDTO.getGatewayId();
-      List<TkDeviceEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>()
-              .eq(TkDeviceEntity::getTenantId,currentTenantId)
-              .eq(TkDeviceEntity::getGatewayId,gateWayId)
-              .ne(!insert,TkDeviceEntity::getId,deviceDTO.getId()));
-      if(null != entities && !entities.isEmpty()){
-        for (TkDeviceEntity entity:entities) {
-          if(Objects.equals(deviceDTO.getCode(),entity.getCode())){
-            throw new TkDataValidationException(String.format(ErrorMessage.DEVICE_IDENTIFIER_REPEATED.getMessage(),
-                    deviceDTO.getCode(),StringUtils.isEmpty(entity.getAlias())?entity.getName():entity.getAlias()));
+      List<TkDeviceEntity> entities =
+          baseMapper.selectList(
+              new LambdaQueryWrapper<TkDeviceEntity>()
+                  .eq(TkDeviceEntity::getTenantId, currentTenantId)
+                  .eq(TkDeviceEntity::getGatewayId, gateWayId)
+                  .ne(!insert, TkDeviceEntity::getId, deviceDTO.getId()));
+      if (null != entities && !entities.isEmpty()) {
+        for (TkDeviceEntity entity : entities) {
+          if (Objects.equals(deviceDTO.getCode(), entity.getCode())) {
+            throw new TkDataValidationException(
+                String.format(
+                    ErrorMessage.DEVICE_IDENTIFIER_REPEATED.getMessage(),
+                    deviceDTO.getCode(),
+                    StringUtils.isEmpty(entity.getAlias()) ? entity.getName() : entity.getAlias()));
           }
         }
       }
@@ -248,21 +253,38 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public List<String> findTbDeviceId(String tenantId, Set<String> ids) {
+  public List<String> findTbDeviceIdAndCheckForDelete(String tenantId, Set<String> ids) {
     LambdaQueryWrapper<TkDeviceEntity> queryWrapper =
         new QueryWrapper<TkDeviceEntity>()
             .lambda()
             .eq(TkDeviceEntity::getTenantId, tenantId)
             .in(TkDeviceEntity::getId, ids);
 
-    List<String> tbDeviceIds =
-        baseMapper.selectList(queryWrapper).stream()
-            .map(TkDeviceEntity::getTbDeviceId)
-            .collect(Collectors.toList());
-    for (String tbDeviceId : tbDeviceIds) {
+    List<TkDeviceEntity> list = baseMapper.selectList(queryWrapper);
+    if (null == list || list.isEmpty()) {
+      return null;
+    }
+    for (TkDeviceEntity entity : list) {
+      String tbDeviceId = entity.getTbDeviceId();
       sceneNotUsed(tenantId, tbDeviceId, null);
+      // 检查是否有网关子设备在使用该设备
+      if (Objects.equals(entity.getDeviceType(), DeviceTypeEnum.GATEWAY)) {
+        int sensorSize =
+            baseMapper
+                .selectList(
+                    new LambdaQueryWrapper<TkDeviceEntity>()
+                        .eq(TkDeviceEntity::getTenantId, tenantId)
+                        .eq(TkDeviceEntity::getGatewayId, tbDeviceId))
+                .size();
+        if (sensorSize > FastIotConstants.MagicNumber.ZERO) {
+          throw new TkDataValidationException(
+              String.format(
+                  ErrorMessage.GATE_WAY_DEVICE_HAS_SENSOR.getMessage(),
+                  StringUtils.isEmpty(entity.getAlias()) ? entity.getName() : entity.getAlias()));
+        }
+      }
     }
-    return tbDeviceIds;
+    return list.stream().map(TkDeviceEntity::getTbDeviceId).collect(Collectors.toList());
   }
 
   @Override
@@ -378,7 +400,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     String convertConfigId =
         Optional.ofNullable(queryMap.get("convertConfigId")).map(Object::toString).orElse(null);
     if (!StringUtils.isEmpty(organizationId)) {
-      List<String> queryOrganizationIds = organizationService.organizationAllIds(tenantId, organizationId);
+      List<String> queryOrganizationIds =
+          organizationService.organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
     // 用于数据流转已选,待选过滤============开始
@@ -413,8 +436,6 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     return new TkPageData<>(records, deviceIPage.getTotal());
   }
 
-
-
   @Override
   public TkPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
     IPage<TkDeviceEntity> page = getPage(queryMap, "last_online_time", false);
@@ -636,8 +657,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
             attribute.put("name", dto.getFunctionName());
             attribute.put("identifier", dto.getIdentifier());
             attribute.put("detail", functionJson);
-            attribute.put("accessMode",dto.getAccessMode());
-            attribute.put("extensionDesc",dto.getExtensionDesc());
+            attribute.put("accessMode", dto.getAccessMode());
+            attribute.put("extensionDesc", dto.getExtensionDesc());
             attributes.add(attribute);
           }
         }
@@ -662,7 +683,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return baseMapper.findDeviceInfo(tenantId, tbDeviceId);
   }
-  @Cacheable(cacheNames = FastIotConstants.CacheConfigKey.SCENE_REACT, key = "{#tenantId, #organizationId, #projectId}")
+
+  @Cacheable(
+      cacheNames = FastIotConstants.CacheConfigKey.SCENE_REACT,
+      key = "{#tenantId, #organizationId, #projectId}")
   @Override
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
     List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);

@@ -17,7 +17,6 @@ import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.MessageConfigDTO;
-import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkMessageConfigEntity;
@@ -26,8 +25,6 @@ import org.thingsboard.server.dao.yunteng.mapper.MessageConfigMapper;
 import org.thingsboard.server.dao.yunteng.mapper.MessageTemplateMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkMessageConfigService;
-import org.thingsboard.server.dao.yunteng.service.TkMessageTemplateService;
-import org.thingsboard.server.dao.yunteng.service.TkUserService;
 
 @Service
 @Slf4j
@@ -36,6 +33,7 @@ public class TkMessageConfigServiceImpl
     extends AbstractBaseService<MessageConfigMapper, TkMessageConfigEntity>
     implements TkMessageConfigService {
   private final MessageTemplateMapper templateMapper;
+
   @Override
   public TkPageData<MessageConfigDTO> page(String tenantId, Map<String, Object> queryMap) {
     IPage<TkMessageConfigEntity> configIPage =
@@ -76,16 +74,19 @@ public class TkMessageConfigServiceImpl
 
   @Override
   @Transactional
-  public boolean deleteMessageConfig(Set<String> ids,String tenantId) {
+  public boolean deleteMessageConfig(Set<String> ids, String tenantId) {
     LambdaQueryWrapper<TkMessageTemplateEntity> filter = new LambdaQueryWrapper<>();
     filter
         .in(TkMessageTemplateEntity::getMessageConfigId, ids)
-        .eq(TkMessageTemplateEntity::getTenantId, tenantId)
-        .eq(TkMessageTemplateEntity::getStatus, StatusEnum.ENABLE.getIndex());
+        .eq(TkMessageTemplateEntity::getTenantId, tenantId);
     List<TkMessageTemplateEntity> templates = templateMapper.selectList(filter);
-    if(templates.size()>0){
-      List<String> templateNames =templates.stream().map(t->t.getTemplateName()).collect(Collectors.toList());
-      String errMsg = String.format(ErrorMessage.MESSAGE_TEMPLATE_USING_CONFIG.getMessage(), templateNames);
+    if (templates.size() > 0) {
+      List<String> templateNames =
+          templates.stream()
+              .map(TkMessageTemplateEntity::getTemplateName)
+              .collect(Collectors.toList());
+      String errMsg =
+          String.format(ErrorMessage.MESSAGE_TEMPLATE_USING_CONFIG.getMessage(), templateNames);
       throw new TkDataValidationException(errMsg);
     }
     return baseMapper.deleteBatchIds(ids) > 0;

@@ -139,7 +139,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
         info.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_ALARM_NOTICE.name());
-        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        LinkedHashMap<String, Object> params = new LinkedHashMap<>();
         //name-其他；device_name-其他；level-其他；location-其他；alarm_value-其他；
         params.put("type", alarmInfo.getType());
         params.put("device_name", alarmInfo.getDeviceName());
@@ -201,7 +201,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
         // TODO 推送钉钉消息
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
-        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        LinkedHashMap<String, Object> params = new LinkedHashMap<>();
         //name-其他；device_name-其他；level-其他；location-其他；alarm_value-其他；
         params.put("type", alarmInfo.getType());
         params.put("device_name", alarmInfo.getDeviceName());
@@ -231,7 +231,7 @@ public class TkNoticeServiceImpl implements TkNoticeService {
         // TODO 推送微信通知
         SmsReqDTO info = new SmsReqDTO();
         info.setId(templateId);
-        LinkedHashMap<String, String> params = new LinkedHashMap<>();
+        LinkedHashMap<String, Object> params = new LinkedHashMap<>();
         //name-其他；device_name-其他；level-其他；location-其他；alarm_value-其他；
         params.put("type", alarmInfo.getType());
         params.put("device_name", alarmInfo.getDeviceName());

@@ -303,12 +303,8 @@ public class TkReportFromConfigServiceImpl
     ReportGenerateRecordDTO recordDTO =
         tkReportGenerateRecordService.generateReportRecord(reportFormConfigDTO, null);
     // 生成Excel,并更新报表执行记录
-    int surplus = reportFormConfigDTO.getExecuteAttributes().size();
-    for (ExecuteAttributesDTO dto : reportFormConfigDTO.getExecuteAttributes()) {
-      tkReportGenerateRecordService.generateExcelUpdateReportRecord(
-          reportFormConfigDTO, dto, recordDTO.getId(), surplus);
-      surplus--;
-    }
+    tkReportGenerateRecordService.generateExcelUpdateReportRecord(
+        reportFormConfigDTO, reportFormConfigDTO.getExecuteAttributes(), recordDTO.getId());
   }
 
   @Override

@@ -11,8 +11,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.thingsboard.common.util.JacksonUtil;
@@ -28,6 +26,7 @@ import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportFormConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.report.BasicData;
+import org.thingsboard.server.common.data.yunteng.dto.report.CustomDataForExcelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.QueryConditionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
@@ -49,6 +48,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @Service
@@ -92,7 +92,10 @@ public class TkReportGenerateRecordServiceImpl
                     StringUtils.isNotEmpty(reportConfigName),
                     TkReportGenerateRecordEntity::getReportConfigName,
                     reportConfigName)
-                .eq(null != executeStatus, TkReportGenerateRecordEntity::getExecuteStatus, executeStatus)
+                .eq(
+                    null != executeStatus,
+                    TkReportGenerateRecordEntity::getExecuteStatus,
+                    executeStatus)
                 .eq(TkReportGenerateRecordEntity::getTenantId, queryMap.get("tenantId").toString())
                 .between(
                     null != startTime && null != endTime,
@@ -109,13 +112,15 @@ public class TkReportGenerateRecordServiceImpl
   @Override
   public ReportGenerateRecordDTO saveOrUpdateReportGenerateRecord(
       ReportGenerateRecordDTO recordDTO) {
-    TkReportGenerateRecordEntity reportGenerateRecord = recordDTO.getEntity(TkReportGenerateRecordEntity.class);
+    TkReportGenerateRecordEntity reportGenerateRecord =
+        recordDTO.getEntity(TkReportGenerateRecordEntity.class);
     if (StringUtils.isEmpty(recordDTO.getId())) {
       baseMapper.insert(reportGenerateRecord);
     } else {
       TkReportGenerateRecordEntity record = baseMapper.selectById(recordDTO.getId());
       Optional.ofNullable(record)
-          .map(obj -> baseMapper.updateById(recordDTO.getEntity(TkReportGenerateRecordEntity.class)))
+          .map(
+              obj -> baseMapper.updateById(recordDTO.getEntity(TkReportGenerateRecordEntity.class)))
           .orElseThrow(
               () -> {
                 throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -169,29 +174,56 @@ public class TkReportGenerateRecordServiceImpl
   }
 
   @Override
-  public void generateExcelUpdateReportRecord(
-      ReportFormConfigDTO formConfigDTO, ExecuteAttributesDTO dto, String recordId, int surplus) {
-    Long startTs = formConfigDTO.getQueryCondition().getStartTs();
-    Long endTs = formConfigDTO.getQueryCondition().getEndTs();
-    // 如果报表配置是定时执行,获取当前定时任务的执行时间,并计算新的开始时间、结束时间
-    if (formConfigDTO.getExecuteWay() == FastIotConstants.MagicNumber.ONE) {
-      ReportGenerateRecordDTO recordDTO =
-          findReportGenerateRecordById(recordId, formConfigDTO.getTenantId());
-      long differenceTs = endTs - startTs;
-      endTs = recordDTO.getExecuteTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
-      startTs = endTs - differenceTs;
-      formConfigDTO.getQueryCondition().setStartTs(startTs);
-      formConfigDTO.getQueryCondition().setEndTs(endTs);
+  public void generateExcelUpdateReportRecord(ReportFormConfigDTO formConfigDTO,List<ExecuteAttributesDTO> executeAttributes,
+          String recordId) {
+    List<DeferredResult<CustomDataForExcelDTO>> list = new ArrayList<>();
+    for(ExecuteAttributesDTO dto:executeAttributes){
+      DeferredResult<CustomDataForExcelDTO> result = new DeferredResult<>();
+      Long startTs = formConfigDTO.getQueryCondition().getStartTs();
+      Long endTs = formConfigDTO.getQueryCondition().getEndTs();
+      // 如果报表配置是定时执行,获取当前定时任务的执行时间,并计算新的开始时间、结束时间
+      if (formConfigDTO.getExecuteWay() == FastIotConstants.MagicNumber.ONE) {
+        ReportGenerateRecordDTO recordDTO =
+                findReportGenerateRecordById(recordId, formConfigDTO.getTenantId());
+        long differenceTs = endTs - startTs;
+        endTs = recordDTO.getExecuteTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        startTs = endTs - differenceTs;
+        formConfigDTO.getQueryCondition().setStartTs(startTs);
+        formConfigDTO.getQueryCondition().setEndTs(endTs);
+      }
+      getTsKvValuesOrGenerateExcel(result, formConfigDTO, dto);
+      list.add(result);
     }
-    getTsKvValuesOrGenerateExcel(null, formConfigDTO, dto, recordId, surplus);
+    CompletableFuture<Void> future = CompletableFuture.allOf(
+            list.stream()
+                    .map(deferredResult -> CompletableFuture.supplyAsync(deferredResult::getResult))
+                    .toArray(CompletableFuture<?>[]::new));
+    // 在所有异步任务完成后进行下一步处理
+    future.thenRun(() -> {
+      // 获取所有结果
+      List<CustomDataForExcelDTO> results = new ArrayList<>();
+      for (DeferredResult<CustomDataForExcelDTO> deferredResult : list) {
+        results.add((CustomDataForExcelDTO) deferredResult.getResult());
+      }
+      ObjectNode executeCondition = JacksonUtil.newObjectNode();
+      QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
+      executeCondition.replace(
+              FastIotConstants.CHART_EXECUTE_CONDITION,
+              JacksonUtil.convertValue(queryCondition, JsonNode.class));
+      executeCondition.replace(
+              FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
+              JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(), JsonNode.class));
+
+      // 汇总所有数据,生成Excel并上传
+      generateExcelAndUpload(results,formConfigDTO.getName(),recordId,formConfigDTO.getTenantId(),
+              executeCondition);
+    });
   }
 
   private void getTsKvValuesOrGenerateExcel(
-      final DeferredResult<ResponseEntity> result,
+      DeferredResult<CustomDataForExcelDTO> result,
       ReportFormConfigDTO formConfigDTO,
-      ExecuteAttributesDTO dto,
-      String recordId,
-      int surplus) {
+      ExecuteAttributesDTO dto) {
     QueryConditionDTO queryCondition = formConfigDTO.getQueryCondition();
     boolean useStrictDataTypes = queryCondition.isUseStrictDataTypes();
     Long interval = queryCondition.getInterval();
@@ -213,25 +245,9 @@ public class TkReportGenerateRecordServiceImpl
             .collect(Collectors.toList());
     queryCondition.setStartTs(finalStartTs);
     queryCondition.setEndTs(finalEndTs);
-    ObjectNode executeCondition = JacksonUtil.newObjectNode();
-    executeCondition.replace(
-        FastIotConstants.CHART_EXECUTE_CONDITION,
-        JacksonUtil.convertValue(queryCondition, JsonNode.class));
-    executeCondition.replace(
-        FastIotConstants.CHART_EXECUTE_ATTRIBUTES,
-        JacksonUtil.convertValue(formConfigDTO.getExecuteAttributes(), JsonNode.class));
     Futures.addCallback(
         tsService.findAll(tenantId, entityId, queries),
-        getTsKvListCallback(
-            result,
-            useStrictDataTypes,
-            formConfigDTO.getName(),
-            dto.getName(),
-            recordId,
-            reportTenantId,
-            executeCondition,
-            surplus,
-            keys),
+        getTsKvListCallback(result, useStrictDataTypes, dto.getName(), keys),
         MoreExecutors.directExecutor());
   }
 
@@ -249,14 +265,9 @@ public class TkReportGenerateRecordServiceImpl
   }
 
   private FutureCallback<List<TsKvEntry>> getTsKvListCallback(
-      final DeferredResult<ResponseEntity> response,
+      DeferredResult<CustomDataForExcelDTO> response,
       Boolean useStrictDataTypes,
-      String reportFormName,
       String deviceName,
-      String reportGenerateRecordId,
-      String tenantId,
-      JsonNode executeCondition,
-      int surplus,
       List<String> keys) {
     return new FutureCallback<>() {
       @Override
@@ -268,23 +279,21 @@ public class TkReportGenerateRecordServiceImpl
               .computeIfAbsent(entry.getKey(), k -> new ArrayList<>())
               .add(new BasicData(entry.getTs(), value));
         }
-        if (null == response) {
-          generateExcel(
-              deviceName,
-              reportFormName,
-              result,
-              reportGenerateRecordId,
-              tenantId,
-              executeCondition,
-              surplus,
-              keys);
-        } else {
-          response.setResult(new ResponseEntity<>(result, HttpStatus.OK));
+        List<List<String>> heads = new ArrayList<>();
+        List<List<Object>> values = new ArrayList<>();
+        if (result.isEmpty()) {
+          for (String key : keys) {
+            List<BasicData> basicData = new ArrayList<>();
+            result.put(key, basicData);
+          }
         }
+        generateExcelHeadAndValues(result, deviceName, heads, values);
+        response.setResult(new CustomDataForExcelDTO(deviceName, heads, values));
       }
 
       @Override
       public void onFailure(@NotNull Throwable e) {
+        response.setResult(null);
         log.error("Failed to fetch historical data", e);
       }
     };
@@ -298,58 +307,6 @@ public class TkReportGenerateRecordServiceImpl
     return entry.getValue();
   }
 
-  private void generateExcel(
-      String deviceName,
-      String reportFormName,
-      Map<String, List<BasicData>> result,
-      String reportGenerateRecordId,
-      String tenantId,
-      JsonNode executeCondition,
-      int surplus,
-      List<String> keys) {
-    List<List<String>> heads = new ArrayList<>();
-    List<List<Object>> values = new ArrayList<>();
-    if (result.isEmpty()) {
-      for (String key : keys) {
-        List<BasicData> data = new ArrayList<>();
-        result.put(key, data);
-      }
-    }
-    generateExcelHeadAndValues(result, deviceName, heads, values);
-    ByteArrayOutputStream byteArrayOutputStream =
-        ExcelUtil.noModelWrite(reportFormName, heads, values);
-    String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
-    int status = StatusEnum.SUCCESS.getIndex();
-    InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
-    String response = null;
-    try {
-      response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
-    } catch (Exception e) {
-      log.error(e.getMessage());
-    }
-    ReportGenerateRecordDTO recordDTO =
-        findReportGenerateRecordById(reportGenerateRecordId, tenantId);
-    if (null != recordDTO) {
-      if (response != null) {
-        String reportPath = recordDTO.getReportPath();
-        if (null != reportPath) {
-          reportPath += "," + response;
-        } else {
-          reportPath = response;
-        }
-        recordDTO.setReportPath(reportPath);
-      } else {
-        status = StatusEnum.FAIL.getIndex();
-      }
-      if (surplus == FastIotConstants.MagicNumber.ONE) {
-        recordDTO.setExecuteStatus(status);
-      }
-      recordDTO.setUpdateTime(LocalDateTime.now());
-      recordDTO.setExecuteCondition(executeCondition);
-      saveOrUpdateReportGenerateRecord(recordDTO);
-    }
-  }
-
   private void generateExcelHeadAndValues(
       Map<String, List<BasicData>> result,
       String deviceName,
@@ -386,4 +343,42 @@ public class TkReportGenerateRecordServiceImpl
       firstKey++;
     }
   }
+
+  private void generateExcelAndUpload(
+      List<CustomDataForExcelDTO> list,
+      String reportFormName,
+      String reportGenerateRecordId,
+      String tenantId,
+      JsonNode executeCondition) {
+    ByteArrayOutputStream byteArrayOutputStream = ExcelUtil.manySheetWrite(list);
+
+    String fileName = reportFormName + System.currentTimeMillis() + ".xlsx";
+    int status = StatusEnum.SUCCESS.getIndex();
+    InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+    String response = null;
+    try {
+      response = fileStorageService.uploadFile(fileName, CONTENT_TYPE, inputStream);
+    } catch (Exception e) {
+      log.error(e.getMessage());
+    }
+    ReportGenerateRecordDTO recordDTO =
+        findReportGenerateRecordById(reportGenerateRecordId, tenantId);
+    if (null != recordDTO) {
+      if (response != null) {
+        String reportPath = recordDTO.getReportPath();
+        if (null != reportPath) {
+          reportPath += "," + response;
+        } else {
+          reportPath = response;
+        }
+        recordDTO.setReportPath(reportPath);
+      } else {
+        status = StatusEnum.FAIL.getIndex();
+      }
+      recordDTO.setExecuteStatus(status);
+      recordDTO.setUpdateTime(LocalDateTime.now());
+      recordDTO.setExecuteCondition(executeCondition);
+      saveOrUpdateReportGenerateRecord(recordDTO);
+    }
+  }
 }

@@ -58,7 +58,7 @@ public class TkSmsServiceImpl implements TkSmsService {
   @Transactional
   public boolean sendSms(SmsReqDTO smsReqDTO) {
     String phoneNumbers = smsReqDTO.getPhoneNumbers();
-    LinkedHashMap<String, String> templateParam = smsReqDTO.getParams();
+    LinkedHashMap<String, Object> templateParam = smsReqDTO.getParams();
     String templateId = smsReqDTO.getId();
     if (StringUtils.isEmpty(phoneNumbers) || StringUtils.isEmpty(templateId)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -200,7 +200,7 @@ public class TkSmsServiceImpl implements TkSmsService {
     }
 
     String code = RandomStringUtils.randomNumeric(6);
-    LinkedHashMap<String, String> params = new LinkedHashMap<>();
+    LinkedHashMap<String, Object> params = new LinkedHashMap<>();
     params.put("code", code);
     SmsReqDTO smsReqDTO = new SmsReqDTO();
     smsReqDTO.setParams(params);

@@ -38,7 +38,13 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    */
   boolean deviceNameUsed(String tenantId, String deviceName, String deviceId);
 
-  List<String> findTbDeviceId(String tenantId, Set<String> ids);
+  /**
+   * 设备删除前的检查
+   * @param tenantId 租户ID
+   * @param ids 删除的设备ID集合
+   * @return TB的设备ID集合
+   */
+  List<String> findTbDeviceIdAndCheckForDelete(String tenantId, Set<String> ids);
 
   /**
    * 通过设备类型和组织ID查询所有的设备

@@ -7,6 +7,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ReportGenerateRecordDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.ExecuteAttributesDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 
+import java.util.List;
 import java.util.Map;
 
 public interface TkReportGenerateRecordService {
@@ -30,18 +31,14 @@ public interface TkReportGenerateRecordService {
       ReportFormConfigDTO reportFormConfigDTO, String jobId);
 
   /**
-   * 生成报表记录
+   * 生成Excel报表
    *
-   * @param formConfigDTO 报表配置
-   * @param dto 执行属性
-   * @param recordId recordId 记录ID
-   * @param surplus 剩余执行次数
+   * @param executeAttributes 需要执行的设备和属性
    */
   void generateExcelUpdateReportRecord(
-      ReportFormConfigDTO formConfigDTO,
-      ExecuteAttributesDTO dto,
-      String recordId,
-      int surplus);
+      ReportFormConfigDTO reportFormConfigDTO,
+      List<ExecuteAttributesDTO> executeAttributes,
+      String recordId);
 
   JsonNode getChartQueryCondition(String id, String tenantId);
 }