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;