From d8861b39594a74f8fffc5697685e29a99a05f4a6 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Fri, 7 Nov 2025 09:11:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=96=B0=E5=A2=9EmachineId?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在DmsInspectRouteDetail实体中新增machineId字段及对应getter/setter方法 - 更新数据库映射文件，增加machineId字段的映射配置- 修改SQL查询语句，支持machineId字段的读取与写入 -优化insert和update操作，自动填充machineId字段以满足非空约束- 调整关联查询逻辑，使用machineId替代原有deviceId进行设备关联 --- .../dms/domain/DmsInspectRouteDetail.java | 12 ++++++++++++ .../impl/DmsInspectRouteDetailServiceImpl.java | 14 ++++++++++++++ .../mapper/dms/DmsInspectRouteDetailMapper.xml | 18 +++++++++++++++--- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java index 6c6569a..b817eb5 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsInspectRouteDetail.java @@ -31,6 +31,9 @@ public class DmsInspectRouteDetail extends DmsBaseEntity @Excel(name = "巡检设备ID，关联dms_base_device_ledger的device_id") private Long deviceId; + /** 车间绑定设备ID，关联base_deviceledger.obj_id */ + private Long machineId; + /** 巡检标准 */ @Excel(name = "巡检标准") private String inspectStandard; @@ -95,6 +98,14 @@ public class DmsInspectRouteDetail extends DmsBaseEntity { return deviceId; } + + public Long getMachineId() { + return machineId; + } + + public void setMachineId(Long machineId) { + this.machineId = machineId; + } public void setInspectStandard(String inspectStandard) { this.inspectStandard = inspectStandard; @@ -121,6 +132,7 @@ public class DmsInspectRouteDetail extends DmsBaseEntity .append("inspectRouteId", getInspectRouteId()) .append("lineStep", getLineStep()) .append("deviceId", getDeviceId()) + .append("machineId", getMachineId()) .append("inspectStandard", getInspectStandard()) .append("isFlag", getIsFlag()) .append("remark", getRemark()) diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java index d94aa74..462ede6 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java +++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsInspectRouteDetailServiceImpl.java @@ -57,6 +57,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS @Override public int insertDmsInspectRouteDetail(DmsInspectRouteDetail dmsInspectRouteDetail) { + fillMachineIdIfAbsent(dmsInspectRouteDetail); return dmsInspectRouteDetailMapper.insertDmsInspectRouteDetail(dmsInspectRouteDetail); } @@ -69,6 +70,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS @Override public int updateDmsInspectRouteDetail(DmsInspectRouteDetail dmsInspectRouteDetail) { + fillMachineIdIfAbsent(dmsInspectRouteDetail); return dmsInspectRouteDetailMapper.updateDmsInspectRouteDetail(dmsInspectRouteDetail); } @@ -100,4 +102,16 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS public List selectInspectRouteListByInspectRouteId(Long inspectRouteId) { return dmsInspectRouteDetailMapper.selectInspectRouteListByInspectRouteId(inspectRouteId); } + + /** + * 巡检线路明细前置校准：machineId 为空时回填 deviceId，确保满足数据库非空约束。 + */ + private void fillMachineIdIfAbsent(DmsInspectRouteDetail dmsInspectRouteDetail) { + if (dmsInspectRouteDetail == null) { + return; + } + if (dmsInspectRouteDetail.getMachineId() == null && dmsInspectRouteDetail.getDeviceId() != null) { + dmsInspectRouteDetail.setMachineId(dmsInspectRouteDetail.getDeviceId()); + } + } } diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml index 510d666..a695f4e 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select route_detail_id, inspect_route_id, line_step, device_id, inspect_standard, is_flag, remark from dms_inspect_route_detail + select route_detail_id, + inspect_route_id, + line_step, + machine_id as device_id, + machine_id, + inspect_standard, + is_flag, + remark + from dms_inspect_route_detail - select a.route_detail_id, a.inspect_route_id, a.line_step, a.device_id, a.inspect_standard, + select a.route_detail_id, a.inspect_route_id, a.line_step, a.machine_id as device_id, a.machine_id, a.inspect_standard, a.is_flag, a.remark,b.device_name,c.standard_name from dms_inspect_route_detail a - left join base_deviceledger b on a.device_id = b.OBJ_ID + left join base_deviceledger b on a.machine_id = b.OBJ_ID left join dms_base_inspect_standard c on a.inspect_standard = c.inspect_standard_id where a.inspect_route_id = #{inspectRouteId}