From 37885c1962319dc72579d2557d2357774f782f65 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 29 Nov 2023 17:13:48 +0800 Subject: [PATCH] =?UTF-8?q?jx=20mes=20=E7=94=9F=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=9C=8B=E6=9D=BF=20=E5=B7=A5=E5=BA=8F=E5=B9=B3?= =?UTF-8?q?=E8=A1=A1=E5=8F=AF=E8=A7=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jx/JxCenterWorkingBoardDispatchService.java | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java index 807a999..13ce9d6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/jx/JxCenterWorkingBoardDispatchService.java @@ -29,29 +29,28 @@ public class JxCenterWorkingBoardDispatchService implements IJxCenterWorkingBoar switch ((String) dataMap.get(MesExtConstWords.FLAG)) { case "center01": - return new JxCenterWorkingBoardWatchService( - new JxCenterWorkingBoardCenterOneService(new JxCenterWorkingBoardProxyCenterService(), - new JxCenterWorkingBoardProxyWorkingStatusService(new JxCenterWorkingBoardProxySpcrService()) - )).queryCenterWorkingBoardData(dataMap); + return new JxCenterWorkingBoardWatchService(new JxCenterWorkingBoardCenterOneService( + new JxCenterWorkingBoardProxyCenterService(), + new JxCenterWorkingBoardProxyWorkingStatusService(new JxCenterWorkingBoardProxySpcrService()) + )).queryCenterWorkingBoardData(dataMap); case "center02": - return new JxCenterWorkingBoardWatchService( - new JxCenterWorkingBoardCenterTwoService(new JxCenterWorkingBoardProxyCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), - new JxCenterWorkingBoardProxyEnergyRateService(new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyRepairService(new JxCenterWorkingBoardProxySpcrService())))) - )).queryCenterWorkingBoardData(dataMap); + return new JxCenterWorkingBoardWatchService(new JxCenterWorkingBoardCenterTwoService( + new JxCenterWorkingBoardProxyCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), + new JxCenterWorkingBoardProxyEnergyRateService(new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyRepairService(new JxCenterWorkingBoardProxySpcrService())))) + )).queryCenterWorkingBoardData(dataMap); case "center03": - return new JxCenterWorkingBoardWatchService( - new JxCenterWorkingBoardCenterThreeService(new JxCenterWorkingBoardProxyCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), - new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyTimeSegmentService())) - )).queryCenterWorkingBoardData(dataMap); + return new JxCenterWorkingBoardWatchService(new JxCenterWorkingBoardCenterThreeService( + new JxCenterWorkingBoardProxyCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), + new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyTimeSegmentService())) + )).queryCenterWorkingBoardData(dataMap); case "monitor01": - return new JxCenterWorkingBoardWatchService( - new JxCenterWorkingBoardMonitorOneService( - new JxCenterWorkingBoardProxyAllCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), new JxCenterWorkingBoardProxyWorkingStatusService(), new JxCenterWorkingBoardProxyEnergyRateService(), - new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyRepairService(new JxCenterWorkingBoardProxySpcrService()))) - )).queryCenterWorkingBoardData(dataMap); + return new JxCenterWorkingBoardWatchService(new JxCenterWorkingBoardMonitorOneService( + new JxCenterWorkingBoardProxyAllCenterService(), new JxCenterWorkingBoardProxyStandardWorkService(), new JxCenterWorkingBoardProxyWorkingStatusService(), new JxCenterWorkingBoardProxyEnergyRateService(), + new JxCenterWorkingBoardProxyOrderService(new JxCenterWorkingBoardProxyOutPutService(new JxCenterWorkingBoardProxyRepairService(new JxCenterWorkingBoardProxySpcrService()))) + )).queryCenterWorkingBoardData(dataMap); default: return dataMap;