简柏林 / thingskit · Commits

Commit 94020d355fd098e3f1bb68922093a9d57402a3e9

Authored by 杨鸣坤
1 parent e6b491be

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

Inline Side-by-side
Showing 2 changed files with 15 additions and 0 deletions
@@ -17,6 +17,9 @@ public class TkCheckDetailsDTO extends TenantDTO { @@ -17,6 +17,9 @@ public class TkCheckDetailsDTO extends TenantDTO {
17 @ApiModelProperty("巡检设备") 17 @ApiModelProperty("巡检设备")
18 private String checkDeviceId; 18 private String checkDeviceId;
19 19
  20 + @ApiModelProperty("设备详情")
  21 + private TkDeviceAccountDTO tkDeviceAccountDTO;
  22 +
20 @ApiModelProperty("巡检方案") 23 @ApiModelProperty("巡检方案")
21 private String checkPlanId; 24 private String checkPlanId;
22 25
@@ -7,11 +7,14 @@ import lombok.extern.slf4j.Slf4j; @@ -7,11 +7,14 @@ import lombok.extern.slf4j.Slf4j;
7 import org.apache.commons.collections4.CollectionUtils; 7 import org.apache.commons.collections4.CollectionUtils;
8 import org.apache.commons.lang3.StringUtils; 8 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
  10 +import org.thingsboard.server.common.data.exception.ThingsboardException;
10 import org.thingsboard.server.common.data.yunteng.dto.TkCheckDetailsDTO; 11 import org.thingsboard.server.common.data.yunteng.dto.TkCheckDetailsDTO;
  12 +import org.thingsboard.server.common.data.yunteng.dto.TkDeviceAccountDTO;
11 import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity; 13 import org.thingsboard.server.dao.yunteng.entities.TkCheckDetailsEntity;
12 import org.thingsboard.server.dao.yunteng.mapper.TkCheckDetailsMapper; 14 import org.thingsboard.server.dao.yunteng.mapper.TkCheckDetailsMapper;
13 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService; 15 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
14 import org.thingsboard.server.dao.yunteng.service.TkCheckDetailsService; 16 import org.thingsboard.server.dao.yunteng.service.TkCheckDetailsService;
  17 +import org.thingsboard.server.dao.yunteng.service.TkDeviceAccountService;
15 18
16 import java.util.ArrayList; 19 import java.util.ArrayList;
17 import java.util.List; 20 import java.util.List;
@@ -22,6 +25,8 @@ import java.util.stream.Collectors; @@ -22,6 +25,8 @@ import java.util.stream.Collectors;
22 @Slf4j 25 @Slf4j
23 public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetailsMapper, TkCheckDetailsEntity> 26 public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetailsMapper, TkCheckDetailsEntity>
24 implements TkCheckDetailsService { 27 implements TkCheckDetailsService {
  28 + private final TkDeviceAccountService tkDeviceAccountService;
  29 +
25 @Override 30 @Override
26 public List<TkCheckDetailsDTO> batchSave(List<TkCheckDetailsDTO> checkDetailsDTOList, String inspectionPlanId) { 31 public List<TkCheckDetailsDTO> batchSave(List<TkCheckDetailsDTO> checkDetailsDTOList, String inspectionPlanId) {
27 List<TkCheckDetailsDTO> oldTkCheckDetailsDTOList = listByInspectionPlanId(inspectionPlanId); 32 List<TkCheckDetailsDTO> oldTkCheckDetailsDTOList = listByInspectionPlanId(inspectionPlanId);
@@ -98,6 +103,13 @@ public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetail @@ -98,6 +103,13 @@ public class TkCheckDetailsServiceImpl extends AbstractBaseService<TkCheckDetail
98 return CollectionUtils.emptyIfNull(tkCheckDetailsEntitieList).stream().map(entity -> { 103 return CollectionUtils.emptyIfNull(tkCheckDetailsEntitieList).stream().map(entity -> {
99 TkCheckDetailsDTO tkCheckDetailsDTO = new TkCheckDetailsDTO(); 104 TkCheckDetailsDTO tkCheckDetailsDTO = new TkCheckDetailsDTO();
100 entity.copyToDTO(tkCheckDetailsDTO); 105 entity.copyToDTO(tkCheckDetailsDTO);
  106 + try {
  107 + TkDeviceAccountDTO tkDeviceAccountDTO = tkDeviceAccountService.load(tkCheckDetailsDTO.getCheckDeviceId());
  108 + tkCheckDetailsDTO.setTkDeviceAccountDTO(tkDeviceAccountDTO);
  109 + } catch (ThingsboardException e) {
  110 + throw new RuntimeException(e);
  111 + }
  112 +
101 return tkCheckDetailsDTO; 113 return tkCheckDetailsDTO;
102 }).collect(Collectors.toList()); 114 }).collect(Collectors.toList());
103 } 115 }