Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 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.isNotEmpty(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.getGrainSer());
        // 默认获取粮情分机信息
        DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGrainSer());
        // 若气体分机配置不为空，则获取气体的分机
        if(StringUtils.isNotEmpty(depotConf.getGasSer())){
            deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getGasSer());
        }

        CheckGasRequest request = new CheckGasRequest();
        request.setDepotId(param.getDepotId());