From ad8dd9797b909d1669bd21ea352d6ba6eb518924 Mon Sep 17 00:00:00 2001 From: xiaogu Date: Thu, 11 Sep 2025 10:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=8E=AF=E5=A2=83=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E5=8F=8D=E6=9F=A5=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModelEnvironmentIndexServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 d0e9ac2e..cb3c45c4 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.environmentindexconfig.EnvironmentIndexConfigDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.indicatorname.IndicatorNameDO; 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.environmentindexconfig.EnvironmentIndexConfigMapper; +import cn.iocoder.yudao.module.farm.dal.mysql.indicatorname.IndicatorNameMapper; 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 EnvironmentIndexConfigMapper environmentIndexConfigMapper; + private IndicatorNameMapper indicatorNameMapper; @Resource private DeviceClassifyMapper deviceClassifyMapper; @@ -45,9 +45,11 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe ModelEnvironmentIndexDO modelEnvironmentIndex = BeanUtils.toBean(createReqVO, ModelEnvironmentIndexDO.class); modelEnvironmentIndex.setId(IdUtil.fastUUID()); modelEnvironmentIndex.setTenantId(String.valueOf(user.getTenantId())); - EnvironmentIndexConfigDO environmentIndexConfigDO = environmentIndexConfigMapper.selectById(modelEnvironmentIndex.getIndicators()); - modelEnvironmentIndex.setIndicatorsName(environmentIndexConfigDO.getName()); - modelEnvironmentIndex.setIndicatorDescription(environmentIndexConfigDO.getDescription()); + IndicatorNameDO indicatorNameDO = indicatorNameMapper.selectById(modelEnvironmentIndex.getIndicators()); + modelEnvironmentIndex.setIndicatorsName(indicatorNameDO.getName()); + modelEnvironmentIndex.setIndicatorDescription(indicatorNameDO.getDescription()); + modelEnvironmentIndex.setSampleValue(indicatorNameDO.getSampleValue()); + modelEnvironmentIndex.setUnit(indicatorNameDO.getUnit()); DeviceClassifyDO deviceClassifyDO = deviceClassifyMapper.selectById(modelEnvironmentIndex.getDeviceClass()); modelEnvironmentIndex.setDeviceClassName(deviceClassifyDO.getName()); modelEnvironmentIndexMapper.insert(modelEnvironmentIndex);