From 9b6053c92c8eb233658f06fa19ab4461e3ac1f44 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Fri, 12 Dec 2025 17:54:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=96=B0=E5=A2=9E=E5=A4=9A?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=AE=BE=E5=A4=87=E7=BC=96=E7=A0=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8F=8A=E4=B8=8D=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在检修工单、保养工单、巡检记录、停机记录和维修记录控制器中新增/listAll接口，支持不分页查询 - 在对应实体类中增加deviceCode字段，用于设备编码查询，且标注为非持久化字段 - 更新MyBatis XML映射，在查询条件中增加基于deviceCode的关联设备过滤逻辑 - 修正停机记录映射的字段名，确保数据库字段与XML定义一致 - 优化巡检记录、保养工单等模块关联设备编码的子查询逻辑，匹配实际数据库关系及字段名 --- .../controller/DmsBillsFaultInstanceController.java | 11 +++++++++++ .../controller/DmsBillsMaintInstanceController.java | 11 +++++++++++ .../dms/controller/DmsRecordInspectController.java | 11 +++++++++++ .../dms/controller/DmsRecordShutDownController.java | 11 +++++++++++ .../dms/controller/DmsRepairRecordController.java | 10 ++++++++++ .../com/aucma/dms/domain/DmsBillsMaintInstance.java | 12 ++++++++++++ .../java/com/aucma/dms/domain/DmsRecordInspect.java | 12 ++++++++++++ .../java/com/aucma/dms/domain/DmsRecordShutDown.java | 11 +++++++++++ .../mapper/dms/DmsBillsFaultInstanceMapper.xml | 1 + .../mapper/dms/DmsBillsMaintInstanceMapper.xml | 11 +++++++++-- .../resources/mapper/dms/DmsRecordInspectMapper.xml | 11 +++++++++-- .../resources/mapper/dms/DmsRecordShutDownMapper.xml | 12 ++++++------ .../resources/mapper/dms/DmsRepairRecordMapper.xml | 3 +++ 13 files changed, 117 insertions(+), 10 deletions(-) diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java index 05ef38d..c563762 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java @@ -77,6 +77,17 @@ public class DmsBillsFaultInstanceController extends BaseController return getDataTable(list); } + /** + * 查询检修工单列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:list')" ) + @GetMapping("/listAll") + public AjaxResult listAll(DmsBillsFaultInstance dmsBillsFaultInstance) + { + List list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance); + return success(list); + } + /** * 导出检修工单列表 */ diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java index 346b9a9..45c78c3 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java @@ -44,6 +44,17 @@ public class DmsBillsMaintInstanceController extends BaseController return getDataTable(list); } + /** + * 查询保养工单列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:list')" ) + @GetMapping("/listAll") + public AjaxResult listAll(DmsBillsMaintInstance dmsBillsMaintInstance) + { + List list = dmsBillsMaintInstanceService.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance); + return success(list); + } + /** * 导出保养工单列表 */ diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java index 7898acd..d824e99 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java @@ -42,6 +42,17 @@ public class DmsRecordInspectController extends BaseController return getDataTable(list); } + /** + * 查询巡检记录列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:list')" ) + @GetMapping("/listAll") + public AjaxResult listAll(DmsRecordInspect dmsRecordInspect) + { + List list = dmsRecordInspectService.selectDmsRecordInspectList(dmsRecordInspect); + return success(list); + } + /** * 导出巡检记录列表 */ diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java index 3d3f3d7..2288fac 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java @@ -40,6 +40,17 @@ public class DmsRecordShutDownController extends BaseController return getDataTable(list); } + /** + * 查询停机记录列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('dms:shutDown:list')" ) + @GetMapping("/listAll") + public AjaxResult listAll(DmsRecordShutDown dmsRecordShutDown) + { + List list = dmsRecordShutDownService.selectDmsRecordShutDownList(dmsRecordShutDown); + return success(list); + } + /** * 导出停机记录列表 */ diff --git a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairRecordController.java b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairRecordController.java index fbbb6a0..b94e417 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairRecordController.java +++ b/aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairRecordController.java @@ -40,6 +40,16 @@ public class DmsRepairRecordController extends BaseController { return getDataTable(list); } + /** + * 查询维修记录列表（不分页） + */ + @PreAuthorize("@ss.hasPermi('dms:repairRecord:list')") + @GetMapping("/listAll") + public AjaxResult listAll(DmsRepairRecord dmsRepairRecord) { + List list = dmsRepairRecordService.selectDmsRepairRecordList(dmsRepairRecord); + return AjaxResult.success(list); + } + /** * 导出维修记录列表 */ diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java index f68093c..98053f3 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java @@ -74,6 +74,18 @@ public class DmsBillsMaintInstance extends DmsBaseEntity private String maintStatusStr; private String maintLevelName; private String maintProtocol; + + /** 设备编码（查询用，非持久化字段） */ + private String deviceCode; + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + public String getMaintProtocol() { return maintProtocol; } diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java index da93be5..4a5e350 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java @@ -72,6 +72,18 @@ public class DmsRecordInspect extends DmsBaseEntity /** 是否标识：1-是；0-否 */ @Excel(name = "是否标识：1-是；0-否") private String isFlag; + + /** 设备编码（查询用，非持久化字段） */ + private String deviceCode; + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + private Long inspectInstanceId; public void setInspectInstanceId(Long inspectInstanceId) { diff --git a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java index c0fa944..de30fa1 100644 --- a/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java +++ b/aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java @@ -53,6 +53,17 @@ public class DmsRecordShutDown extends DmsBaseEntity @Excel(name = "是否标识：1-是；2-否") private Long isFlag; + /** 设备编码（查询用，非持久化字段） */ + private String deviceCode; + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + public void setRecordShutDownId(Long recordShutDownId) { this.recordShutDownId = recordShutDownId; diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index c431b18..8c5b15d 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -112,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and instance_type = #{instanceType} and is_flag = #{isFlag} and device_id = #{deviceId} + and device_id in (select OBJ_ID from base_deviceledger where device_code = #{deviceCode}) order by create_time desc diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml index fb6b166..8242cea 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml @@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.real_end_time, a.maint_status, a.maint_comp_rate, - a.is_flag, a.create_by, a.create_time, a.update_by, @@ -66,7 +65,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and #{realEndTime} > a.real_end_time and a.maint_status = #{maintStatus} and a.maint_comp_rate = #{maintCompRate} - and a.is_flag = #{isFlag} + + + and a.maint_instance_id in ( + select d.maint_instance_id + from dms_bills_maint_detail d + left join base_deviceledger l on d.machine_id = l.OBJ_ID + where l.device_code = #{deviceCode} + ) + order by create_time desc diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml index a1be875..799eec3 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select record_inspect_id,plan_inspect_id,bills_inspect_code, inspect_type, inspect_route_id, device_amount, plan_begin_time,plan_end_time, real_begin_time, real_end_time, performer, inspect_status, inspect_duration, - is_flag, remark, create_by, create_time, update_by, update_time from dms_record_inspect + remark, create_by, create_time, update_by, update_time from dms_record_inspect diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml index f1e9f46..5aa007b 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml @@ -20,15 +20,16 @@ + select record_shut_down_id, - device_id, - shut_type, + machine_id as device_id, + shut_type_id as shut_type, shut_reason, shut_begin_time, shut_end_time, shut_time, - is_flag, + active_flag as is_flag, remark, create_by, create_time, @@ -40,13 +41,12 @@ diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml index 8d4fc7c..4d2fe45 100644 --- a/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml +++ b/aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml @@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and device_id = #{deviceId} + + and device_code = #{deviceCode} + and device_name like '%' || #{deviceName} || '%'