|
|
@@ -265,9 +265,9 @@ public class DmDigitalmanServiceImpl extends BaseServiceImpl<DmDigitalmanQuery, |
|
|
|
R<List<DmSuitVo>> suitVos = remoteWardrobeService.suitList(1L, TenantConstants.Source.SLAVE.getCode(), "inner"); |
|
|
|
if (suitVos.isOk()) { |
|
|
|
List<DmSuitVo> suitVoList = suitVos.getData(); |
|
|
|
if (suitVoList != null && suitVoList.size() > 0) { |
|
|
|
if (suitVoList != null && !suitVoList.isEmpty()) { |
|
|
|
// 获取suitVoList中id与dto.getCurrentSuit相同的对象 |
|
|
|
DmSuitVo suitVo = suitVoList.stream().filter(item->item.getId().equals(dto.getSuitId())).findFirst().get(); |
|
|
|
DmSuitVo suitVo = suitVoList.stream().filter(item->item.getId().equals(dto.getSuitId())).findFirst().orElseGet(DmSuitVo::new); |
|
|
|
dto.setSuit(suitVo); |
|
|
|
} |
|
|
|
} |
|
|
@@ -277,10 +277,9 @@ public class DmDigitalmanServiceImpl extends BaseServiceImpl<DmDigitalmanQuery, |
|
|
|
|
|
|
|
@Override |
|
|
|
public DmDigitalmanExtPo selectExt(String devId) { |
|
|
|
DmDigitalmanExtPo po = dmDigitalmanExtMapper.selectOne( |
|
|
|
return dmDigitalmanExtMapper.selectOne( |
|
|
|
Wrappers.<DmDigitalmanExtPo>query().lambda() |
|
|
|
.eq(DmDigitalmanExtPo::getDeviceId, devId).last(SqlConstants.LIMIT_ONE)); |
|
|
|
return po; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|