更新气体采集时分机获取

CZT

2023-09-07 400fbd7324919c37f0834a57430ef1ac41e1bf61

更新气体采集时分机获取

 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());

 igds-core/src/main/java/com/ld/igds/models/DepotConf.java

@@ -48,7 +48,7 @@
    private String gasSer;

    @Column(name = "PEST_SER_", length = 40)
    @PropertyDef(label = "气体分机")
    @PropertyDef(label = "虫害分机")
    private String pestSer;

    @Column(name = "VERB_SER_", length = 40)