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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
顾君禹
2025-08-22 14:17:55 +08:00
parent 31e2c98c3a 15e502ed7e
commit cb4259a17d
4 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/BaseInfoController.java
View File

@@ -100,8 +100,8 @@ public class BaseInfoController {
@GetMapping("/get/baser-name-list")
@Operation(summary = "获得基地名称-下拉列表")
public CommonResult<List<BaseNameRespVO>> getBaseNameList() {
List<BaseInfoDO> res = baseInfoService.getBaseNameList();
return success(BeanUtils.toBean(res,BaseNameRespVO.class));
List<BaseNameRespVO> res = baseInfoService.getBaseNameList();
return success(res);
}
}

20
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/baseinfo/vo/BaseNameRespVO.java
View File

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @description: TODO
* @author: binda
@@ -20,4 +22,22 @@ public class BaseNameRespVO {
@Schema(description = "基地名称", example = "张三")
private String name;
private List<PlotInfoVO> children;
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class PlotInfoVO {
@Schema(description = "地块ID", example = "4027")
private String plotId;
@Schema(description = "地块名称", example = "王五")
private String plotName;
}
public BaseNameRespVO(String id, String name) {
this.id = id;
this.name = name;
}
}

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoService.java
View File

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.farm.service.baseinfo;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNameRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
import jakarta.validation.Valid;
@@ -66,5 +67,5 @@ public interface BaseInfoService {
* 基地名称-下拉列表
* @return
*/
List<BaseInfoDO> getBaseNameList();
List<BaseNameRespVO> getBaseNameList();
}

36
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java
View File

@@ -6,13 +6,19 @@ 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.baseinfo.vo.BaseInfoPageReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseInfoSaveReqVO;
import cn.iocoder.yudao.module.farm.controller.admin.baseinfo.vo.BaseNameRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.baseinfo.BaseInfoDO;
import cn.iocoder.yudao.module.farm.dal.dataobject.plotinfo.PlotInfoDO;
import cn.iocoder.yudao.module.farm.dal.mysql.baseinfo.BaseInfoMapper;
import cn.iocoder.yudao.module.farm.dal.mysql.plotinfo.PlotInfoMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
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;
@@ -29,6 +35,8 @@ public class BaseInfoServiceImpl implements BaseInfoService {
@Resource
private BaseInfoMapper baseInfoMapper;
@Resource
private PlotInfoMapper plotInfoMapper;
@Override
public String createBaseInfo(BaseInfoSaveReqVO createReqVO) {
@@ -66,7 +74,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
baseInfoMapper.deleteByIds(ids);
}
private void validateBaseInfoExists(String id) {
private void validateBaseInfoExists(String id) {
if (baseInfoMapper.selectById(id) == null) {
throw exception(BASE_INFO_NOT_EXISTS);
}
@@ -88,9 +96,31 @@ private void validateBaseInfoExists(String id) {
}
@Override
public List<BaseInfoDO> getBaseNameList() {
public List<BaseNameRespVO> getBaseNameList() {
return baseInfoMapper.selectList();
List<BaseNameRespVO> res = new ArrayList<>();
// 地块
List<PlotInfoDO> plotInfoDOS = plotInfoMapper.selectList();
// 基地
List<BaseInfoDO> baseInfoDOS = baseInfoMapper.selectList();
Map<String, String> baseNameMap = baseInfoDOS.stream().collect(Collectors.toMap(BaseInfoDO::getId, BaseInfoDO::getName, (v1, v2) -> v1));
for (Map.Entry<String, String> entry : baseNameMap.entrySet()) {
String key = entry.getKey();
BaseNameRespVO obj = new BaseNameRespVO(key, entry.getValue());
List<BaseNameRespVO.PlotInfoVO> childList = new ArrayList<>();
for (PlotInfoDO aDo : plotInfoDOS) {
if (aDo.getBaseId().equals(key)) {
childList.add(new BaseNameRespVO.PlotInfoVO(aDo.getPlotId(), aDo.getPlotName()));
}
}
obj.setChildren(childList);
res.add(obj);
}
return BeanUtils.toBean(res, BaseNameRespVO.class);
}