Merge branch '2023-12-27' into 'master_dev'

fix：报表导出列表查询增加根据客户分配设备过滤

See merge request yunteng/thingskit!300

@@ -68,6 +68,9 @@ public class TkReportGenerateRecordController extends BaseController {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     queryMap.put("userId", getCurrentUser().getCurrentUserId());
+    if(getCurrentUser().isCustomerUser()){
+      queryMap.put("customerId", getCurrentUser().getCustomerId().toString());
+    }
     return reportFormGenerateRecordService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
 

@@ -3,6 +3,7 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -34,11 +35,9 @@ import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.yunteng.entities.TkReportGenerateRecordEntity;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
-import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
-import org.thingsboard.server.dao.yunteng.service.TkReportGenerateRecordService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -64,6 +63,7 @@ public class TkReportGenerateRecordServiceImpl
   private final TimeseriesService tsService;
   private final FileStorageService fileStorageService;
   private final UserOrganizationMappingService userOrganizationMappingService;
+  private final DeviceMapper deviceMapper;
   private volatile HashMap<String,List<CustomDataForExcelDTO>> excelReportMap = new HashMap<>();
 
   @Override
@@ -80,7 +80,8 @@ public class TkReportGenerateRecordServiceImpl
             .map(obj -> Integer.valueOf(obj.toString()))
             .orElse(null);
     List<String> organizationIds = null;
-    if (!tenantAdmin && null != queryMap.get("userId")) {
+    boolean isCustomer =!tenantAdmin && null != queryMap.get("userId");
+    if (isCustomer) {
       organizationIds =
           userOrganizationMappingService.getOrganizationIdsByUserId(
               queryMap.get("userId").toString());
@@ -107,6 +108,20 @@ public class TkReportGenerateRecordServiceImpl
                     organizationIds != null && organizationIds.size() > 0,
                     TkReportGenerateRecordEntity::getOrganizationId,
                     organizationIds));
+
+    if (isCustomer) {
+      List<TkReportGenerateRecordEntity> list  = iPage.getRecords();
+      List<String> deviceIds  = deviceMapper.findDeviceIdsByCustomerId(queryMap.get("customerId").toString());
+      list.forEach(entity -> {
+        ArrayNode exes = (ArrayNode) entity.getExecuteCondition().path("executeAttributes");
+        for (int i = 0; i < exes.size(); i++) {
+          if(!deviceIds.contains(exes.get(i).get("device").asText())){
+            exes.remove(i);
+            i--;
+          }
+        }
+      });
+    }
     return getPageData(iPage, ReportGenerateRecordDTO.class);
   }