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 0952d50b2..f94c48edf 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 @@ -39,6 +39,38 @@ public class DeviceInterfaceController { return deviceInterfaceService.getRepairWorkOrder(); } + /** + * 玫瑰图数据 + * @param equOperation + * @return + */ + @GetMapping("/getworkFaultReason") + public AjaxResult getworkFaultReason(EquOperation equOperation) { + DynamicDataSourceContextHolder.push(equOperation.getPoolName()); + return deviceInterfaceService.getworkFaultReason(); + } + + /** + * 排名图数据 + * @param equOperation + * @return + */ + @GetMapping("/getworkFaultDesc") + public AjaxResult getworkFaultDesc(EquOperation equOperation) { + DynamicDataSourceContextHolder.push(equOperation.getPoolName()); + return deviceInterfaceService.getworkFaultDesc(); + } + + /** + * 水波图 + * @param equOperation + * @return + */ + @GetMapping("/getWave") + public AjaxResult getWave(EquOperation equOperation) { + DynamicDataSourceContextHolder.push(equOperation.getPoolName()); + return deviceInterfaceService.getWave(); + } /** * 获取设备信息 * @@ -50,6 +82,7 @@ public class DeviceInterfaceController { return deviceInterfaceService.getEquipmentInfo(equOperation); } + /** * 获取设备维修质量 * @@ -115,6 +148,10 @@ public class DeviceInterfaceController { * 当月巡检待检 * 当月巡检完成数 * 当月巡检完成率 + * + * 当月保养任务总数 + * 当月保养完成数 + * 当月保养完成率 */ @GetMapping("/getCompletedRate") public AjaxResult getCompletedRate(EquOperation equOperation) { diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java index 2d176072a..ccd9cc4b0 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/DeviceInterfaceMapper.java @@ -84,4 +84,10 @@ public interface DeviceInterfaceMapper { EquipmentBoardVO getCompletionRate(); List selectEquRepairWorkOrderDetail(EquRepairWorkOrderDetailVO equRepairWorkOrderDetailVO); + + List getworkFaultReason(); + + List getworkFaultDesc(); + + Map getWave(); } 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 9ee7a0757..771f5378b 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 @@ -67,6 +67,12 @@ public interface IDeviceInterfaceService { AjaxResult selectSpotInspectionList(EquOrderVO equOrderVO); AjaxResult selectInspectionList(EquOrderVO equOrderVO); + + AjaxResult getworkFaultReason(); + + AjaxResult getworkFaultDesc(); + + AjaxResult getWave(); // // AjaxResult getInspectionWorkOrder(EquOrder equOrder); // 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 aad3406e6..67a2b68a4 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 @@ -288,4 +288,22 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { List spotInspectionList = deviceInterfaceMapper.selectEquOrderList(equOrderVO); return success(spotInspectionList); } + + @Override + public AjaxResult getworkFaultReason() { + List resultMap = deviceInterfaceMapper.getworkFaultReason(); + return success(resultMap); + } + + @Override + public AjaxResult getworkFaultDesc() { + List resultMap = deviceInterfaceMapper.getworkFaultDesc(); + return success(resultMap); + } + + @Override + public AjaxResult getWave() { + Map resultMap = deviceInterfaceMapper.getWave(); + return success(resultMap); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index cb0247028..1f1b294ee 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml @@ -204,6 +204,29 @@ @@ -413,5 +447,63 @@ order by eo.create_time desc + + +