feat(dms): 添加设备类型名称字段支持

- 在 DmsBaseMachineInfo 实体类中新增 deviceTypeName 字段
- 在 DmsBaseMachineInfoBo 业务对象中新增 deviceTypeName段
- 在 字 DmsBaseMachineInfoServiceImpl 中配置 deviceTypeName 的查询映射
- 在 DmsBaseMachineInfoVo 视图对象中新增 deviceTypeName 字段
master
zangch@mesnac.com 3 months ago
parent 4316c9cd65
commit c2ef40f2cf

@ -148,4 +148,10 @@ public class DmsBaseMachineInfo extends TenantEntity {
*/ */
private String ossId; private String ossId;
/**
*
*/
@TableField(exist = false)
private String deviceTypeName;
} }

@ -147,4 +147,9 @@ public class DmsBaseMachineInfoBo extends BaseEntity {
*/ */
private String ossId; private String ossId;
/**
*
*/
private String deviceTypeName;
} }

@ -205,4 +205,9 @@ public class DmsBaseMachineInfoVo implements Serializable {
*/ */
private String ossId; private String ossId;
/**
*
*/
private String deviceTypeName;
} }

@ -161,7 +161,7 @@ public class DmsBaseMachineInfoServiceImpl implements IDmsBaseMachineInfoService
.leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId) .leftJoin(ProdBaseWorkshopInfo.class, ProdBaseWorkshopInfo::getWorkshopId, ProdBaseMachineInfo::getWorkshopId)
.leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/ .leftJoin(ProdBaseDeviceMode.class, ProdBaseDeviceMode::getDeviceModeId, ProdBaseMachineInfo::getDeviceModeId)*/
.select(DmsBaseDeviceType::getDeviceTypeName) .selectAs(DmsBaseDeviceType::getDeviceTypeName, DmsBaseMachineInfo::getDeviceTypeName)
.leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType) .leftJoin(DmsBaseDeviceType.class, DmsBaseDeviceType::getDeviceTypeId, DmsBaseMachineInfo::getMachineType)
.eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId()) .eq(bo.getMachineId() != null, DmsBaseMachineInfo::getMachineId, bo.getMachineId())

Loading…
Cancel
Save