|
@@ -264,7 +264,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
|
List<IotInspectItemDO> items = iotInspectItemMapper.selectList();
|
|
List<IotInspectItemDO> items = iotInspectItemMapper.selectList();
|
|
|
v.forEach(routeDO -> {
|
|
v.forEach(routeDO -> {
|
|
|
List<Map> itemos = JSON.parseArray(routeDO.getItemJson(), Map.class);
|
|
List<Map> itemos = JSON.parseArray(routeDO.getItemJson(), Map.class);
|
|
|
- itemos.forEach(item -> {
|
|
|
|
|
|
|
+ for (Map item : itemos) {
|
|
|
Long deviceId = routeDO.getDeviceId();
|
|
Long deviceId = routeDO.getDeviceId();
|
|
|
IotDeviceDO deviceDO = iotDeviceMapper.selectById(deviceId);
|
|
IotDeviceDO deviceDO = iotDeviceMapper.selectById(deviceId);
|
|
|
if (Objects.nonNull(deviceDO)&&"sg".equals(deviceDO.getDeviceStatus())){
|
|
if (Objects.nonNull(deviceDO)&&"sg".equals(deviceDO.getDeviceStatus())){
|
|
@@ -287,6 +287,10 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
|
detailDO.setUrls(iotItem.getUrls());
|
|
detailDO.setUrls(iotItem.getUrls());
|
|
|
detailDO.setItem(iotItem.getItem());
|
|
detailDO.setItem(iotItem.getItem());
|
|
|
});
|
|
});
|
|
|
|
|
+ //没有巡检项的话直接不生成
|
|
|
|
|
+ if (StringUtils.isBlank(detailDO.getStandard())){
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
IotDeviceDO iotDeviceDO = iotDeviceMapper.selectById(routeDO.getDeviceId());
|
|
IotDeviceDO iotDeviceDO = iotDeviceMapper.selectById(routeDO.getDeviceId());
|
|
|
if (Objects.nonNull(iotDeviceDO)){
|
|
if (Objects.nonNull(iotDeviceDO)){
|
|
|
detailDO.setDeptId(iotDeviceDO.getDeptId());
|
|
detailDO.setDeptId(iotDeviceDO.getDeptId());
|
|
@@ -297,7 +301,7 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
|
|
|
results.add(detailDO);
|
|
results.add(detailDO);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- });
|
|
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
if (CollUtil.isEmpty(results)){
|
|
if (CollUtil.isEmpty(results)){
|
|
|
return;
|
|
return;
|