巡检计划获取详情增加设备详情返回

@@ -17,6 +17,9 @@ public class TkCheckDetailsDTO extends TenantDTO {
     @ApiModelProperty("巡检设备")
     private String checkDeviceId;
 
+    @ApiModelProperty("设备详情")
+    private TkDeviceAccountDTO tkDeviceAccountDTO;
+
     @ApiModelProperty("巡检方案")
     private String checkPlanId;
 

@@ -7,11 +7,14 @@ 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.TkCheckDetailsDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
 import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
 import org.thingsboard.server.dao.yunteng.mapper.TkCheckDetailsMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkCheckDetailsService;
+import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +25,8 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetailsMapper, TkCheckDetailsEntity>
         implements TkCheckDetailsService {
+    private final TkDeviceAccountService tkDeviceAccountService;
+
     @Override
     public List<TkCheckDetailsDTO> batchSave(List<TkCheckDetailsDTO> checkDetailsDTOList, String inspectionPlanId) {
         List<TkCheckDetailsDTO> oldTkCheckDetailsDTOList = listByInspectionPlanId(inspectionPlanId);
@@ -98,6 +103,13 @@ public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetail
         return CollectionUtils.emptyIfNull(tkCheckDetailsEntitieList).stream().map(entity -> {
             TkCheckDetailsDTO tkCheckDetailsDTO = new TkCheckDetailsDTO();
             entity.copyToDTO(tkCheckDetailsDTO);
+            try {
+                TkDeviceAccountDTO tkDeviceAccountDTO = tkDeviceAccountService.load(tkCheckDetailsDTO.getCheckDeviceId());
+                tkCheckDetailsDTO.setTkDeviceAccountDTO(tkDeviceAccountDTO);
+            } catch (ThingsboardException e) {
+                throw new RuntimeException(e);
+            }
+
             return tkCheckDetailsDTO;
         }).collect(Collectors.toList());
     }