boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

farm模块-模型生命周期

Browse Source
This commit is contained in:
顾君禹
2025-08-27 00:17:09 +08:00
parent 092f9d1787
commit da3214959c
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementPageReqVO.java
View File

@@ -24,7 +24,7 @@ public class ModelManagementPageReqVO extends PageParam {
@Schema(description = "生命周期") @Schema(description = "生命周期")
private String cycle; private String cycle;
private String cycleName;
@Schema(description = "产量参考") @Schema(description = "产量参考")
private String harvest; private String harvest;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementSaveReqVO.java
View File

@@ -29,7 +29,7 @@ public class ModelManagementSaveReqVO {
@Schema(description = "生命周期") @Schema(description = "生命周期")
private String cycle; private String cycle;
private String cycleName;
@Schema(description = "产量参考") @Schema(description = "产量参考")
private String harvest; private String harvest;

12
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelmanagement/ModelManagementDO.java
View File

@@ -1,18 +1,14 @@
package cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement; package cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.IdType; import cn.iocoder.yudao.module.farm.framework.util.AreaCodeUtil;
import com.baomidou.mybatisplus.annotation.KeySequence; import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.*; import lombok.*;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil;
import cn.iocoder.yudao.module.farm.framework.util.AreaCodeUtil;
/** /**
* 模型管理 DO * 模型管理 DO
@@ -100,7 +96,7 @@ public class ModelManagementDO extends BaseDO {
* 物种图片（数据库存储为逗号分隔的字符串） * 物种图片（数据库存储为逗号分隔的字符串）
*/ */
private String speciesImage; private String speciesImage;
private String cycleName;
/** /**
* 物种图片集合（业务层使用） * 物种图片集合（业务层使用）
*/ */

6
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java
View File

@@ -92,10 +92,11 @@ public class ModelManagementServiceImpl implements ModelManagementService {
SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(createReqVO.getSpeciesId()); SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(createReqVO.getSpeciesId());
modelManagement.setSpeciesName(speciesLibrary.getSpeciesName() + "/" + speciesLibrary.getCultivarName()); modelManagement.setSpeciesName(speciesLibrary.getSpeciesName() + "/" + speciesLibrary.getCultivarName());
modelManagement.setCycle(speciesLibrary.getLifeCycle().toString());
if (speciesLibrary.getLifeCycle() == 1) { if (speciesLibrary.getLifeCycle() == 1) {
modelManagement.setCycle("一年生"); modelManagement.setCycleName("一年生");
} else if (speciesLibrary.getLifeCycle() == 10) { } else if (speciesLibrary.getLifeCycle() == 10) {
modelManagement.setCycle("多年生"); modelManagement.setCycleName("多年生");
} }
modelManagement.setSpeciesImage(speciesLibrary.getImage()); modelManagement.setSpeciesImage(speciesLibrary.getImage());
// 处理suitablePlantingAreas字段，优先使用集合 // 处理suitablePlantingAreas字段，优先使用集合
@@ -282,7 +283,6 @@ public class ModelManagementServiceImpl implements ModelManagementService {
// 使用统一的转换方法 // 使用统一的转换方法
ModelManagementRespVO bean = ModelManagementConvertUtil.convertToRespVO(modelManagementDO); ModelManagementRespVO bean = ModelManagementConvertUtil.convertToRespVO(modelManagementDO);
bean.setCycleName(LIFE_CYCLE_MAP.get(bean.getCycle()));
// 设置模型周期信息 // 设置模型周期信息
List<ModelCycleRespVO> vos = new ArrayList<>(); List<ModelCycleRespVO> vos = new ArrayList<>();