From 701ba57d239e9f73e9cd41a06169c35e7f5b2885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Thu, 21 Aug 2025 15:42:48 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E7=81=BE=E5=AE=B3=E5=BA=93?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/dict/vo/FarmingTypeReqVO.java | 20 --------------- .../admin/dict/vo/FarmingTypeSaveVO.java | 20 --------------- .../admin/dict/vo/InvestGoodsRespVO.java | 25 ------------------- .../disasterdata/vo/DisasterDataRespVO.java | 3 +++ .../disasterdata/DisasterDataDO.java | 1 + .../module/farm/enums/CommonConstants.java | 4 +++ .../disasterdata/DisasterDataServiceImpl.java | 18 +++++++++++++ 7 files changed, 26 insertions(+), 65 deletions(-) delete mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeReqVO.java delete mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeSaveVO.java delete mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/InvestGoodsRespVO.java diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeReqVO.java deleted file mode 100644 index 4bdeb215..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.dict.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @description: - * @author: binda - * @date: 2025/8/17 13:45 - */ -@Data -public class FarmingTypeReqVO { - - @Schema(description = "使用状态 （0=启用，1=停用）") - private Integer useStatus; - - @Schema(description = "农事类型-名称") - private String farmingName; - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeSaveVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeSaveVO.java deleted file mode 100644 index bfaccdbf..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeSaveVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.dict.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * @description: 农事类型维护 - 新增 - * @author: binda - * @date: 2025/8/17 13:52 - */ -@Data -public class FarmingTypeSaveVO { - - @Schema(description = "农事类型-名称") - private String farmingName; - - @Schema(description = "使用状态 （0=启用，1=停用）") - private Integer useStatus; - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/InvestGoodsRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/InvestGoodsRespVO.java deleted file mode 100644 index 5dc4d8b7..00000000 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/InvestGoodsRespVO.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.iocoder.yudao.module.farm.controller.admin.dict.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @description: 投入品类型 - * @author: binda - * @date: 2025/8/17 17:20 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class InvestGoodsRespVO { - - @Schema(description = "投入品-编码") - private String code; - @Schema(description = "投入品-名称") - private String name; - @Schema(description = "使用状态") - private Integer useStatus; - -} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java index e9833ddf..4d486371 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataRespVO.java @@ -24,6 +24,9 @@ public class DisasterDataRespVO { @ExcelProperty("灾害类型2=病害，1=虫害，3=草害") private String category; + @Schema(description = "灾害类型-名称") + private String categoryName; + @Schema(description = "灾害类型 1：普通； 2：气象灾害") private Integer type; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java index b174af9d..8603b08e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/disasterdata/DisasterDataDO.java @@ -36,6 +36,7 @@ public class DisasterDataDO extends BaseDO { * 灾害类型 2=病害，1=虫害，3=草害 */ private String category; + private String categoryName; /** * 灾害类别 1：普通； 2：气象灾害 */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java index 193da8c8..092a24e0 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/enums/CommonConstants.java @@ -24,4 +24,8 @@ public class CommonConstants { public final static Integer MODEL_TYPE_1 = 1; public final static Integer MODEL_TYPE_2 = 1; + + public final static String DICT_TYPE_CODE_1 = "common_disaster"; + + } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java index 20a5fe3e..bf75352c 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataServiceImpl.java @@ -1,8 +1,12 @@ package cn.iocoder.yudao.module.farm.service.disasterdata; import cn.hutool.core.util.IdUtil; +import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo.DisasterDataSaveReqVO; +import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO; +import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictMapper; +import cn.iocoder.yudao.module.farm.enums.CommonConstants; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -15,6 +19,8 @@ import cn.iocoder.yudao.module.farm.dal.mysql.disasterdata.DisasterDataMapper; import cn.iocoder.yudao.module.farm.framework.util.ImageCollectionUtil; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; @@ -31,6 +37,9 @@ public class DisasterDataServiceImpl implements DisasterDataService { @Resource private DisasterDataMapper disasterDataMapper; + @Resource + private SysDictMapper sysDictMapper; + @Override public String createDisasterData(DisasterDataSaveReqVO createReqVO) { @@ -97,6 +106,14 @@ public class DisasterDataServiceImpl implements DisasterDataService { @Override public PageResult getDisasterDataPage(DisasterDataPageReqVO reqVO) { + List dictList = sysDictMapper.getByTypeCode(CommonConstants.DICT_TYPE_CODE_1); + Map dictMap = dictList.stream() + .collect(Collectors.toMap( + SysDictDO::getField1Code, // key: field1Code + SysDictDO::getField1Name, // value: field1Name + (existing, replacement) -> existing // 处理重复key，保留现有值 + )); + Integer pageNo = reqVO.getPageNo(); Integer pageSize = reqVO.getPageSize(); @@ -109,6 +126,7 @@ public class DisasterDataServiceImpl implements DisasterDataService { if (item != null) { // 触发图片集合转换 item.getImageList(); + item.setCategoryName(dictMap.get(item.getCategory())); } }); }