联调

@@ -38,6 +38,7 @@ public class TkInspectionRecordController extends BaseController {
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
             @RequestParam(value = "inspectionPlanId", required = false) String inspectionPlanId,
+            @RequestParam(value = "inspectionPlanName", required = false) String inspectionPlanName,
             @RequestParam(value = "inspectorId", required = false) String inspectorId,
             @RequestParam(value = "startTime", required = false) Long startTime,
             @RequestParam(value = "endTime", required = false) Long endTime,
@@ -50,6 +51,10 @@ public class TkInspectionRecordController extends BaseController {
             queryMap.put("inspectionPlanId", inspectionPlanId);
         }
 
+        if (StringUtils.isNotBlank(inspectionPlanName)) {
+            queryMap.put("inspectionPlanName", inspectionPlanName);
+        }
+
         if (StringUtils.isNotBlank(inspectorId)) {
             queryMap.put("inspectorId", inspectorId);
         }

@@ -14,6 +14,9 @@ public class TkInspectionDetailsDTO extends TenantDTO {
     @ApiModelProperty("巡检设备")
     private String checkDeviceId;
 
+    @ApiModelProperty("设备详情")
+    private TkDeviceAccountDTO tkDeviceAccountDTO;
+
     @ApiModelProperty("巡检内容")
     private String planDetails;
 

@@ -42,4 +42,10 @@ public class TkInspectionPlanDTO extends TenantDTO {
 
     @ApiModelProperty("巡检明细")
     private List<TkCheckDetailsDTO> tkCheckDetailsDTOList;
+
+    @ApiModelProperty("巡检记录")
+    private List<TkInspectionRecordDTO> tkInspectionRecordDTOList;
+
+    @ApiModelProperty("巡检计划id集合")
+    private List<String> inspectionPlanIdList;
 }

@@ -23,9 +23,15 @@ public class TkInspectionRecordDTO extends TenantDTO {
     @ApiModelProperty("巡检计划")
     private String inspectionPlanId;
 
+    @ApiModelProperty("巡检计划实体")
+    private TkInspectionPlanDTO tkInspectionPlanDTO;
+
     @ApiModelProperty("巡检人")
     private String inspectorId;
 
+    @ApiModelProperty("巡检人实体")
+    private UserDTO userDTO;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "巡检日期")
     @JsonSerialize(using = LocalDateTimeSerializer.class)

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.ApplicationEventPublisher;
@@ -40,6 +41,7 @@ import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.model.sql.UserEntity;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
@@ -940,6 +942,25 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     return entities.stream().map(entity->entity.getId()).collect(Collectors.toList());
   }
 
+  @Override
+  public List<UserDTO> findUserByUserIdList(List<String> userIdList) {
+    if (CollectionUtils.isEmpty(userIdList)) {
+      return new ArrayList<>(0);
+    }
+
+    List<SysUserEntity> entities =
+            baseMapper.selectList(
+                    new LambdaQueryWrapper<SysUserEntity>()
+                            .in(SysUserEntity::getId, userIdList));
+    if (null != entities && !entities.isEmpty()) {
+      return entities.stream()
+              .map(entity -> entity.getDTO(UserDTO.class))
+              .collect(Collectors.toList());
+    }
+
+    return null;
+  }
+
   private void checkPassword(AccountReqDTO accountReqDTO, SysUserEntity user) {
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())

@@ -7,10 +7,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkInspectionDetailsDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionDetailsEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkInspectionDetailsMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 import org.thingsboard.server.dao.yunteng.service.TkInspectionDetailsService;
 
 import java.util.ArrayList;
@@ -22,6 +25,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspectionDetailsMapper, TkInspectionDetailsEntity>
         implements TkInspectionDetailsService {
+    private TkDeviceAccountService tkDeviceAccountService;
+
     @Override
     public List<TkInspectionDetailsDTO> batchSave(List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList, String inspectionRecordId) {
         List<TkInspectionDetailsDTO> oldTkInspectionDetailsDTOList = listByInspectionRecordId(inspectionRecordId);
@@ -97,6 +102,13 @@ public class TkInspectionDetailsServiceImpl extends AbstractBaseService<TkInspec
         return CollectionUtils.emptyIfNull(tkInspectionDetailsEntityList).stream().map(entity -> {
             TkInspectionDetailsDTO tkInspectionDetailsDTO = new TkInspectionDetailsDTO();
             entity.copyToDTO(tkInspectionDetailsDTO);
+            try {
+                TkDeviceAccountDTO tkDeviceAccountDTO = tkDeviceAccountService.load(tkInspectionDetailsDTO.getCheckDeviceId());
+                tkInspectionDetailsDTO.setTkDeviceAccountDTO(tkDeviceAccountDTO);
+            } catch (ThingsboardException e) {
+                throw new RuntimeException(e);
+            }
+
             return tkInspectionDetailsDTO;
         }).collect(Collectors.toList());
     }

@@ -6,11 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.TkCheckDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkInspectionPlanDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionRecordDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionPlanEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkInspectionPlanMapper;
@@ -23,6 +25,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -68,7 +71,25 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
         IPage<TkInspectionPlanEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
                 wrapper);
 
-        return getPageData(page, TkInspectionPlanDTO.class);
+        if (CollectionUtils.isEmpty(page.getRecords())) {
+            return getPageData(page, TkInspectionPlanDTO.class);
+        }
+
+        List<TkInspectionPlanEntity> inspectionPlanEntityList = page.getRecords();
+        List<String> inspectionPlanIdList = inspectionPlanEntityList.stream().map(TkInspectionPlanEntity::getId).collect(Collectors.toList());
+        Map<String, List<TkInspectionRecordDTO>> recordDtoMap = tkInspectionRecordService.mapByInspectionPlanId(inspectionPlanIdList);
+        if (MapUtils.isEmpty(recordDtoMap)) {
+            return getPageData(page, TkInspectionPlanDTO.class);
+        }
+
+        TkPageData<TkInspectionPlanDTO> dtoPage = getPageData(page, TkInspectionPlanDTO.class);
+        List<TkInspectionPlanDTO> tkInspectionPlanDTOList = new ArrayList<>(dtoPage.getItems());
+        tkInspectionPlanDTOList.forEach(tkInspectionPlanDTO -> {
+            tkInspectionPlanDTO.setTkInspectionRecordDTOList(recordDtoMap.get(tkInspectionPlanDTO.getId()));
+        });
+
+        dtoPage.setItems(tkInspectionPlanDTOList);
+        return dtoPage;
     }
 
     @Override
