From bf04c7bdcfb4f033e20ed4529db088438181c13c Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 18 Dec 2023 14:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF=20?= =?UTF-8?q?=E5=AE=8C=E5=A5=BD=E7=8E=87=E8=B0=83=E6=95=B4=20-=20=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceInterfaceController.java | 17 ++-- .../com/op/device/domain/EquOperation.java | 84 +++++++++++++++++++ .../device/mapper/DeviceInterfaceMapper.java | 9 +- .../op/device/mapper/EquOperationMapper.java | 1 + .../mapper/EquOperationRecordMapper.java | 7 +- .../service/IDeviceInterfaceService.java | 9 +- .../impl/DeviceInterfaceServiceImpl.java | 32 +++---- .../mapper/device/DeviceInterfaceMapper.xml | 22 +++++ .../device/EquOperationRecordMapper.xml | 28 ------- 9 files changed, 148 insertions(+), 61 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 bd048a05..38043421 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 @@ -1,6 +1,7 @@ package com.op.device.controller; import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import com.op.device.service.IDeviceInterfaceService; import org.springframework.beans.factory.annotation.Autowired; @@ -53,23 +54,23 @@ public class DeviceInterfaceController { /** * 设备稳定性-MTBF top10 * 公式：实际运转时间/停机次数 - * @param equOperationRecord + * @param equOperation * @return */ @GetMapping("/equipmentStability") - public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getEquipmentStabilityList(equOperationRecord); + public AjaxResult getEquipmentStabilityList(EquOperation equOperation) { + return deviceInterfaceService.getEquipmentStabilityList(equOperation); } /** * 完好设备占比 * 公式：维修/故障设备 - * @param equOperationRecord + * @param equOperation * @return */ @GetMapping("/equipmentIntactRate") - public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getEquipmentIntactRate(equOperationRecord); + public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { + return deviceInterfaceService.getEquipmentIntactRate(equOperation); } /** @@ -77,8 +78,8 @@ public class DeviceInterfaceController { * 初始值：五分钟刷新一次 */ @GetMapping("/getDeviceRefreshTime") - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { - return deviceInterfaceService.getDeviceRefreshTime(equOperationRecord); + public AjaxResult getDeviceRefreshTime(EquOperation equOperation) { + return deviceInterfaceService.getDeviceRefreshTime(equOperation); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java index ed161658..22668daf 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java @@ -104,6 +104,26 @@ public class EquOperation extends BaseEntity { // 创建日期结束 private String createTimeEnd; + //MTBF接口字段 + //序号 + private String serialNumber; + //开机时间 + private String onTime; + //故障次数 + private String shutDownNumber; + //mtbf + private String mtbf; + + //IntactRate 完好设备占比字段 + //运行设备 + private String operationEquipment; + //故障设备 + private String faultEquipment; + //总设备 + private String totalEquipment; + //百分比 + private String intactRate; + public String getCreateTimeStart() { return createTimeStart; } @@ -269,6 +289,70 @@ public class EquOperation extends BaseEntity { return delFlag; } + //虚拟字段 序号 + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + public String getSerialNumber() { + return serialNumber; + } + + //开机时间 + public void setOnTime(String onTime) { + this.onTime = onTime; + } + public String getOnTime() { + return onTime; + } + + //故障次数 + public void setShutDownNumber(String shutDownNumber) { + this.shutDownNumber = shutDownNumber; + } + public String getShutDownNumber() { + return shutDownNumber; + } + + //mtbf + public void setMtbf(String mtbf) { + this.mtbf = mtbf; + } + public String getMtbf() { + return mtbf; + } + + //运行设备 + public void setOperationEquipment(String operationEquipment) { + this.operationEquipment = operationEquipment; + } + public String getOperationEquipment() { + return operationEquipment; + } + + //故障设备 + public void setFaultEquipment(String faultEquipment) { + this.faultEquipment = faultEquipment; + } + public String getFaultEquipment() { + return faultEquipment; + } + + //总设备 + public void setTotalEquipment(String totalEquipment) { + this.totalEquipment = totalEquipment; + } + public String getTotalEquipment() { + return totalEquipment; + } + + //完好率 + public void setIntactRate(String intactRate) { + this.intactRate = intactRate; + } + public String getIntactRate() { + return intactRate; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 9f63567c..4d07dc6d 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 @@ -1,5 +1,6 @@ package com.op.device.mapper; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.MesReportWork; @@ -42,5 +43,11 @@ public interface DeviceInterfaceMapper { * 设备看板刷新时间 * 初始值：5分钟 */ - String getDeviceRefreshTime(EquOperationRecord equOperationRecord); + String getDeviceRefreshTime(EquOperation equOperation); + + //设备稳定性 MTBF设备平均故障间隔 + List getMTBFList(EquOperation equOperation); + + //设备完好率 + EquOperation getEquipmentIntactRate(EquOperation equOperation); } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java index b6630f08..73a8d947 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOperation; +import com.op.device.domain.EquOperationRecord; import io.lettuce.core.dynamic.annotation.Param; /** diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java index e7f2d37e..4952ee7f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOperationRecordMapper.java @@ -2,6 +2,7 @@ package com.op.device.mapper; import java.util.List; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import org.apache.ibatis.annotations.Param; @@ -67,12 +68,6 @@ public interface EquOperationRecordMapper { */ List selectEquOperationRecordByEquipmentCode(String equipmentCode); - //设备稳定性 MTBF设备平均故障间隔 - List getMTBFList(EquOperationRecord equOperationRecord); - - //设备完好率 - EquOperationRecord getEquipmentIntactRate(EquOperationRecord equOperationRecord); - /** * 查询改设备最后一条运行记录 * @param equipmentCode 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 db04b539..1777cdc8 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 @@ -1,6 +1,7 @@ package com.op.device.service; import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; /** @@ -30,19 +31,19 @@ public interface IDeviceInterfaceService { * 设备稳定性MTBF 实际运转时间/停止次数 * @return */ - AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord); + AjaxResult getEquipmentStabilityList(EquOperation equOperation); /** * 完好设备占比 * 公式：维修/故障设备 - * @param equOperationRecord + * @param equOperation * @return */ - AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord); + AjaxResult getEquipmentIntactRate(EquOperation equOperation); /** * 设备看板刷新时间 * 初始值：5分钟 */ - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord); + public AjaxResult getDeviceRefreshTime(EquOperation equOperation); } 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 13d84288..0fe03a45 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 @@ -1,25 +1,21 @@ package com.op.device.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquOperation; import com.op.device.domain.EquOperationRecord; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.MesReportWork; -import com.op.device.mapper.EquEquipmentMapper; +import com.op.device.mapper.*; import com.op.device.domain.vo.IEquipmentVO; import com.op.device.domain.vo.IRepairWorkOrderVO; -import com.op.device.mapper.DeviceInterfaceMapper; -import com.op.device.mapper.EquOperationRecordMapper; -import com.op.device.mapper.EquRepairWorkOrderMapper; import com.op.device.service.IDeviceInterfaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.Random; +import java.util.*; import java.util.stream.Collectors; import static com.op.common.core.web.domain.AjaxResult.success; @@ -37,6 +33,10 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { @Autowired private EquOperationRecordMapper equOperationRecordMapper; + @Autowired + private EquOperationMapper equOperationMapper; + + /** * 获取待维修的维修工单 * @@ -189,9 +189,13 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("#header.poolName") - public AjaxResult getEquipmentStabilityList(EquOperationRecord equOperationRecord) { + public AjaxResult getEquipmentStabilityList(EquOperation equOperation) { //查询所有设备（设备停用的除外） - List equipmentList = equOperationRecordMapper.getMTBFList(equOperationRecord); + //判断查询年/月/日 + //需要加逻辑 + //当日时间 + equOperation.setCreateTime(DateUtils.getNowDate()); + List equipmentList = deviceInterfaceMapper.getMTBFList(equOperation); return success(equipmentList); } @@ -202,9 +206,9 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("#header.poolName") - public AjaxResult getEquipmentIntactRate(EquOperationRecord equOperationRecord) { + public AjaxResult getEquipmentIntactRate(EquOperation equOperation) { //查询所有设备（设备停用的除外） - EquOperationRecord equipmentIntactRate = equOperationRecordMapper.getEquipmentIntactRate(equOperationRecord); + EquOperation equipmentIntactRate = deviceInterfaceMapper.getEquipmentIntactRate(equOperation); return success(equipmentIntactRate); } @@ -213,8 +217,8 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { */ @Override @DS("master") - public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) { - String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord); + public AjaxResult getDeviceRefreshTime(EquOperation equOperation) { + String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperation); int time = Integer.parseInt(refreshTime); return success(time); } 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 06c2b7f8..7dbacc22 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 @@ -64,4 +64,26 @@ where dict_label = 'device_refresh_time' + + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml index 1bd8a391..7617002a 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationRecordMapper.xml @@ -151,34 +151,6 @@ - - - - -