diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java index 5ed24dd29..eb158bb22 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteMesService.java @@ -51,4 +51,7 @@ public interface RemoteMesService { @PostMapping("/reportWorks/mesProTask") public R mesProTask(); + + @PostMapping("/reportWorks/updateEquRunTime") + public R updateEquRunTime(); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java index ae3ccffd9..964ed2ec6 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteMesFallbackFactory.java @@ -77,6 +77,11 @@ public class RemoteMesFallbackFactory implements FallbackFactory workPlanTimeArray; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java index ee1a76f75..655a77915 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java @@ -138,7 +138,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { } /** - * 根据巡检计划生成点检任务 + * 根据巡检计划生成巡检任务 **/ @Override public AjaxResult createPatrolCheckPlanTask() { 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 2b75f000c..7f21041b6 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 @@ -493,17 +493,19 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService EquOperation equOperation = equOperationMapper.selectEquipmentIntegrityRate(time, equRepairWorkOrder.getEquipmentCode()); if (equOperation != null) { if (equRepairWorkOrder.getWorkDownMachine().equals("1")) { - DecimalFormat df = new DecimalFormat("#.##"); + // DecimalFormat df = new DecimalFormat("#.##"); //实际运行时间 = 实际运行时间 - 故障时间 - double result = Double.parseDouble(equOperation.getActualOperationTime()) - Double.parseDouble(hours); + // 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)));//实际运行时间 + DecimalFormat dfs = new DecimalFormat("#.00"); + String formattedFaultTime = dfs.format(faultTime); +// BigDecimal faultTimeBD = new BigDecimal(faultTime);// 故障时间 +// BigDecimal operationTimeBD = new BigDecimal(equOperation.getOperationTime());//运行时间 + equOperation.setFaultTime(formattedFaultTime);//故障时间 + //equOperation.setActualOperationTime(String.valueOf(df.format(result)));//实际运行时间 //故障率计算（故障时间/运行时间） - equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD, 2, RoundingMode.HALF_UP).toString() + "%"); + // equOperation.setFailureRate(faultTimeBD.multiply(new BigDecimal(100)).divide(operationTimeBD, 2, RoundingMode.HALF_UP).toString() + "%"); equOperation.setShutdownTimes(equOperation.getShutdownTimes() + 1);//停机次数加1 } diff --git a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java index 6ff482e65..e97de7bb8 100644 --- a/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java +++ b/op-modules/op-job/src/main/java/com/op/job/task/RyTask.java @@ -250,5 +250,11 @@ public class RyTask { logger.info("++留样复检定时任务+开始++syncQcCheckSampleTask+++++"); remoteQualityService.createCheckSampleTask(); } + + /**********更新设备的运行时间，第二天更新前一天的*********/ + public void updateEquRunTime(){ + logger.info("++更新设备的运行时间+开始++updateEquRunTime+++++"); + remoteMesService.updateEquRunTime(); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java index 4ef3d761d..3a4f0be6a 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorksController.java @@ -179,4 +179,11 @@ public class MesReportWorksController extends BaseController { } } } + /** + * 更新设备的运行时间 + **/ + @PostMapping("/mesProTask") + public R updateEquRunTime() { + return mesReportWorksService.updateEquRunTime(); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java index ebdc59923..89e0836e2 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorksService.java @@ -25,4 +25,6 @@ public interface IMesReportWorksService { List getCXJProductionTitle(HFProduction dto); List> getCXJProductionList(HFProduction dto); + + R updateEquRunTime(); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java index 6934079f3..1efccf086 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorksServiceImpl.java @@ -329,6 +329,8 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService { return results; } + + private List getDateInterval(String start, String end) { start = start.substring(0,10); end = end.substring(0,10); @@ -348,4 +350,15 @@ public class MesReportWorksServiceImpl implements IMesReportWorksService { return dateList; } + + @Override + public R updateEquRunTime() { + DynamicDataSourceContextHolder.push("ds_1000"); + try { + + }finally { + DynamicDataSourceContextHolder.poll(); + } + return R.ok(); + } }