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

fix (farm): 首页

Browse Source 
- 可查询全部基地
This commit is contained in:
达富斌
2025-09-08 20:11:42 +08:00
parent c0539a7379
commit 68d05b44e9
5 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/HomeController.java
View File

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.farm.controller.admin.home;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.BaseNameVO;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.HomeInfo;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.OutlinedInfoVO;
import cn.iocoder.yudao.module.farm.service.home.HomeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -13,7 +12,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -31,11 +29,18 @@ public class HomeController {
@Resource
private HomeService homeService;
// @Operation(summary = "农场首页")
// @GetMapping("")
// @Parameter(name = "baseId", description = "基地ID")
// public CommonResult<HomeInfo> getBaseInfo(@RequestParam("baseId") String baseId) {
// return success(homeService.getHomeInfo(baseId));
// }
@Operation(summary = "农场首页")
@GetMapping("")
@Parameter(name = "baseId", description = "基地ID")
public CommonResult<HomeInfo> getBaseInfo(@RequestParam("baseId") String baseId) {
return success(homeService.getHomeInfo(baseId));
public CommonResult<List<HomeInfo>> getBaseInfo(@RequestParam("baseId") String baseId) {
return success(homeService.getHomeInfoList(baseId));
}
@Operation(summary = "农场首页-基地名称列表")

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

@@ -56,6 +56,7 @@ public interface BaseInfoService {
*/
BaseInfoDO getBaseInfo(String id);
List<BaseInfoDO> getBaseInfos();
List<BaseInfoDO> getBaseInfosById(String id);
/**
* 获得基地分页
@@ -99,4 +100,6 @@ public interface BaseInfoService {
Integer getBaseTotalCount(String tenantId);
CommonResult<List<FarmBaseInfoRespVO>> getBaseInfoList(FarmBaseInfoReqVO req);
}

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

@@ -44,6 +44,7 @@ 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.ErrorCodeConstants.BASE_INFO_NOT_EXISTS;
import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.PLOT_AREA_EXISTS_ERRORS;
/**
* 基地 Service 实现类
@@ -107,10 +108,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
validateBaseInfoExists(id);
// 校验: 存在在种地块时 不允许删除
boolean flag = productionPlanService.validateIncompletePlansBId("base_id", id);
if (flag) {
boolean flag2 = plotInfoService.validatePlotExistByBaseId(id);
if (flag || flag2) {
// 删除
baseInfoMapper.deleteById(id);
plotInfoService.deleteByBaseId(id);
}else {
throw exception(PLOT_AREA_EXISTS_ERRORS);
}
}
@@ -137,6 +141,16 @@ public class BaseInfoServiceImpl implements BaseInfoService {
return baseInfoMapper.selectList("tenant_id", tenantId);
}
@Override
public List<BaseInfoDO> getBaseInfosById(String id) {
LambdaQueryWrapperX<BaseInfoDO> wrapperX = new LambdaQueryWrapperX<>();
String tenantId = String.valueOf(getLoginUser().getTenantId());
wrapperX.eq(BaseInfoDO::getTenantId, tenantId);
wrapperX.eq(BaseInfoDO::getDeleted, CommonConstants.NO_CODE);
wrapperX.eqIfPresent(BaseInfoDO::getId, id);
return baseInfoMapper.selectList(wrapperX);
}
@Override
public PageResult<BaseInfoDO> getBaseInfoPage(BaseInfoPageReqVO pageReqVO) {
return baseInfoMapper.selectPage(pageReqVO);

4
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeService.java
View File

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.farm.service.home;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.BaseNameVO;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.HomeInfo;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.HomeInfo2VO;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.OutlinedInfoVO;
import java.util.List;
@@ -14,6 +13,9 @@ import java.util.Map;
* @data: 2025/8/14 19:45
*/
public interface HomeService {
List<HomeInfo> getHomeInfoList(String baseId);
/**
* 首页综合信息
* @param baseId 基地ID

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java
View File

@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
import static cn.iocoder.yudao.module.farm.enums.CommonConstants.*;
@@ -54,6 +55,12 @@ public class HomeServiceImpl implements HomeService {
this.modelManagementService = modelManagementService;
}
@Override
public List<HomeInfo> getHomeInfoList(String baseId) {
List<BaseInfoDO> baseInfos = baseInfoService.getBaseInfosById(baseId);
return baseInfos.stream().map(e -> getHomeInfo(e.getId())).toList();
}
@Override
public HomeInfo getHomeInfo(String baseId) {
@@ -204,7 +211,6 @@ public class HomeServiceImpl implements HomeService {
return targetList;
}
@Override
public OutlinedInfoVO getOutlinedInfo(String baseId) {
OutlinedInfoVO res = new OutlinedInfoVO();