fix: 修复任务中心分页及设备详情任务分页

@@ -30,7 +30,6 @@ import org.thingsboard.server.dao.yunteng.service.*;
 
 
 import javax.transaction.Transactional;
 import javax.transaction.Transactional;
 import java.util.*;
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 @Service
 @Service
 @RequiredArgsConstructor
 @RequiredArgsConstructor
@@ -51,29 +50,24 @@ public class TkTaskCenterServiceImpl
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
     if (!iPage.getRecords().isEmpty()) {
     if (!iPage.getRecords().isEmpty()) {
-      iPage.setRecords(
-          iPage.getRecords().stream()
-              .map(
-                  obj -> {
-                    // 任务执行时间
-                    String key =
-                        FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME
-                            + "_"
-                            + obj.getId();
+      iPage.getRecords().stream()
+          .peek(
+              obj -> {
+                // 任务执行时间
+                String key =
+                    FastIotConstants.CacheConfigKey.TASK_CENTER_EXECUTE_TIME + "_" + obj.getId();
 
 
-                    // 如果通过设备查询分页,以设备执行时间为准
-                    String tbDeviceId = (String) queryMap.get("tbDeviceId");
-                    if (null != tbDeviceId) {
-                      key =
-                          FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME
-                              + "_"
-                              + tbDeviceId;
-                    }
-                    Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
-                    lastExecuteTime.ifPresent(obj::setLastExecuteTime);
-                    return obj;
-                  })
-              .collect(Collectors.toList()));
+                // 如果通过设备查询分页,以设备执行时间为准
+                String tbDeviceId = (String) queryMap.get("tbDeviceId");
+                if (null != tbDeviceId) {
+                  key =
+                      FastIotConstants.CacheConfigKey.TASK_CENTER_DEVICE_EXECUTE_TIME
+                          + "_"
+                          + tbDeviceId;
+                }
+                Optional<Long> lastExecuteTime = cacheUtils.get(cacheName, key);
+                lastExecuteTime.ifPresent(obj::setLastExecuteTime);
+              });
     }
     }
     return new TkPageData<>(iPage.getRecords(), iPage.getTotal());
     return new TkPageData<>(iPage.getRecords(), iPage.getTotal());
   }
   }

@@ -31,16 +31,16 @@
         tc.id,tc.name,tc.target_type,tc.execute_target,tc.execute_content,tc.execute_time,tc.create_time,tc.creator,
         tc.id,tc.name,tc.target_type,tc.execute_target,tc.execute_content,tc.execute_time,tc.create_time,tc.creator,
         tc.updater,tc.update_time,tc.tenant_id,tc.state
         tc.updater,tc.update_time,tc.tenant_id,tc.state
     </sql>
     </sql>
-
-    <sql id="detailColumns">
-        <include refid="basicColumns"/>
-        ,tdc.allow_state,tdc.task_center_id,tb_device_id
-    </sql>
     <select id="getPageData" resultMap="dataMap">
     <select id="getPageData" resultMap="dataMap">
         SELECT
         SELECT
-        <include refid="detailColumns"/>
+        <include refid="basicColumns"/>
+        <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
+            ,tdc.allow_state,tdc.task_center_id,tdc.tb_device_id
+        </if>
         FROM tk_task_center tc
         FROM tk_task_center tc
-        LEFT JOIN tk_device_task_center tdc ON tc.id = tdc.task_center_id
+        <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
+            LEFT JOIN tk_device_task_center tdc ON tc.id = tdc.task_center_id
+        </if>
         <where>
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND tc.tenant_id = #{queryMap.tenantId}
                 AND tc.tenant_id = #{queryMap.tenantId}