From 24182347f515cb178ae346c516aecc78d2950a1f Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 29 Sep 2025 14:34:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9C=8D=E5=8A=A1=E9=99=8D=E7=BA=A7=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为RemoteFileService添加mock降级支持 - 实现文件服务异常时的降级处理逻辑 -优化设备类型关联查询条件 - 增加machineId精确查询条件支持 --- .../impl/DmsBaseMachineInfoServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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())