diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java index cb3c45c4..8cefc7c0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelenvironmentindex/ModelEnvironmentIndexServiceImpl.java @@ -7,10 +7,10 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; import cn.iocoder.yudao.module.farm.dal.dataobject.deviceclassify.DeviceClassifyDO; -import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.environmentindicators.EnvironmentIndicatorsDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import cn.iocoder.yudao.module.farm.dal.mysql.deviceclassify.DeviceClassifyMapper; -import cn.iocoder.yudao.module.farm.dal.mysql.indicatorname.IndicatorNameMapper; +import cn.iocoder.yudao.module.farm.dal.mysql.environmentindicators.EnvironmentIndicatorsMapper; import cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex.ModelEnvironmentIndexMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -34,7 +34,7 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe @Resource private ModelEnvironmentIndexMapper modelEnvironmentIndexMapper; @Resource - private IndicatorNameMapper indicatorNameMapper; + private EnvironmentIndicatorsMapper environmentIndicatorsMapper; @Resource private DeviceClassifyMapper deviceClassifyMapper; @@ -45,15 +45,14 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe ModelEnvironmentIndexDO modelEnvironmentIndex = BeanUtils.toBean(createReqVO, ModelEnvironmentIndexDO.class); modelEnvironmentIndex.setId(IdUtil.fastUUID()); modelEnvironmentIndex.setTenantId(String.valueOf(user.getTenantId())); - IndicatorNameDO indicatorNameDO = indicatorNameMapper.selectById(modelEnvironmentIndex.getIndicators()); - modelEnvironmentIndex.setIndicatorsName(indicatorNameDO.getName()); - modelEnvironmentIndex.setIndicatorDescription(indicatorNameDO.getDescription()); - modelEnvironmentIndex.setSampleValue(indicatorNameDO.getSampleValue()); - modelEnvironmentIndex.setUnit(indicatorNameDO.getUnit()); + EnvironmentIndicatorsDO environmentIndicatorsDO = environmentIndicatorsMapper.selectById(modelEnvironmentIndex.getIndicators()); + modelEnvironmentIndex.setIndicatorsName(environmentIndicatorsDO.getName()); + modelEnvironmentIndex.setIndicatorDescription(environmentIndicatorsDO.getDescription()); + modelEnvironmentIndex.setSampleValue(environmentIndicatorsDO.getLowerThreshold() + "~" + environmentIndicatorsDO.getUpperThreshold()); + modelEnvironmentIndex.setUnit(environmentIndicatorsDO.getUnit()); DeviceClassifyDO deviceClassifyDO = deviceClassifyMapper.selectById(modelEnvironmentIndex.getDeviceClass()); modelEnvironmentIndex.setDeviceClassName(deviceClassifyDO.getName()); modelEnvironmentIndexMapper.insert(modelEnvironmentIndex); - // 返回 return modelEnvironmentIndex.getId(); }