diff --git a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java index 42c5628a..58753479 100644 --- a/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBaseMachineInfoServiceImpl.java @@ -18,6 +18,7 @@ import org.dromara.dms.domain.vo.DmsBaseMachineInfoVo; import org.dromara.dms.mapper.DmsBaseMachineInfoMapper; import org.dromara.dms.service.IDmsBaseMachineInfoService; import org.dromara.resource.api.RemoteFileService; +import org.dromara.resource.api.RemoteFileServiceMock; import org.springframework.stereotype.Service; import java.util.Collection; @@ -37,7 +38,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService private final DmsBaseMachineInfoMapper baseMapper; - @DubboReference + @DubboReference(mock = "true") private RemoteFileService remoteFileService; @@ -118,8 +119,15 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService String photoUrl = remoteFileService.selectUrlByIds(vo.getOssId()); vo.setPhotoAddress(photoUrl); } catch (Exception e) { - // 忽略异常,不影响主要业务 - vo.setPhotoAddress(null); + // 使用降级处理 + RemoteFileService mockService = new RemoteFileServiceMock(); + try { + String photoUrl = mockService.selectUrlByIds(vo.getOssId()); + vo.setPhotoAddress(photoUrl); + } catch (Exception ex) { + // 忽略异常,不影响主要业务 + vo.setPhotoAddress(null); + } } } } @@ -155,6 +163,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService .select(DmsBaseDeviceType::getDeviceTypeName) .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType) + .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId()) .like(StringUtils.isNotBlank(bo.getMachineCode()), DmsBaseMachineInfo::getMachineCode, bo.getMachineCode()) .like(StringUtils.isNotBlank(bo.getMachineName()), DmsBaseMachineInfo::getMachineName, bo.getMachineName())