From 2527154f64d603a8c834651e8b3365263ea61d73 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, 3 Sep 2025 11:26:08 +0800 Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ModelManagementRespVO.java | 13 +++++-------- .../personnelmanagement/SystemUserMapper.java | 2 ++ .../ModelManagementServiceImpl.java | 18 ++++++++---------- .../personnelmanagement/SystemUserMapper.xml | 5 +++++ 4 files changed, 20 insertions(+), 18 deletions(-) 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 d462e37d..ef6ba8f3 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 @@ -3,17 +3,11 @@ package cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; -import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; +import java.util.*; @Schema(description = "管理后台 - 模型管理 Response VO") @Data @@ -82,6 +76,9 @@ public class ModelManagementRespVO { @Schema(description = "租户id", example = "20468") @ExcelProperty("租户id") private String tenantId; + private String tenantName; + + private String userName; private int isRelease; private int quoteCount; @Schema(description = "物种图片") @@ -108,7 +105,7 @@ public class ModelManagementRespVO { result.add(areaObj); } this.suitablePlantingAreas = result; - + // 同时设置Excel导出用的字符串格式 - 使用分号分隔，避免与地区代码内部的逗号冲突 this.suitablePlantingAreasForExcel = String.join(";", areas); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java index 69078027..6b8e797a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/personnelmanagement/SystemUserMapper.java @@ -7,4 +7,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemUserMapper extends BaseMapperX { SystemUserDO selectByPhone(String phone); + + String getTenantNameById(String tenantId); } 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 437044e8..280b0519 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 @@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.Mo import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelpestdiseaseweed.ModelPestDiseaseWeedDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelweatherdisaster.ModelWeatherDisasterDO; +import cn.iocoder.yudao.module.farm.dal.dataobject.personnelmanagement.SystemUserDO; import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelcycle.ModelCycleMapper; import cn.iocoder.yudao.module.farm.dal.mysql.modelenvironmentindex.ModelEnvironmentIndexMapper; @@ -26,13 +27,13 @@ import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFa import cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement.ModelManagementMapper; import cn.iocoder.yudao.module.farm.dal.mysql.modelpestdiseaseweed.ModelPestDiseaseWeedMapper; import cn.iocoder.yudao.module.farm.dal.mysql.modelweatherdisaster.ModelWeatherDisasterMapper; +import cn.iocoder.yudao.module.farm.dal.mysql.personnelmanagement.SystemUserMapper; import cn.iocoder.yudao.module.farm.enums.CommonConstants; import cn.iocoder.yudao.module.farm.framework.util.ModelManagementConvertUtil; import cn.iocoder.yudao.module.farm.service.inputlibrary.InputLibraryService; import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -69,8 +70,10 @@ public class ModelManagementServiceImpl implements ModelManagementService { private ModelFarmingOperationInputMapper modelFarmingOperationInputMapper; @Resource private SpeciesLibraryService speciesLibraryService; - @Autowired + @Resource private InputLibraryService inputLibraryService; + @Resource + private SystemUserMapper systemUserMapper; @Override public String createModelManagement(ModelManagementSaveReqVO createReqVO) { @@ -265,6 +268,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { } // 使用统一的转换方法 ModelManagementRespVO bean = ModelManagementConvertUtil.convertToRespVO(modelManagementDO); + SystemUserDO userDO = systemUserMapper.selectById(modelManagementDO.getCreator()); + bean.setUserName(userDO.getNickname()); + bean.setTenantName(systemUserMapper.getTenantNameById(modelManagementDO.getTenantId())); // 设置模型周期信息 List vos = new ArrayList<>(); List list = modelCycleMapper.selectListByModelId(id); @@ -275,17 +281,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { vo.setEnvironmentIndexDOS(environmentIndexDO); //气象灾害 List weatherDisasterDO = modelWeatherDisasterMapper.selectByCycleId(cycle.getId()); - for (ModelWeatherDisasterDO aDo : weatherDisasterDO) { - aDo.setDisasterDescription(aDo.getDisasterDescription()); - aDo.setTreatmentSuggestion(aDo.getTreatmentSuggestion()); - } vo.setWeatherDisasterDOS(weatherDisasterDO); //病虫草灾害 List pestDiseaseWeedDO = modelPestDiseaseWeedMapper.selectByCycleId(cycle.getId()); - for (ModelPestDiseaseWeedDO aDo : pestDiseaseWeedDO) { - aDo.setDisasterDescription(aDo.getDisasterDescription()); - aDo.setTreatmentSuggestion(aDo.getTreatmentSuggestion()); - } vo.setPestDiseaseWeedDOS(pestDiseaseWeedDO); //农事操作 List farmingOperationDO = modelFarmingOperationMapper.selectByCycleId(cycle.getId()); diff --git a/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml index 5e2597c7..3680f28a 100644 --- a/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/personnelmanagement/SystemUserMapper.xml @@ -15,4 +15,9 @@ from system_users where mobile = #{phone} + \ No newline at end of file