@@ -124,6 +145,34 @@ public class TkInspectionPlanServiceImpl extends AbstractBaseService<TkInspectio
         return count > 0;
     }
 
+    @Override
+    public List<TkInspectionPlanDTO> selectByCondition(TkInspectionPlanDTO tkInspectionPlanDTO) {
+        if (tkInspectionPlanDTO == null || StringUtils.isBlank(tkInspectionPlanDTO.getTenantId())) {
+            return new ArrayList<>(0);
+        }
+
+        QueryWrapper<TkInspectionPlanEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionPlanEntity> lambda = wrapper.lambda();
+        lambda.eq(TkInspectionPlanEntity::getTenantId, tkInspectionPlanDTO.getTenantId());
+        if (StringUtils.isNotBlank(tkInspectionPlanDTO.getName())) {
+            lambda.like(TkInspectionPlanEntity::getName, tkInspectionPlanDTO.getName());
+        }
+
+        if (CollectionUtils.isNotEmpty(tkInspectionPlanDTO.getInspectionPlanIdList())) {
+            lambda.in(TkInspectionPlanEntity::getId, tkInspectionPlanDTO.getInspectionPlanIdList());
+        }
+
+        // todo ymk 后续有什么查询条件再加
+
+        lambda.orderByAsc(TkInspectionPlanEntity::getCreateTime);
+        List<TkInspectionPlanEntity> inspectionPlanEntityList = baseMapper.selectList(wrapper);
+        return CollectionUtils.emptyIfNull(inspectionPlanEntityList).stream().map(inspectionPlanEntity -> {
+            TkInspectionPlanDTO dto = new TkInspectionPlanDTO();
+            inspectionPlanEntity.copyToDTO(dto);
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
     private void checkDto(TkInspectionPlanDTO dto) {
         if (StringUtils.isBlank(dto.getTenantId())) {
             throw new TkDataValidationException("租户id为空！");

@@ -7,21 +7,22 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.dto.TkInspectionDetailsDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkInspectionPlanDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkInspectionRecordDTO;
+import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionRecordEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkInspectionRecordMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.TkInspectionDetailsService;
-import org.thingsboard.server.dao.yunteng.service.TkInspectionRecordService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -29,6 +30,9 @@ import java.util.Map;
 public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspectionRecordMapper, TkInspectionRecordEntity>
         implements TkInspectionRecordService {
     private final TkInspectionDetailsService tkInspectionDetailsService;
+    @Lazy
+    private final TkInspectionPlanService tkInspectionPlanService;
+    private final TkUserService tkUserService;
 
     @Override
     public TkPageData<TkInspectionRecordDTO> page(Map<String, Object> queryMap, String tenantId) {
@@ -39,6 +43,20 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
             lambda.eq(TkInspectionRecordEntity::getInspectionPlanId, queryMap.get("inspectionPlanId").toString());
         }
 
+        if (queryMap != null && queryMap.get("inspectionPlanName") != null) {
+            String inspectionPlanName = queryMap.get("inspectionPlanName").toString();
+            TkInspectionPlanDTO condition = new TkInspectionPlanDTO();
+            condition.setName(inspectionPlanName);
+            condition.setTenantId(tenantId);
+            List<TkInspectionPlanDTO> tkInspectionPlanDTOList = tkInspectionPlanService.selectByCondition(condition);
+            if (CollectionUtils.isEmpty(tkInspectionPlanDTOList)) {
+                return new TkPageData<>();
+            }
+
+            List<String> inspectionPlanIdList = tkInspectionPlanDTOList.stream().map(TkInspectionPlanDTO::getId).collect(Collectors.toList());
+            lambda.in(TkInspectionRecordEntity::getInspectionPlanId, inspectionPlanIdList);
+        }
+
         if (queryMap != null && queryMap.get("inspectorId") != null) {
             lambda.eq(TkInspectionRecordEntity::getInspectorId, queryMap.get("inspectorId").toString());
         }
@@ -57,7 +75,34 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
         IPage<TkInspectionRecordEntity> page = baseMapper.selectPage(getPage(queryMap, "create_time", false),
                 wrapper);
 
-        return getPageData(page, TkInspectionRecordDTO.class);
+        TkPageData<TkInspectionRecordDTO> pageData = getPageData(page, TkInspectionRecordDTO.class);
+        if (pageData == null || CollectionUtils.isEmpty(pageData.getItems())) {
+            return pageData;
+        }
+
+        List<TkInspectionRecordDTO> tkInspectionRecordDTOList = new ArrayList<>(pageData.getItems());
+        List<String> inspectionPlanIdList = tkInspectionRecordDTOList.stream().map(TkInspectionRecordDTO::getInspectionPlanId).collect(Collectors.toList());
+        Set<String> inspectorIds = tkInspectionRecordDTOList.stream().map(TkInspectionRecordDTO::getInspectorId).collect(Collectors.toSet());
+        TkInspectionPlanDTO condition = new TkInspectionPlanDTO();
+        condition.setTenantId(tenantId);
+        condition.setInspectionPlanIdList(inspectionPlanIdList);
+        List<TkInspectionPlanDTO> inspectionPlanDTOLst = tkInspectionPlanService.selectByCondition(condition);
+        List<UserDTO> userDTOList = tkUserService.findUserByUserIdList(new ArrayList<>(inspectorIds));
+        Map<String, TkInspectionPlanDTO> tkInspectionPlanDTOMap = CollectionUtils.emptyIfNull(inspectionPlanDTOLst)
+                .stream()
+                .collect(Collectors.toMap(TkInspectionPlanDTO::getId, Function.identity(), (a, b) -> a));
+        Map<String, UserDTO> userDTOMap = CollectionUtils.emptyIfNull(userDTOList)
+                .stream()
+                .collect(Collectors.toMap(UserDTO::getId, Function.identity(), (a, b) -> a));
+        tkInspectionRecordDTOList.forEach(tkInspectionRecordDTO -> {
+            TkInspectionPlanDTO tkInspectionPlanDTO = tkInspectionPlanDTOMap.get(tkInspectionRecordDTO.getInspectionPlanId());
+            tkInspectionRecordDTO.setTkInspectionPlanDTO(tkInspectionPlanDTO);
+            UserDTO userDTO = userDTOMap.get(tkInspectionRecordDTO.getInspectorId());
+            tkInspectionRecordDTO.setUserDTO(userDTO);
+        });
+
+        pageData.setItems(tkInspectionRecordDTOList);
+        return pageData;
     }
 
     @Override
@@ -99,10 +144,18 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
         }
 
         TkInspectionRecordEntity entity = baseMapper.selectById(id);
+        if (entity == null) {
+            return new TkInspectionRecordDTO();
+        }
+
         TkInspectionRecordDTO tkInspectionRecordDTO = new TkInspectionRecordDTO();
         entity.copyToDTO(tkInspectionRecordDTO);
         List<TkInspectionDetailsDTO> tkInspectionDetailsDTOList = tkInspectionDetailsService.listByInspectionRecordId(id);
         tkInspectionRecordDTO.setTkInspectionDetailsDTOList(tkInspectionDetailsDTOList);
+        TkInspectionPlanDTO tkInspectionPlanDTO = tkInspectionPlanService.get(tkInspectionRecordDTO.getInspectionPlanId());
+        tkInspectionRecordDTO.setTkInspectionPlanDTO(tkInspectionPlanDTO);
+        UserDTO userDTO = tkUserService.findUserInfoById(tkInspectionRecordDTO.getInspectorId());
+        tkInspectionRecordDTO.setUserDTO(userDTO);
         return tkInspectionRecordDTO;
     }
 
@@ -113,6 +166,37 @@ public class TkInspectionRecordServiceImpl extends AbstractBaseService<TkInspect
         return count > 0;
     }
 
+    @Override
+    public Map<String, List<TkInspectionRecordDTO>> mapByInspectionPlanId(List<String> inspectionPlanIdList) {
+        if (CollectionUtils.isEmpty(inspectionPlanIdList)) {
+            return new HashMap<>(0);
+        }
+
+        QueryWrapper<TkInspectionRecordEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<TkInspectionRecordEntity> lambda = wrapper.lambda();
+        lambda.in(TkInspectionRecordEntity::getInspectionPlanId, inspectionPlanIdList);
+        lambda.orderByAsc(TkInspectionRecordEntity::getCreateTime);
+        List<TkInspectionRecordEntity> tkInspectionRecordEntityList = baseMapper.selectList(wrapper);
+        if (CollectionUtils.isEmpty(tkInspectionRecordEntityList)) {
+            return new HashMap<>(0);
+        }
+
+        Map<String, List<TkInspectionRecordDTO>> map = new HashMap<>(inspectionPlanIdList.size());
+        tkInspectionRecordEntityList.forEach(entity -> {
+            TkInspectionRecordDTO dto = new TkInspectionRecordDTO();
+            entity.copyToDTO(dto);
+            List<TkInspectionRecordDTO> dtoList = map.get(dto.getInspectionPlanId());
+            if (CollectionUtils.isEmpty(dtoList)) {
+                dtoList = new ArrayList<>(1);
+            }
+
+            dtoList.add(dto);
+            map.put(dto.getInspectionPlanId(), dtoList);
+        });
+
+        return map;
+    }
+
     private void checkDto(TkInspectionRecordDTO dto) {
         if (StringUtils.isBlank(dto.getTenantId())) {
             throw new TkDataValidationException("租户id为空！");

@@ -4,6 +4,7 @@ import org.thingsboard.server.common.data.yunteng.dto.TkInspectionPlanDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionPlanEntity;
 
+import java.util.List;
 import java.util.Map;
 
 public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEntity> {
@@ -15,4 +16,6 @@ public interface TkInspectionPlanService extends BaseService<TkInspectionPlanEnt
     TkInspectionPlanDTO get(String id);
 
     boolean delete(String id);
+
+    List<TkInspectionPlanDTO> selectByCondition(TkInspectionPlanDTO tkInspectionPlanDTO);
 }

@@ -4,6 +4,7 @@ import org.thingsboard.server.common.data.yunteng.dto.TkInspectionRecordDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkInspectionRecordEntity;
 
+import java.util.List;
 import java.util.Map;
 
 public interface TkInspectionRecordService extends BaseService<TkInspectionRecordEntity> {
@@ -15,4 +16,6 @@ public interface TkInspectionRecordService extends BaseService<TkInspectionRecor
     TkInspectionRecordDTO get(String id);
 
     boolean delete(String id);
+
+    Map<String, List<TkInspectionRecordDTO>> mapByInspectionPlanId(List<String> inspectionPlanIdList);
 }

@@ -180,4 +180,6 @@ public interface TkUserService {
    * @return 用户ID列表
    */
   List<String> findUserIdsByTenantId(String tenantId);
+
+  List<UserDTO> findUserByUserIdList(List<String> userIdList);
 }