From 8bba62b5ffe99f2ed2b9f3495a5cf0e075ef9d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Thu, 11 Sep 2025 16:54:47 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E6=A8=A1=E5=9E=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 模型周期 图片展示 --- .../farm/controller/admin/home/vo/HomeInfo.java | 4 ++-- .../admin/modelcycle/vo/ModelCycleRespVO.java | 1 + .../admin/modelcycle/vo/ModelCycleSaveReqVO.java | 3 +++ .../modelmanagement/vo/ModelManagementRespVO.java | 2 ++ .../dal/dataobject/modelcycle/ModelCycleDO.java | 14 ++++++++++++-- .../module/farm/service/home/HomeServiceImpl.java | 5 +++-- .../service/modelcycle/ModelCycleServiceImpl.java | 6 ++++++ .../ModelManagementServiceImpl.java | 1 + 8 files changed, 30 insertions(+), 6 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java index efbd7b79..39cabb40 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java @@ -78,9 +78,9 @@ public class HomeInfo { @Schema(description = "基地数量") private Integer baseCount; - @Schema(description = "总面积") - private Integer cropCount; @Schema(description = "在种作物数量") + private Integer cropCount; + @Schema(description = "总面积") private Integer totalArea; @Schema(description = "在职员工人数") private Integer personnelCount; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java index 7bec3e74..9f8fec05 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleRespVO.java @@ -42,6 +42,7 @@ public class ModelCycleRespVO { @Schema(description = "阶段图片") @ExcelProperty("阶段图片") private String stageImage; + private List stageImageList; @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java index 642e2e27..77e83676 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelcycle/vo/ModelCycleSaveReqVO.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.List; + @Schema(description = "管理后台 - 模型管理-管理周期新增/修改 Request VO") @Data public class ModelCycleSaveReqVO { @@ -24,6 +26,7 @@ public class ModelCycleSaveReqVO { @Schema(description = "阶段图片") private String stageImage; + private List stageImageList; @Schema(description = "基地id", example = "3265") private String baseId; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java index ef6ba8f3..97797c00 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/modelmanagement/vo/ModelManagementRespVO.java @@ -79,7 +79,9 @@ public class ModelManagementRespVO { private String tenantName; private String userName; + @Schema(description = "发布状态") private int isRelease; + @Schema(description = "引用次数") private int quoteCount; @Schema(description = "物种图片") private String speciesImage; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java index d171aaa1..3736c0cf 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelcycle/ModelCycleDO.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle; +import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; import lombok.*; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalDateTime; +import java.util.List; + import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @@ -56,6 +57,8 @@ public class ModelCycleDO extends BaseDO { * 阶段图片 */ private String stageImage; + @TableField(exist = false) + private List stageImageList; /** * 基地id */ @@ -74,4 +77,11 @@ public class ModelCycleDO extends BaseDO { private String plotName; private String tenantId; + + public List getImageList() { + if (stageImageList == null) { + stageImageList = ImageCollectionUtil.toImageList(this.stageImage); + } + return stageImageList; + } } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java index b825ba09..c3e3870e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java @@ -265,8 +265,9 @@ public class HomeServiceImpl implements HomeService { private BaseOverviewInfo getCompanyInfo() { LoginUser user = getLoginUser(); int baseCount = baseInfoService.getBaseCount(user.getTenantId()); // 基地数量 - int cropCount = cropFarmingCenterService.getCropCount(user.getTenantId()); // 作物数量 - Double temp = cropFarmingCenterService.getTotalArea(user.getTenantId()); // 总面积 + int cropCount = cropFarmingCenterService.getCropCount(user.getTenantId()); // 作物数mong量 +// Double temp = cropFarmingCenterService.getTotalArea(user.getTenantId()); // 总面积 + Double temp = baseInfoService.getBaseTotalArea(user.getTenantId().toString()); // 总面积 int totalArea = 0; if (!ObjectUtils.isEmpty(temp)) { totalArea = (int) Math.round(temp); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java index ce86df80..f8a55ebe 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelcycle/ModelCycleServiceImpl.java @@ -44,6 +44,9 @@ public class ModelCycleServiceImpl implements ModelCycleService { ModelCycleDO modelCycle = BeanUtils.toBean(createReqVO, ModelCycleDO.class); modelCycle.setId(IdUtil.fastUUID()); modelCycle.setTenantId(String.valueOf(user.getTenantId())); + for (String image : createReqVO.getStageImageList()) { + modelCycle.setStageImage(image); + } modelCycleMapper.insert(modelCycle); // 返回 return modelCycle.getId(); @@ -54,6 +57,9 @@ public class ModelCycleServiceImpl implements ModelCycleService { // 校验存在 validateModelCycleExists(updateReqVO.getId()); // 更新 + for (String image : updateReqVO.getStageImageList()) { + updateReqVO.setStageImage(image); + } ModelCycleDO updateObj = BeanUtils.toBean(updateReqVO, ModelCycleDO.class); modelCycleMapper.updateById(updateObj); } 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 e5874bcd..9906f132 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 @@ -299,6 +299,7 @@ public class ModelManagementServiceImpl implements ModelManagementService { List list = modelCycleMapper.selectListByModelId(id); list.forEach(cycle -> { ModelCycleRespVO vo = BeanUtils.toBean(cycle, ModelCycleRespVO.class); + vo.setStageImageList(cycle.getStageImageList()); //环境指标 List environmentIndexDO = modelEnvironmentIndexMapper.selectByCycleId(cycle.getId()); vo.setEnvironmentIndexDOS(environmentIndexDO);