boor/wanmao-map-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat (farm): 投入品

Browse Source 
- 新增接口
This commit is contained in:
达富斌
2025-08-26 21:35:56 +08:00
parent 12b4a1b101
commit a6df5262db
4 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
View File

@@ -340,6 +340,13 @@ public class DictController {
return success(res);
}
@GetMapping("/list/invest-goods")
@Operation(summary = "字典数据维护-下拉框列表-投入品")
public CommonResult<List<InputLibraryRespVO>> getInvestGoodsList() {
List<InputLibraryRespVO> res = sysDictService.getInvestGoodsList();
return success(res);
}
@Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询")
@GetMapping("/list/{dictTypeCode}")
public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) {
@@ -354,22 +361,6 @@ public class DictController {
return success(BeanUtils.toBean(res, SysDictTypeCodeRespVO.class));
}
@Operation(summary = "字典数据维护-下拉框列表-投入品类型")
@GetMapping("/list/invest-goods")
public CommonResult<List<CommonDictRespVO>> getInvestGoodsList() {
// todo 后续维护到字典表
List<CommonDictRespVO> list = Arrays.asList(
new CommonDictRespVO("1", "肥料", 1),
new CommonDictRespVO("2", "药物", 1),
new CommonDictRespVO("3", "种子", 1),
new CommonDictRespVO("4", "膜", 1),
new CommonDictRespVO("99", "其他", 1)
);
return success(list);
}
@Operation(summary = "字典数据维护-下拉框列表-投入品规格-单位1")
@GetMapping("/list/units/1")
public CommonResult<List<CommonDictRespVO>> getUnits1List() {

6
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/inputlibrary/vo/InputLibraryRespVO.java
View File

@@ -21,7 +21,11 @@ public class InputLibraryRespVO {
@ExcelProperty("投入品类型")
private String assetType;
@Schema(description = "投入品名称", example = "王五")
@Schema(description = "投入品名称-编号")
@ExcelProperty("投入品名称")
private String assetCode;
@Schema(description = "投入品名称-中文名")
@ExcelProperty("投入品名称")
private String assetName;

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictService.java
View File

@@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.F
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO;
@@ -37,6 +38,8 @@ public interface SysDictService {
SysDictDO getDictByFieldCode(SysDictReqVO reqVO);
List<InputLibraryRespVO> getInvestGoodsList();
/**
* 农事类型
*/

23
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/sysDict/SysDictServiceImpl.java
View File

@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.farm.service.sysDict;
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.SpeciesClassifyLibraryRespVO;
import cn.iocoder.yudao.module.farm.controller.admin.dict.vo.sys.SysDictPageReqVO;
@@ -10,9 +11,12 @@ import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.F
import cn.iocoder.yudao.module.farm.controller.admin.farmingnamemaintenance.vo.FarmingNameMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenancePageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.farmingtypemaintenance.vo.FarmingTypeMaintenanceSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.inputlibrary.vo.InputLibraryRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingnamemaintenance.FarmingNameMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.farmingtypemaintenance.FarmingTypeMaintenanceDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.inputlibrary.InputLibraryDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
import cn.iocoder.yudao.module.farm.dal.mysql.inputlibrary.InputLibraryMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.modelmanagement.ModelManagementMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictDO;
import cn.iocoder.yudao.module.farm.dal.mysql.sysDict.SysDictMapper;
@@ -44,10 +48,12 @@ public class SysDictServiceImpl implements SysDictService {
private final SysDictMapper sysDictMapper;
private final ModelManagementMapper modelManagementMapper;
private final InputLibraryMapper inputLibraryMapper;
public SysDictServiceImpl(SysDictMapper sysDictMapper, ModelManagementMapper modelManagementMapper) {
public SysDictServiceImpl(SysDictMapper sysDictMapper, ModelManagementMapper modelManagementMapper, InputLibraryMapper inputLibraryMapper) {
this.sysDictMapper = sysDictMapper;
this.modelManagementMapper = modelManagementMapper;
this.inputLibraryMapper = inputLibraryMapper;
}
@Override
@@ -215,6 +221,21 @@ public class SysDictServiceImpl implements SysDictService {
return null;
}
@Override
public List<InputLibraryRespVO> getInvestGoodsList() {
List<SysDictDO> dictDOList= sysDictMapper.getByTypeCode(CommonConstants.DICT_TYPE_CODE_4);
Map<String, String> dictMap = dictDOList.stream().filter(e -> e.getField2Code() != null).collect(Collectors.toMap(SysDictDO::getField2Name, SysDictDO::getField2Code, (v1, v2) -> v1));
List<InputLibraryDO> inputLibraryDOS = inputLibraryMapper.selectList();
List<InputLibraryRespVO> res = BeanUtils.toBean(inputLibraryDOS, InputLibraryRespVO.class);
for (InputLibraryRespVO e : res) {
e.setAssetCode(dictMap.get(e.getAssetName()));
}
return res;
}
@Override
public PageResult<FarmingTypeMaintenanceDO> getFarmingTypeMaintenancePage(FarmingTypeMaintenancePageReqVO reqVO) {