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-09 21:36:46 +08:00
parent f706ec5f9d
commit 5f5312e25a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,9 +201,10 @@ public class HomeServiceImpl implements HomeService {
String beingCropName = productionPlanService.getPlantSpeciesCodeForName(e.getPlantSpeciesCode()); String beingCropName = productionPlanService.getPlantSpeciesCodeForName(e.getPlantSpeciesCode());
String cycleName = modelManagementService.getModelCycleName(e.getSpeciesModelId()); String cycleName = modelManagementService.getModelCycleName(e.getSpeciesModelId());
String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), null); String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), null);
// SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(e.getPlantSpeciesCode()); SpeciesLibraryDO speciesLibrary = speciesLibraryService.getSpeciesLibrary(e.getPlantSpeciesCode());
// List<String> planModelImage = speciesLibrary.getImageList(); if (ObjectUtils.isEmpty(speciesLibrary)) {
List<String> planModelImage = new ArrayList<>(); continue;
}
PlanInfo target = new PlanInfo(); PlanInfo target = new PlanInfo();
target.setBaseId(e.getBaseId()); target.setBaseId(e.getBaseId());
@@ -225,7 +226,7 @@ public class HomeServiceImpl implements HomeService {
target.setPlanSubStatusName(PLAN_MAP.getOrDefault(e.getPlanSubStatus(), "逾期未开始")); target.setPlanSubStatusName(PLAN_MAP.getOrDefault(e.getPlanSubStatus(), "逾期未开始"));
String pointsInPolygon = LeafletjsUtil.generateRandomPointsInPolygon(plotObj.getPoint()); String pointsInPolygon = LeafletjsUtil.generateRandomPointsInPolygon(plotObj.getPoint());
target.setPlanModelPoint(pointsInPolygon); target.setPlanModelPoint(pointsInPolygon);
target.setPlanModelImage(planModelImage); target.setPlanModelImage(speciesLibrary.getImageList());
targetList.add(target); targetList.add(target);
} }
return targetList; return targetList;