查询接口调整，增加tenantId

@@ -57,7 +57,7 @@ public class TkCheckPlanController extends BaseController {
             queryMap.put("status", status);
         }
 
-        return tkCheckPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
+        return tkCheckPlanService.page(queryMap, getCurrentUser().getCurrentTenantId());
     }
 
     @PostMapping("/save")

@@ -17,7 +17,9 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionPlanService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.sql.Timestamp;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.PAGE;
@@ -40,8 +42,8 @@ public class TkInspectionPlanController extends BaseController {
             @RequestParam(PAGE) int page,
             @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = "type", required = false) TkInspectionPlanStatusEnum status,
-            @RequestParam(value = "startTime", required = false) Long startTime,
-            @RequestParam(value = "endTime", required = false) Long endTime
+            @RequestParam(value = "startTime", required = false) List<Long> startTime,
+            @RequestParam(value = "endTime", required = false) List<Long> endTime
     ) throws ThingsboardException {
         Map<String, Object> queryMap = new HashMap<>();
         queryMap.put(PAGE_SIZE, pageSize);
@@ -54,8 +56,27 @@ public class TkInspectionPlanController extends BaseController {
             queryMap.put("status", status);
         }
 
-        checkTimeAndPut(queryMap, startTime, endTime);
-        return tkInspectionPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
+        if (startTime != null && startTime.size() == 2) {
+            if (startTime.get(0) != null) {
+                queryMap.put("startTimeStart", new Timestamp(startTime.get(0)).toLocalDateTime());
+            }
+
+            if (startTime.get(1) != null) {
+                queryMap.put("startTimeEnd", new Timestamp(startTime.get(1)).toLocalDateTime());
+            }
+        }
+
+        if (endTime != null && endTime.size() == 2) {
+            if (endTime.get(0) != null) {
+                queryMap.put("endTimeStart", new Timestamp(endTime.get(0)).toLocalDateTime());
+            }
+
+            if (endTime.get(1) != null) {
+                queryMap.put("endTimeEnd", new Timestamp(endTime.get(1)).toLocalDateTime());
+            }
+        }
+
+        return tkInspectionPlanService.page(queryMap, getCurrentUser().getCurrentTenantId());
     }
 
     @PostMapping("/save")

@@ -59,7 +59,7 @@ public class TkInspectionRecordController extends BaseController {
         }
 
         checkTimeAndPut(queryMap, startTime, endTime);
-        return tkInspectionRecordService.page(queryMap, getCurrentUser().isTenantAdmin());
+        return tkInspectionRecordService.page(queryMap, getCurrentUser().getCurrentTenantId());
     }
 
     @PostMapping("/save")

@@ -30,9 +30,10 @@ import java.util.stream.Collectors;
 public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMapper, TkCheckPlanEntity>
         implements TkCheckPlanService {
     @Override
-    public TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+    public TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, String tenantId) {
         QueryWrapper<TkCheckPlanEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
+        lambda.eq(TkCheckPlanEntity::getTenantId, tenantId);
         if (queryMap != null && queryMap.get("name") != null) {
             lambda.eq(TkCheckPlanEntity::getName, queryMap.get("name").toString());
         }
@@ -99,7 +100,7 @@ public class TkCheckPlanServiceImpl extends AbstractBaseService<TkCheckPlanMappe
         LambdaQueryWrapper<TkCheckPlanEntity> lambda = wrapper.lambda();
         TenantId tenantId = SpringBeanUtils.getTenantId();
         lambda.eq(TkCheckPlanEntity::getTenantId, tenantId.getId().toString());
-        lambda.in(BaseEntity::getId,ids);
+        lambda.in(BaseEntity::getId, ids);
         List<TkCheckPlanEntity> entitys = baseMapper.selectList(wrapper);
         return Optional.ofNullable(entitys).map(all -> all.stream().map(item -> item.getDTO(TkCheckPlanDTO.class))
                 .collect(Collectors.toList())).orElse(null);

@@ -33,9 +33,10 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
     private final TkInspectionRecordService tkInspectionRecordService;
 
     @Override
-    public TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+    public TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, String tenantId) {
         QueryWrapper<TkInspectionPlanEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkInspectionPlanEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionPlanEntity::getTenantId, tenantId);
         if (queryMap != null && queryMap.get("name") != null) {
             lambda.eq(TkInspectionPlanEntity::getName, queryMap.get("name").toString());
         }
@@ -44,11 +45,24 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
             lambda.eq(TkInspectionPlanEntity::getStatus, queryMap.get("status").toString());
         }
 
-        if (queryMap != null && queryMap.get("startTime") != null && queryMap.get("endTime") != null) {
-            LocalDateTime startTime = (LocalDateTime) queryMap.get("startTime");
-            LocalDateTime endTime = (LocalDateTime) queryMap.get("endTime");
-            lambda.ge(TkInspectionPlanEntity::getStartTime, startTime);
-            lambda.le(TkInspectionPlanEntity::getEndTime, endTime);
+        if (queryMap != null && queryMap.get("startTimeStart") != null) {
+            LocalDateTime startTimeStart = (LocalDateTime) queryMap.get("startTimeStart");
+            lambda.ge(TkInspectionPlanEntity::getStartTime, startTimeStart);
+        }
+
+        if (queryMap != null && queryMap.get("startTimeEnd") != null) {
+            LocalDateTime startTimeEnd = (LocalDateTime) queryMap.get("startTimeEnd");
+            lambda.le(TkInspectionPlanEntity::getStartTime, startTimeEnd);
+        }
+
+        if (queryMap != null && queryMap.get("endTimeStart") != null) {
+            LocalDateTime endTimeStart = (LocalDateTime) queryMap.get("endTimeStart");
+            lambda.ge(TkInspectionPlanEntity::getEndTime, endTimeStart);
+        }
+
+        if (queryMap != null && queryMap.get("endTimeEnd") != null) {
+            LocalDateTime endTimeEnd = (LocalDateTime) queryMap.get("endTimeEnd");
+            lambda.le(TkInspectionPlanEntity::getEndTime, endTimeEnd);
         }
 
         IPage<TkInspectionPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),

@@ -31,9 +31,10 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
     private final TkInspectionDetailsService tkInspectionDetailsService;
 
     @Override
-    public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin) {
+    public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, String tenantId) {
         QueryWrapper<TkInspectionRecordEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<TkInspectionRecordEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionRecordEntity::getTenantId, tenantId);
         if (queryMap != null && queryMap.get("inspectionPlanId") != null) {
             lambda.eq(TkInspectionRecordEntity::getInspectionPlanId, queryMap.get("inspectionPlanId").toString());
         }

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface TkCheckPlanService extends BaseService<TkCheckPlanEntity> {
-    TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
+    TkPageData<TkCheckPlanDTO> page(Map<String, Object> queryMap, String tenantId);
 
     TkCheckPlanDTO save(TkCheckPlanDTO tkCheckPlanDTO);
 

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEntity> {
 
-    TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
+    TkPageData<TkInspectionPlanDTO> page(Map<String, Object> queryMap, String tenantId);
 
     TkInspectionPlanDTO save(TkInspectionPlanDTO tkInspectionPlanDTO);
 

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface TkInspectionRecordService extends BaseService<TkInspectionRecordEntity> {
 
-    TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, boolean isTenantAdmin);
+    TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, String tenantId);
 
     TkInspectionRecordDTO save(TkInspectionRecordDTO tkInspectionRecordDTO);