From 821d4f9a58770656660f8745995814b6588bdb51 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 20 Dec 2023 09:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=89=8B=E6=8C=81=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceInterfaceController.java | 24 -------- .../controller/DevicePDAController.java | 25 +++++++- .../service/IDeviceInterfaceService.java | 16 ----- .../op/device/service/IDevicePDAService.java | 15 +++++ .../impl/DeviceInterfaceServiceImpl.java | 59 ------------------- .../service/impl/DevicePDAServiceImpl.java | 48 +++++++++++++++ 6 files changed, 87 insertions(+), 100 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java index 6626b11c..ff68332d 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java @@ -21,7 +21,6 @@ public class DeviceInterfaceController { @Autowired private IDeviceInterfaceService deviceInterfaceService; - /** * 获取维修工单 * @return @@ -81,29 +80,6 @@ public class DeviceInterfaceController { return deviceInterfaceService.getDeviceRefreshTime(equOperation); } - /** - * 查询故障描述列表手持 - */ - @GetMapping("/getFaultDescriptionList") - public AjaxResult getFaultDescriptionList(EquFaultDescription equFaultDescription) { - return deviceInterfaceService.selectEquFaultDescriptionList(equFaultDescription); - } - - /** - * 查询故障维修措施列表手持 - */ - @GetMapping("/getFaultMeasuresList") - public AjaxResult getFaultMeasuresList(EquFaultMeasures equFaultMeasures) { - return deviceInterfaceService.selectEquFaultMeasuresList(equFaultMeasures); - } - - /** - * 查询故障原因列表 - */ - @GetMapping("/getFaultReasonList") - public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { - return deviceInterfaceService.selectEquFaultReasonList(equFaultReason); - } /** * 首页-组线设备月故障数 * @return diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 57cc27cf..c6bbdb7f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -10,7 +10,6 @@ import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquRepairOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.List; /** @@ -175,4 +174,28 @@ public class DevicePDAController extends BaseController { public AjaxResult startMaintenanceTask(PDADTO pdadto) { return devicePDAService.startMaintenanceTask(pdadto); } + + /** + * 查询故障描述列表手持 + */ + @GetMapping("/getFaultDescriptionList") + public AjaxResult getFaultDescriptionList(EquFaultDescription equFaultDescription) { + return devicePDAService.selectEquFaultDescriptionList(equFaultDescription); + } + + /** + * 查询故障维修措施列表手持 + */ + @GetMapping("/getFaultMeasuresList") + public AjaxResult getFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + return devicePDAService.selectEquFaultMeasuresList(equFaultMeasures); + } + + /** + * 查询故障原因列表 + */ + @GetMapping("/getFaultReasonList") + public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { + return devicePDAService.selectEquFaultReasonList(equFaultReason); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java index 3203e97b..775ae764 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java @@ -46,22 +46,6 @@ public interface IDeviceInterfaceService { */ public AjaxResult getDeviceRefreshTime(EquOperation equOperation); - /** - * 故障描述 - */ - AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); - - /** - * 故障维修措施 - */ - AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); - - /** - * 故障维修措施 - */ - AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason); - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord); - /** * 首页-组线设备月故障数 * @return diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index 063b01eb..0fe60052 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -123,4 +123,19 @@ public interface IDevicePDAService { //查询设备列表 List selectEquEquipmentList(EquEquipment equEquipment); + + /** + * 故障描述 + */ + AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 故障维修措施 + */ + AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 故障维修措施 + */ + AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java index b2cd7b5b..dd9ba40a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java @@ -33,16 +33,6 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @Autowired private EquOperationRecordMapper equOperationRecordMapper; - @Autowired - private EquFaultMeasuresMapper equFaultMeasuresMapper; - - @Autowired - private EquFaultDescriptionMapper equFaultDescriptionMapper; - - @Autowired - private EquFaultReasonMapper equFaultReasonMapper; - - /** * 获取待维修的维修工单 * @@ -229,55 +219,6 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { return success(time); } - /** - * 查询故障维修措施列表 - * - * @param equFaultMeasures 故障维修措施 - * @return 故障维修措施 - */ - @Override - @DS("#header.poolName") - public AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) { - List list = equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures); - return success(list); - } - - /** - * 查询故障描述列表 - * - * @param equFaultDescription 故障描述 - * @return 故障描述 - */ - @Override - @DS("#header.poolName") - public AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) { - List list = equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription); - return success(list); - } - - /** - * 查询故障原因列表 - * - * @param equFaultReason 故障原因 - * @return 故障原因 - */ - @Override - @DS("#header.poolName") - public AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason) { - List list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); - return success(list); - } - - /** - * 看板刷新时间 - */ - @Override - @DS("master") - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { - String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord); - int time = Integer.parseInt(refreshTime); - return success(time); - } /** * 首页-组线设备月故障数 diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 6efcb059..2ba20b72 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -72,6 +72,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquOperationRecordMapper equOperationRecordMapper; + @Autowired + private EquFaultMeasuresMapper equFaultMeasuresMapper; + + @Autowired + private EquFaultDescriptionMapper equFaultDescriptionMapper; + + @Autowired + private EquFaultReasonMapper equFaultReasonMapper; + /** * 获取今日任务工单list-状态不为已完成 @@ -913,4 +922,43 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equOperationRecordMapper.insertEquOperationRecord(newRecord); } + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + List list = equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures); + return success(list); + } + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) { + List list = equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription); + return success(list); + } + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason) { + List list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); + return success(list); + } + }