From da3214959c6e4278337bf36e8adea08835111dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com> Date: Wed, 27 Aug 2025 00:17:09 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modelmanagement/vo/ModelManagementPageReqVO.java | 2 +- .../modelmanagement/vo/ModelManagementSaveReqVO.java | 2 +- .../modelmanagement/ModelManagementDO.java | 12 ++++-------- .../modelmanagement/ModelManagementServiceImpl.java | 6 +++--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java index f884f42e..6565feef 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java @@ -24,7 +24,7 @@ public class ModelManagementPageReqVO extends PageParam { @Schema(description = "生命周期") private String cycle; - + private String cycleName; @Schema(description = "产量参考") private String harvest; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java index f6d8f499..a0d0af6e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java @@ -29,7 +29,7 @@ public class ModelManagementSaveReqVO { @Schema(description = "生命周期") private String cycle; - + private String cycleName; @Schema(description = "产量参考") private String harvest; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java index 95fec25c..16d61a60 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java @@ -1,18 +1,14 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement; 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.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.iocoder.yudao.module.farm.framework.util.AreaCodeUtil; +import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; import java.util.Date; import java.util.List; -import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; -import cn.iocoder.yudao.module.farm.framework.util.AreaCodeUtil; /** * 模型管理 DO @@ -100,7 +96,7 @@ public class ModelManagementDO extends BaseDO { * 物种图片（数据库存储为逗号分隔的字符串） */ private String speciesImage; - + private String cycleName; /** * 物种图片集合（业务层使用） */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java index 0210d49b..3234e1ae 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java @@ -92,10 +92,11 @@ public class ModelManagementServiceImpl implements ModelManagementService { SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(createReqVO.getSpeciesId()); modelManagement.setSpeciesName(speciesLibrary.getSpeciesName() + "/" + speciesLibrary.getCultivarName()); + modelManagement.setCycle(speciesLibrary.getLifeCycle().toString()); if (speciesLibrary.getLifeCycle() == 1) { - modelManagement.setCycle("一年生"); + modelManagement.setCycleName("一年生"); } else if (speciesLibrary.getLifeCycle() == 10) { - modelManagement.setCycle("多年生"); + modelManagement.setCycleName("多年生"); } modelManagement.setSpeciesImage(speciesLibrary.getImage()); // 处理suitablePlantingAreas字段，优先使用集合 @@ -282,7 +283,6 @@ public class ModelManagementServiceImpl implements ModelManagementService { // 使用统一的转换方法 ModelManagementRespVO bean = ModelManagementConvertUtil.convertToRespVO(modelManagementDO); - bean.setCycleName(LIFE_CYCLE_MAP.get(bean.getCycle())); // 设置模型周期信息 List vos = new ArrayList<>();