diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java new file mode 100644 index 00000000..108710d7 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/disasterdata/vo/DisasterDataReqVO.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.module.farm.controller.admin.disasterdata.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @description: + * @author: binda + * @date: 2025/8/25 23:32 + */ +@Schema(description = "管理后台 - 灾害数据") +@Data +public class DisasterDataReqVO { + @Schema(description = "灾害名称", example = "赵六") + private String name; + + @Schema(description = "灾害类型2=病害，1=虫害，3=草害") + private String category; + + @Schema(description = "灾害类型 1：普通； 2：气象灾害") + private Integer type; + + @Schema(description = "使用状态 （1：启用；0：停用）") + private Integer useStatus; + + @Schema(description = "删除状态 （1：已删除；0：未删除）") + private Integer deleted; +} diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java index 9070dc55..68613c5b 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelfarmingoperationinput/ModelFarmingOperationInputDO.java @@ -36,6 +36,7 @@ public class ModelFarmingOperationInputDO extends BaseDO { * 投入品id */ private String inputsId; + private String inputsName; /** * 用量 */ @@ -44,6 +45,12 @@ public class ModelFarmingOperationInputDO extends BaseDO { * 单位 */ private String unit; + private String unitName; + /** + * 单件 + */ + private String packageUnit; + private String packageUnitName; /** * 稀释倍液 */ @@ -74,5 +81,4 @@ public class ModelFarmingOperationInputDO extends BaseDO { private String assetType; - private String packageUnit; } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java index bd2cc08d..67a0b56a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelpestdiseaseweed/ModelPestDiseaseWeedDO.java @@ -47,6 +47,14 @@ public class ModelPestDiseaseWeedDO extends BaseDO { * 预警摘要说明 */ private String description; + /** + * 灾害描述 + */ + private String disasterDescription; + /** + * 防止建议 + */ + private String treatmentSuggestion; /** * 基地id */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java index 8ecd7aee..11af2514 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/modelweatherdisaster/ModelWeatherDisasterDO.java @@ -43,6 +43,14 @@ public class ModelWeatherDisasterDO extends BaseDO { * 预警摘要说明 */ private String description; + /** + * 灾害描述 + */ + private String disasterDescription; + /** + * 防止建议 + */ + private String treatmentSuggestion; /** * 气象灾害图片 */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java index 6ade953d..6ff6187d 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/disasterdata/DisasterDataMapper.java @@ -31,4 +31,5 @@ public interface DisasterDataMapper { void insert(DisasterDataDO disasterData); DisasterDataDO selectOne(DisasterDataReqVO reqVO); + List selectMore(DisasterDataReqVO reqVO); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/sysDict/SysDictMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/sysDict/SysDictMapper.java index 408cb137..cd120bdd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/sysDict/SysDictMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/sysDict/SysDictMapper.java @@ -16,7 +16,7 @@ import java.util.List; public interface SysDictMapper { SysDictDO selectDictByMaxField2Code(SysDictReqVO reqVO); - SysDictDO getDictByField3Code(SysDictReqVO reqVO); + SysDictDO getDictByFieldCode(SysDictReqVO reqVO); SysDictDO selectDictByOne(SysDictReqVO reqVO); 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 f2ce4523..e34f9b7f 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 @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.farm.enums; +import io.swagger.v3.oas.models.security.SecurityScheme; + import java.util.HashMap; import java.util.Map; @@ -49,7 +51,7 @@ public class CommonConstants { public final static String DICT_TYPE_CODE_6 = "farming_name"; // 农事名称 public final static String DICT_TYPE_CODE_7 = "drug_type"; // 药物类型 - public final static String COMMON_DISASTER = "1"; // 一般灾害 - public final static String WEATHER_DISASTER = "2"; // 气象灾害 + public final static Integer COMMON_DISASTER = 1; // 一般灾害 + public final static Integer WEATHER_DISASTER = 2; // 气象灾害 } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java index 44b7eebe..c6be1dec 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/disasterdata/DisasterDataService.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.farm.service.disasterdata; +import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO; 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.dataobject.disasterdata.DisasterDataDO; @@ -52,6 +53,7 @@ public interface DisasterDataService { * @return 灾害数据 */ DisasterDataDO getDisasterData(String id); + List getDisasterDataList(DisasterDataReqVO reqVO); /** * 获得灾害数据分页 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 591ea828..69993a8f 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 @@ -147,7 +147,7 @@ public class DisasterDataServiceImpl implements DisasterDataService { SysDictReqVO query = new SysDictReqVO(); query.setDictTypeCode(DICT_TYPE_CODE_1); query.setField2Name(name); - SysDictDO aDo = sysDictMapper.getDictByField3Code(query); + SysDictDO aDo = sysDictMapper.getDictByFieldCode(query); // 一般灾害 父类编号 String category = obj.getCategory(); @@ -163,7 +163,7 @@ public class DisasterDataServiceImpl implements DisasterDataService { SysDictReqVO query = new SysDictReqVO(); query.setDictTypeCode(DICT_TYPE_CODE_2); query.setField1Name(name); - SysDictDO aDo = sysDictMapper.getDictByField3Code(query); + SysDictDO aDo = sysDictMapper.getDictByFieldCode(query); SysDictDO updateObj = new SysDictDO(); updateObj.setId(aDo.getId()); @@ -226,6 +226,11 @@ public class DisasterDataServiceImpl implements DisasterDataService { return data; } + @Override + public List getDisasterDataList(DisasterDataReqVO reqVO) { + return disasterDataMapper.selectMore(reqVO); + } + @Override public PageResult getDisasterDataPage(DisasterDataPageReqVO reqVO) { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java index 592472dc..ffabf046 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelfarmingoperation/ModelFarmingOperationServiceImpl.java @@ -11,11 +11,16 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFa import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperationinput.ModelFarmingOperationInputDO; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperation.ModelFarmingOperationMapper; import cn.iocoder.yudao.module.farm.dal.mysql.modelfarmingoperationinput.ModelFarmingOperationInputMapper; +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.sysDict.SysDictService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; 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; @@ -30,6 +35,8 @@ import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_FARMIN @Validated public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationService { + @Resource + private SysDictService sysDictService; @Resource private ModelFarmingOperationMapper modelFarmingOperationMapper; @Resource @@ -89,8 +96,23 @@ public class ModelFarmingOperationServiceImpl implements ModelFarmingOperationSe @Override public ModelFarmingOperationRespVO getModelFarmingOperation(String id) { + List dictDOList= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4); + Map dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Code, SysDictDO::getField2Name, (v1, v2) -> v1)); + + List unit1List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_1); // 吨 + Map unit1Map = unit1List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + List unit2List= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4_2); // 包 + Map unit2Map = unit2List.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField1Code, SysDictDO::getField1Name, (v1, v2) -> v1)); + + ModelFarmingOperationRespVO bean = BeanUtils.toBean(modelFarmingOperationMapper.selectById(id), ModelFarmingOperationRespVO.class); List farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(id); + for (ModelFarmingOperationInputDO aDo : farmingOperationInputDOS) { + aDo.setInputsName(dictMap.get(aDo.getInputsId())); + aDo.setUnitName(unit1Map.get(aDo.getUnit())); + aDo.setPackageUnitName(unit2Map.get(aDo.getPackageUnit())); + } bean.setFarmingOperationInputDOS(farmingOperationInputDOS); return bean; } 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 a8eb97be..e5b5a05d 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 @@ -4,11 +4,13 @@ import cn.hutool.core.util.IdUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.security.core.LoginUser; +import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.DisasterDataReqVO; import cn.iocoder.yudao.module.farm.controller.admin.modelcycle.vo.ModelCycleRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelfarmingoperation.vo.ModelFarmingOperationRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementPageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO; import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementSaveReqVO; +import cn.iocoder.yudao.module.farm.dal.dataobject.disasterdata.DisasterDataDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelcycle.ModelCycleDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelenvironmentindex.ModelEnvironmentIndexDO; import cn.iocoder.yudao.module.farm.dal.dataobject.modelfarmingoperation.ModelFarmingOperationDO; @@ -23,7 +25,9 @@ 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.sysDict.SysDictDO; import cn.iocoder.yudao.module.farm.enums.CommonConstants; +import cn.iocoder.yudao.module.farm.service.disasterdata.DisasterDataService; import cn.iocoder.yudao.module.farm.service.sysDict.SysDictService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; @@ -33,9 +37,13 @@ import org.springframework.validation.annotation.Validated; import java.util.ArrayList; import java.util.Date; 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; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.COMMON_DISASTER; +import static cn.iocoder.yudao.module.farm.enums.CommonConstants.WEATHER_DISASTER; import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.MODEL_MANAGEMENT_NOT_EXISTS; /** @@ -62,7 +70,10 @@ public class ModelManagementServiceImpl implements ModelManagementService { @Resource private ModelFarmingOperationInputMapper modelFarmingOperationInputMapper; @Resource - private SysDictService dictService; + private SysDictService sysDictService; + @Resource + private DisasterDataService disasterDataService; + @Override public String createModelManagement(ModelManagementSaveReqVO createReqVO) { @@ -73,7 +84,7 @@ public class ModelManagementServiceImpl implements ModelManagementService { modelManagement.setTenantId(String.valueOf(user.getTenantId())); modelManagement.setIsRelease(0); modelManagement.setType(CommonConstants.MODEL_TYPE_1); - dictService.getDictByField3Code(createReqVO.getSpeciesId()); + sysDictService.getDictByField3Code(createReqVO.getSpeciesId()); // 处理suitablePlantingAreas字段，优先使用集合 if (createReqVO.getSuitablePlantingAreas() != null && !createReqVO.getSuitablePlantingAreas().isEmpty()) { modelManagement.setSuitablePlantingAreasList(createReqVO.getSuitablePlantingAreas()); @@ -215,6 +226,18 @@ public class ModelManagementServiceImpl implements ModelManagementService { @Override public ModelManagementRespVO getModelManagement(String id) { + List dictDOList= sysDictService.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4); + Map dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Code, SysDictDO::getField2Name, (v1, v2) -> v1)); + + DisasterDataReqVO reqVO = new DisasterDataReqVO(); + reqVO.setType(WEATHER_DISASTER); + List weatherDisasterDataList = disasterDataService.getDisasterDataList(reqVO); + Map weatherDisasterDataMap = weatherDisasterDataList.stream().collect(Collectors.toMap(DisasterDataDO::getName, e -> e, (v1, v2) -> v1)); + + reqVO.setType(COMMON_DISASTER); + List commonDisasterDataList = disasterDataService.getDisasterDataList(reqVO); + Map commonDisasterDataMap = commonDisasterDataList.stream().collect(Collectors.toMap(DisasterDataDO::getName, e -> e, (v1, v2) -> v1)); + ModelManagementDO modelManagementDO = modelManagementMapper.selectById(id); ModelManagementRespVO bean = BeanUtils.toBean(modelManagementDO, ModelManagementRespVO.class); @@ -230,9 +253,19 @@ public class ModelManagementServiceImpl implements ModelManagementService { vo.setEnvironmentIndexDOS(environmentIndexDO); //气象灾害 List weatherDisasterDO = modelWeatherDisasterMapper.selectByCycleId(cycle.getId()); + for (ModelWeatherDisasterDO aDo : weatherDisasterDO) { + DisasterDataDO temp = weatherDisasterDataMap.get(aDo.getName()); + aDo.setDisasterDescription(temp.getDisasterDescription()); + aDo.setTreatmentSuggestion(temp.getTreatmentSuggestion()); + } vo.setWeatherDisasterDOS(weatherDisasterDO); //病虫草灾害 List pestDiseaseWeedDO = modelPestDiseaseWeedMapper.selectByCycleId(cycle.getId()); + for (ModelPestDiseaseWeedDO aDo : pestDiseaseWeedDO) { + DisasterDataDO temp = commonDisasterDataMap.get(aDo.getName()); + aDo.setDisasterDescription(temp.getDisasterDescription()); + aDo.setTreatmentSuggestion(temp.getTreatmentSuggestion()); + } vo.setPestDiseaseWeedDOS(pestDiseaseWeedDO); //农事操作 List farmingOperationDO = modelFarmingOperationMapper.selectByCycleId(cycle.getId()); @@ -240,6 +273,9 @@ public class ModelManagementServiceImpl implements ModelManagementService { farmingOperationDO.forEach(e -> { ModelFarmingOperationRespVO respVO = BeanUtils.toBean(e, ModelFarmingOperationRespVO.class); List farmingOperationInputDOS = modelFarmingOperationInputMapper.selectByFarmingId(e.getId()); + for (ModelFarmingOperationInputDO aDo : farmingOperationInputDOS) { + aDo.setInputsName(dictMap.get(aDo.getInputsId())); + } respVO.setFarmingOperationInputDOS(farmingOperationInputDOS); respVOS.add(respVO); }); diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java index 4fb946d1..aa87e609 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.farm.service.sysDict; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.SpeciesClassifyLibraryRespVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictPageReqVO; +import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictReqVO; import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictThreeLvRespVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; @@ -34,6 +35,8 @@ public interface SysDictService { SysDictThreeLvRespVO getDictByField3Code(String field3Code); + SysDictDO getDictByFieldCode(SysDictReqVO reqVO); + /** * 农事类型 */ diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java index 69594191..51b11dcd 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java @@ -202,7 +202,7 @@ public class SysDictServiceImpl implements SysDictService { SysDictReqVO query = new SysDictReqVO(); query.setDictTypeCode(CommonConstants.DICT_TYPE_CODE_3); query.setField3Code(field3Code); - SysDictDO obj = sysDictMapper.getDictByField3Code(query); + SysDictDO obj = sysDictMapper.getDictByFieldCode(query); String codes = MessageFormat.format("{0}/{1}/{2}", obj.getField1Code(), obj.getField2Code(), obj.getField3Code()); String names = MessageFormat.format("{0}/{1}/{2}", obj.getField1Name(), obj.getField2Name(), obj.getField3Name()); @@ -210,6 +210,11 @@ public class SysDictServiceImpl implements SysDictService { } + @Override + public SysDictDO getDictByFieldCode(SysDictReqVO reqVO) { + return null; + } + @Override public PageResult getFarmingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO reqVO) { diff --git a/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml b/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml index 375be726..6305917f 100644 --- a/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml @@ -39,7 +39,7 @@ - + + \ No newline at end of file