From 51f62a585355a1eac6b1a066603df3730a137b4b Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 9 Jan 2024 16:56:08 +0800 Subject: [PATCH] =?UTF-8?q?2024-1-9-3=20=E8=AE=BE=E5=A4=87-1.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=95=85=E9=9A=9C=E6=AC=A1=E6=95=B0=20=E5=81=9C?= =?UTF-8?q?=E6=9C=BA=E6=AC=A1=E6=95=B0=202.=E5=AE=8C=E5=96=84=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E3=80=81PC=E5=92=8C=E7=BB=B4=E4=BF=AE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=203.=E5=AE=8C=E5=96=84=E5=BD=93=E6=97=A5=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=A8=B3=E5=AE=9A=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 9 ++---- .../com/op/device/domain/EquOperation.java | 24 ++++++++++++++ .../service/impl/DevicePDAServiceImpl.java | 26 ++++++++------- .../impl/EquRepairWorkOrderServiceImpl.java | 32 ++++++++++--------- .../mapper/device/DeviceInterfaceMapper.xml | 9 ++++-- .../mapper/device/EquOperationMapper.xml | 12 ++++++- 6 files changed, 74 insertions(+), 38 deletions(-) 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 18d6e43d..e5426032 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 @@ -72,8 +72,7 @@ public class DevicePDAController extends BaseController { return devicePDAService.updateInspectionRecord(equOrder); } - //报修 - + //////////报修 /** * 新增手持报修记录 * @@ -85,8 +84,7 @@ public class DevicePDAController extends BaseController { return devicePDAService.addRepairRecord(equRepairOrder); } - //维修 - + //////////维修 /** * 获取维修记录（待处理） * @@ -120,7 +118,6 @@ public class DevicePDAController extends BaseController { return devicePDAService.updateDowntime(equRepairWorkOrder); } - /** * 获取设备管理详细信息 */ @@ -198,6 +195,4 @@ public class DevicePDAController extends BaseController { public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) { return devicePDAService.selectEquFaultReasonList(equFaultReason); } - - } 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 22668daf..a9f42b88 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 @@ -95,6 +95,14 @@ public class EquOperation extends BaseEntity { /** 删除标识 */ private String delFlag; + /** 故障次数 */ + @Excel(name = "故障次数") + private Integer failureTimes; + + /** 停机次数 */ + @Excel(name = "停机次数") + private Integer shutdownTimes; + // 创建日期范围list private List createTimeArray; @@ -353,6 +361,22 @@ public class EquOperation extends BaseEntity { return intactRate; } + //故障次数 + public void setFailureTimes(Integer failureTimes) { + this.failureTimes = failureTimes; + } + public Integer getFailureTimes() { + return failureTimes; + } + + //停机次数 + public void setShutdownTimes(Integer shutdownTimes) { + this.shutdownTimes = shutdownTimes; + } + public Integer getShutdownTimes() { + return shutdownTimes; + } + @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/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 336385f6..791fcedf 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 @@ -785,18 +785,20 @@ public class DevicePDAServiceImpl implements IDevicePDAService { //2.3修改完好率报表 if(equOperation != null){ - DecimalFormat df = new DecimalFormat("#.##"); - //实际运行时间 = 实际运行时间 - 故障时间 - double result = Double.parseDouble(equOperation.getActualOperationTime()) - hour; - //故障时间 = 原来的故障时间 + 这次的故障时间 - double faultTime = Double.parseDouble(equOperation.getFaultTime()) + hour; - equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 - equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 - - BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 - BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 - - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + if (list.getWorkDownMachine().equals("1")) { + DecimalFormat df = new DecimalFormat("#.##"); + //实际运行时间 = 实际运行时间 - 故障时间 + double result = Double.parseDouble(equOperation.getActualOperationTime()) - hour; + //故障时间 = 原来的故障时间 + 这次的故障时间 + double faultTime = Double.parseDouble(equOperation.getFaultTime()) + hour; + BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 + BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());//运行时间 + equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 + equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + equOperation.setShutdownTimes(equOperation.getShutdownTimes()+1);//停机次数加1 + } + equOperation.setFailureTimes(equOperation.getFailureTimes()+1);//故障次数加1 equOperation.setUpdateBy(SecurityUtils.getUsername()); equOperation.setUpdateTime(DateUtils.getNowDate()); equOperationMapper.updateEquOperation(equOperation); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index eea0cbf3..bbe336e4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -234,22 +234,25 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService String time = sdf.format(equRepairWorkOrder.getWorkEndTime()); EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time,equRepairWorkOrder.getEquipmentCode()); - if(equOperation != null){ - DecimalFormat df = new DecimalFormat("#.##"); - //实际运行时间 = 实际运行时间 - 故障时间 - double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); - //故障时间 = 原来的故障时间 + 这次的故障时间 - double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours); - equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 - equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 - - BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 - BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 - - // 故障率计算（故障时间/运行时间） - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + if(equOperation != null){ + if (equRepairWorkOrder.getWorkDownMachine().equals("1")) { + DecimalFormat df = new DecimalFormat("#.##"); + //实际运行时间 = 实际运行时间 - 故障时间 + double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); + //故障时间 = 原来的故障时间 + 这次的故障时间 + double faultTime = Double.parseDouble(equOperation.getFaultTime()) + Double.parseDouble(hours); + BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 + BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());// 运行时间 + equOperation.setFaultTime(String.valueOf(faultTime));//故障时间 + equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 + // 故障率计算（故障时间/运行时间） + equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD,2, RoundingMode.HALF_UP).toString()+"%"); + equOperation.setShutdownTimes(equOperation.getShutdownTimes()+1);//停机次数加1 + } equOperation.setUpdateBy(SecurityUtils.getUsername()); equOperation.setUpdateTime(DateUtils.getNowDate()); + //故障次数增加，但是停机次数可能不增加 + equOperation.setFailureTimes(equOperation.getFailureTimes()+1);//故障次数加1 equOperationMapper.updateEquOperation(equOperation); } } @@ -258,7 +261,6 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService // BigDecimal sparePartsCost = equSpareApplyMapper.getSparePartsCost(equRepairWorkOrder.getOrderCode()); // BigDecimal orderCost = BigDecimal.valueOf(Double.valueOf(equRepairWorkOrder.getWorkCost())); // equRepairWorkOrder.setWorkCost(String.valueOf(sparePartsCost.add(orderCost))); - return equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder); } 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 48089a27..0cbc365c 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 @@ -77,11 +77,14 @@ diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml index cad74285..6da1e004 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOperationMapper.xml @@ -29,6 +29,8 @@ + + @@ -55,7 +57,9 @@ create_by, create_time, update_by, - update_time + update_time, + failure_times, + shutdown_times from equ_operation @@ -159,6 +163,8 @@ create_time, update_by, update_time, + failure_times, + shutdown_times, #{id}, @@ -185,6 +191,8 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{failureTimes}, + #{shutdownTimes}, @@ -236,6 +244,8 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + failure_times = #{failureTimes}, + shutdown_times = #{shutdownTimes}, where id = #{id}