From aa8f41fdb4ff7dfb4c9e918e8c0880c93cc0878c Mon Sep 17 00:00:00 2001 From: xiaogu Date: Wed, 10 Sep 2025 21:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ModelEnvironmentIndexPageReqVO.java | 20 ++++++++++ .../vo/ModelEnvironmentIndexRespVO.java | 27 +++++++++++-- .../vo/ModelEnvironmentIndexSaveReqVO.java | 21 ++++++++++ .../ModelEnvironmentIndexDO.java | 31 ++++++++++++--- .../ModelEnvironmentIndexServiceImpl.java | 38 +++++++++++-------- 5 files changed, 112 insertions(+), 25 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java index b861d808..ad505dca 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexPageReqVO.java @@ -50,5 +50,25 @@ public class ModelEnvironmentIndexPageReqVO extends PageParam { @Schema(description = "租户id", example = "20667") private String tenantId; + /** + * 设备分类名称 + */ + private String deviceClassName; + /** + * 指示范围 + */ + private String sampleValue; + /** + * 指示说明 + */ + private String indicatorDescription; + /** + * 单位 + */ + private String unit; + /** + * 环境指标名称 + */ + private String indicatorsName; } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java index fc142740..278c0173 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexRespVO.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; @Schema(description = "管理后台 - 模型管理-环境指标 Response VO") @Data @@ -65,4 +65,25 @@ public class ModelEnvironmentIndexRespVO { @ExcelProperty("租户id") private String tenantId; + /** + * 设备分类名称 + */ + private String deviceClassName; + /** + * 指示范围 + */ + private String sampleValue; + /** + * 指示说明 + */ + private String indicatorDescription; + /** + * 单位 + */ + private String unit; + /** + * 环境指标名称 + */ + private String indicatorsName; + } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java index 37366b8b..94f78acc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelenvironmentindex/vo/ModelEnvironmentIndexSaveReqVO.java @@ -45,4 +45,25 @@ public class ModelEnvironmentIndexSaveReqVO { @Schema(description = "租户id", example = "20667") private String tenantId; + /** + * 设备分类名称 + */ + private String deviceClassName; + /** + * 指示范围 + */ + private String sampleValue; + /** + * 指示说明 + */ + private String indicatorDescription; + /** + * 单位 + */ + private String unit; + /** + * 环境指标名称 + */ + private String indicatorsName; + } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java index e9d95484..2369a705 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelenvironmentindex/ModelEnvironmentIndexDO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 模型管理-环境指标 DO @@ -72,4 +71,24 @@ public class ModelEnvironmentIndexDO extends BaseDO { private String plotName; private String tenantId; + /** + * 设备分类名称 + */ + private String deviceClassName; + /** + * 指示范围 + */ + private String sampleValue; + /** + * 指示说明 + */ + private String indicatorDescription; + /** + * 单位 + */ + private String unit; + /** + * 环境指标名称 + */ + private String indicatorsName; } \ No newline at end of file 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 89205f31..d0e9ac2e 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 @@ -1,27 +1,24 @@ package cn.iocoder.yudao.module.farm.service.modelenvironmentindex; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexPageReqVO; -import cn.iocoder.yudao.module.farm.controller.admin.modelenvironmentindex.vo.ModelEnvironmentIndexSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; 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.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.modelenvironmentindex.ModelEnvironmentIndexMapper; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_ENVIRONMENT_INDEX_NOT_EXISTS; @@ -36,6 +33,10 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe @Resource private ModelEnvironmentIndexMapper modelEnvironmentIndexMapper; + @Resource + private EnvironmentIndexConfigMapper environmentIndexConfigMapper; + @Resource + private DeviceClassifyMapper deviceClassifyMapper; @Override public String createModelEnvironmentIndex(ModelEnvironmentIndexSaveReqVO createReqVO) { @@ -44,6 +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()); + DeviceClassifyDO deviceClassifyDO = deviceClassifyMapper.selectById(modelEnvironmentIndex.getDeviceClass()); + modelEnvironmentIndex.setDeviceClassName(deviceClassifyDO.getName()); modelEnvironmentIndexMapper.insert(modelEnvironmentIndex); // 返回 @@ -68,12 +74,12 @@ public class ModelEnvironmentIndexServiceImpl implements ModelEnvironmentIndexSe } @Override - public void deleteModelEnvironmentIndexListByIds(List ids) { + public void deleteModelEnvironmentIndexListByIds(List ids) { // 删除 modelEnvironmentIndexMapper.deleteByIds(ids); - } + } -private void validateModelEnvironmentIndexExists(String id) { + private void validateModelEnvironmentIndexExists(String id) { if (modelEnvironmentIndexMapper.selectById(id) == null) { throw exception(MODEL_ENVIRONMENT_INDEX_NOT_EXISTS); }