From cfb2587dc12c0e6aee04f323aba48f0420ab61bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A1=BE=E5=90=9B=E7=A6=B9?= <2673609096@qq.com>
Date: Sat, 23 Aug 2025 19:50:11 +0800
Subject: [PATCH] =?UTF-8?q?farm=E6=A8=A1=E5=9D=97-=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E6=A0=91=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/dict/DictController.java   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
index 5bec5aec..1c1ec9fe 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNamePlanRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNameRespVO;
-import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.*;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.CommonDictRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.FarmingTypeRespVO;
 import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibraryRespVO;
@@ -32,9 +31,9 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.Farmin
 import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
 import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibraryDO;
 import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO;
+import cn.iocoder.yudao.module.farm.enums.CommonConstants;
 import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
 import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService;
-import cn.iocoder.yudao.module.farm.service.farmingnamemaintenance.FarmingNameMaintenanceService;
 import cn.iocoder.yudao.module.farm.service.farmingtypemaintenance.FarmingTypeMaintenanceService;
 import cn.iocoder.yudao.module.farm.service.inputlibrary.InputLibraryService;
 import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService;
@@ -43,20 +42,15 @@ import cn.iocoder.yudao.module.farm.service.specieslibrary.SpeciesLibraryService
 import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService;
 import cn.iocoder.yudao.module.farm.utils.TreeStructureUtil;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import org.redisson.misc.Hash;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.*;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -85,8 +79,9 @@ public class DictController {
     private final SysDictService sysDictService;
     private final ProductionPlanService productionPlanService;
     private final BaseInfoService baseInfoService;
+    private final FarmingTypeMaintenanceService farmingTypeMaintenanceService;
 
-    public DictController(SpeciesLibraryService speciesLibraryService, SpeciesClassifyLibraryService speciesClassifyLibraryService, InputLibraryService inputLibraryService, DisasterDataService disasterDataService, SysDictService sysDictService, ProductionPlanService productionPlanService, BaseInfoService baseInfoService) {
+    public DictController(SpeciesLibraryService speciesLibraryService, SpeciesClassifyLibraryService speciesClassifyLibraryService, InputLibraryService inputLibraryService, DisasterDataService disasterDataService, SysDictService sysDictService, ProductionPlanService productionPlanService, BaseInfoService baseInfoService, FarmingTypeMaintenanceService farmingTypeMaintenanceService) {
         this.speciesLibraryService = speciesLibraryService;
         this.speciesClassifyLibraryService = speciesClassifyLibraryService;
         this.inputLibraryService = inputLibraryService;
@@ -94,6 +89,7 @@ public class DictController {
         this.sysDictService = sysDictService;
         this.productionPlanService = productionPlanService;
         this.baseInfoService = baseInfoService;
+        this.farmingTypeMaintenanceService = farmingTypeMaintenanceService;
     }
 
     // 农事类型
@@ -297,12 +293,11 @@ public class DictController {
             log.error("获取物种类别列表失败", e);
             return success(new ArrayList<>());
         }
-        return success(sysDictService.getSpeciesClassifyLibraryList());
     }
 
     @Operation(summary = "字典数据维护-下拉框列表-物种类别与模型")
     @GetMapping("/list/species-classify-model")
-    public CommonResult<List<SpeciesClassifyLibraryRespVO>> getSpeciesClassifyAndModelList(){
+    public CommonResult<List<SpeciesClassifyLibraryRespVO>> getSpeciesClassifyAndModelList() {
         return success(sysDictService.getSpeciesClassifyAndModelList());
     }