fix (farm): 灾害库分页返回类型名称

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeReqVO.java

@@ -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;
-
-}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/FarmingTypeSaveVO.java

@@ -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;
-
-}

yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/InvestGoodsRespVO.java

@@ -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;
-
-}

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;
 

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：气象灾害
      */

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";
+
+
 }

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<DisasterDataDO> getDisasterDataPage(DisasterDataPageReqVO reqVO) {
 
+        List<SysDictDO> dictList = sysDictMapper.getByTypeCode(CommonConstants.DICT_TYPE_CODE_1);
+        Map<String, String> 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()));
                 }
             });
         }