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 dce62c2f6..fe8205e12 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 @@ -261,4 +261,20 @@ public class DeviceInterfaceController { } } + + + /** + * 产线故障率 + * @param equOperation + * @return + */ + @GetMapping("/getFaultRateList") + public AjaxResult getFaultRateList(EquOperation equOperation) { + DynamicDataSourceContextHolder.push(equOperation.getPoolName()); + try { + return deviceInterfaceService.getFaultRateList(); + }finally { + DynamicDataSourceContextHolder.poll(); + } + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquFaultRateVO.java b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquFaultRateVO.java new file mode 100644 index 000000000..7511d5397 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/vo/EquFaultRateVO.java @@ -0,0 +1,62 @@ +package com.op.device.domain.vo; + +import java.math.BigDecimal; + +/** + * remark + * + * @author 019117 + * @date + */ +public class EquFaultRateVO { + + private String lineCode; + + private String lineName; + + private BigDecimal workTime; + + private BigDecimal fixTime; + + private BigDecimal faultRate; + + public String getLineCode() { + return lineCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + + public String getLineName() { + return lineName; + } + + public void setLineName(String lineName) { + this.lineName = lineName; + } + + public BigDecimal getWorkTime() { + return workTime; + } + + public void setWorkTime(BigDecimal workTime) { + this.workTime = workTime; + } + + public BigDecimal getFixTime() { + return fixTime; + } + + public void setFixTime(BigDecimal fixTime) { + this.fixTime = fixTime; + } + + public BigDecimal getFaultRate() { + return faultRate; + } + + public void setFaultRate(BigDecimal faultRate) { + this.faultRate = faultRate; + } +} 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 98a460350..7863e5b63 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 @@ -92,4 +92,7 @@ public interface DeviceInterfaceMapper { Map getWave(); List getRepairWorkOrderCostTime(); + + List getFaultRateList(); + } 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 f93b7d42c..c1b0e4e85 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 @@ -75,6 +75,8 @@ public interface IDeviceInterfaceService { AjaxResult getWave(); AjaxResult getRepairWorkOrderCostTime(); + + AjaxResult getFaultRateList(); // // 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 5349e9e63..d3a88f6ce 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 @@ -2,7 +2,6 @@ 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.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.*; import com.op.device.domain.vo.*; @@ -312,4 +311,10 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService { List resultMap = deviceInterfaceMapper.getRepairWorkOrderCostTime(); return success(resultMap); } + + @Override + public AjaxResult getFaultRateList() { + //获取当天在生产的产线的故障率 + return AjaxResult.success(deviceInterfaceMapper.getFaultRateList()); + } } 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 1671fb070..835ed067c 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 @@ -537,4 +537,64 @@ ORDER BY erwo.work_cost_time DESC; + + + + diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml index ff86a9252..c98a8f023 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderStandardMapper.xml @@ -304,4 +304,15 @@ and del_flag = '0' + +