From 2d5ae4222b1f14adebfaa9cdca7d43c735dec62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Sun, 24 Aug 2025 22:23:24 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E7=89=A9=E7=A7=8D=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 物种库 三级拼接规则 --- .../admin/dict/vo/sys/SysDictReqVO.java | 1 + .../dict/vo/sys/SysDictThreeLvRespVO.java | 22 +++++++++++++ .../farm/dal/mysql/sysDict/SysDictMapper.java | 1 + .../farm/service/sysDict/SysDictService.java | 3 ++ .../service/sysDict/SysDictServiceImpl.java | 16 +++++++++ .../main/resources/mapper/SysDictMapper.xml | 33 +++++++++++++++++-- 6 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictThreeLvRespVO.java diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictReqVO.java index 13b6d67e..9c555922 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictReqVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictReqVO.java @@ -18,6 +18,7 @@ public class SysDictReqVO { private String dictTypeCode; private String field1Code; private String field2Code; + private String field3Code; private Integer deleted; public SysDictReqVO(String dictTypeCode, String field1Code,Integer deleted) { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictThreeLvRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictThreeLvRespVO.java new file mode 100644 index 00000000..66750a03 --- /dev/null +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/vo/sys/SysDictThreeLvRespVO.java @@ -0,0 +1,22 @@ +package cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 物种 三级合并发挥 + * code：10/1010/101011 + * name：粮食/红薯丝滑 + * @author: binda + * @date: 2025/8/24 22:14 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class SysDictThreeLvRespVO { + + private String codes; + private String names; + +} 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 48e43151..f69f2e2c 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,6 +16,7 @@ import java.util.List; public interface SysDictMapper { SysDictDO selectDictByMaxField2Code(SysDictReqVO reqVO); + SysDictDO getDictByField3Code(SysDictReqVO reqVO); SysDictDO selectDictByOne(SysDictReqVO reqVO); 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 dd15cfdd..4fb946d1 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.SysDictThreeLvRespVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenancePageReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO; import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; @@ -31,6 +32,8 @@ public interface SysDictService { List getSpeciesClassifyAndModelList(); + SysDictThreeLvRespVO getDictByField3Code(String field3Code); + /** * 农事类型 */ 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 f6a9d929..69594191 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 @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; 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; import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO; @@ -20,6 +21,7 @@ import cn.iocoder.yudao.module.farm.utils.StrHelperUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; +import java.text.MessageFormat; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -194,6 +196,20 @@ public class SysDictServiceImpl implements SysDictService { return rootList; } + @Override + public SysDictThreeLvRespVO getDictByField3Code(String field3Code) { + + SysDictReqVO query = new SysDictReqVO(); + query.setDictTypeCode(CommonConstants.DICT_TYPE_CODE_3); + query.setField3Code(field3Code); + SysDictDO obj = sysDictMapper.getDictByField3Code(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()); + return new SysDictThreeLvRespVO(codes,names); + + } + @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 8d7eac18..5b54acdd 100644 --- a/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/SysDictMapper.xml @@ -27,12 +27,41 @@ update_time - + SELECT id,field1_code, field1_name, field2_name, field3_code FROM farm_sys_dict - WHERE dict_type_code = #{dictTypeCode} AND field2_code = #{field2Name} + WHERE dict_type_code = #{dictTypeCode} AND field2_code = #{field2Code} ORDER BY field3_code DESC LIMIT 1 + + + +