From 400fbd7324919c37f0834a57430ef1ac41e1bf61 Mon Sep 17 00:00:00 2001 From: CZT <czt18638530771@163.com> Date: 星期四, 07 九月 2023 17:59:30 +0800 Subject: [PATCH] 更新气体采集时分机获取 --- igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java index 6b758ff..01b7fbe 100644 --- a/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java +++ b/igds-basic/src/main/java/com/ld/igds/gas/manager/GasManager.java @@ -204,9 +204,12 @@ DepotConf depotConf = coreCommonService.getCacheDepotConf( param.getCompanyId(), param.getDepotId()); - // 鑾峰彇鍒嗘満淇℃伅 - DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), - depotConf.getGasSer()); + // 榛樿鑾峰彇绮儏鍒嗘満淇℃伅 + DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer()); + // 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈� + if(StringUtils.isEmpty(depotConf.getGasSer())){ + deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer()); + } CheckGasRequest request = new CheckGasRequest(); request.setDepotId(param.getDepotId()); @@ -259,9 +262,12 @@ DepotConf depotConf = coreCommonService.getCacheDepotConf( param.getCompanyId(), param.getDepotId()); - // 鑾峰彇鍒嗘満淇℃伅 - DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), - depotConf.getGasSer()); + // 榛樿鑾峰彇绮儏鍒嗘満淇℃伅 + DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer()); + // 鑻ユ皵浣撳垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇姘斾綋鐨勫垎鏈� + if(StringUtils.isEmpty(depotConf.getGasSer())){ + deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer()); + } CheckGasRequest request = new CheckGasRequest(); request.setDepotId(param.getDepotId()); -- Gitblit v1.9.3