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-12 19:22:46 +08:00
parent fd7d610331
commit 8b00a68117
12 changed files with 107 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/ApiController.java
View File

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +26,7 @@ import java.util.List;
@RestController
@RequestMapping("/farm/remote")
@Validated
@PermitAll
public class ApiController {
private final ProductionPlanService productionPlanService;

2
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java
View File

@@ -153,7 +153,7 @@ public class HomeInfo {
private Double growArea;
@Schema(description = "在种作物数量")
private Integer beingCrop;
@Schema(description = "农事任务数量")
@Schema(description = "生产计划任务数量")
private Integer taskCount;
@Schema(description = "物联设备数量")
private Integer lotCount;

3
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/framework/util/ModelManagementConvertUtil.java
View File

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.framework.util;
import cn.iocoder.yudao.module.farm.controller.admin.modelmanagement.vo.ModelManagementRespVO;
import cn.iocoder.yudao.module.farm.dal.dataobject.modelmanagement.ModelManagementDO;
import org.apache.commons.lang3.StringUtils;
import java.util.List;
@@ -30,7 +31,7 @@ public class ModelManagementConvertUtil {
respVO.setId(modelManagementDO.getId());
respVO.setModelName(modelManagementDO.getModelName());
respVO.setSpeciesId(modelManagementDO.getSpeciesId());
respVO.setSpeciesName(modelManagementDO.getSpeciesName());
respVO.setSpeciesName(StringUtils.substringAfterLast(modelManagementDO.getSpeciesName(), "/"));
respVO.setCycle(modelManagementDO.getCycle());
respVO.setCycleName(LIFE_CYCLE_MAP.get(modelManagementDO.getCycle()));
respVO.setHarvest(modelManagementDO.getHarvest());

66
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/cropFarmingCenter/CropFarmingCenterServiceImpl.java
View File

@@ -361,41 +361,43 @@ public class CropFarmingCenterServiceImpl implements CropFarmingCenterService {
public ProductionPlanResp2VO.ModelInfo getModelManagement(ProductionPlanDO planObj, Map<String, String> employeeNameMap) {
BaseInfoDO baseObj = baseInfoMapper.selectOne("id", planObj.getBaseId());
if (baseObj != null) {
String employeeId = baseObj.getManager();
ModelManagementDO modelManagementDo = modelManagementService.getModelManagement("id", planObj.getSpeciesModelId());
String managementCycleName = modelManagementService.getModelCycleName(planObj.getSpeciesModelId());
// 农事记录进度
int progressNumerator = 1; // 生产计划 - 农事记录 条数
int progressDenominator = 1; // 农事记录总数 (引用模型 - 农事记录)
String progressRatio = ""; // 百分比
String progressBar = "1/100"; // 进度条
ProductionPlanResp2VO.ModelInfo modelInfo = new ProductionPlanResp2VO.ModelInfo();
modelInfo.setId(modelManagementDo.getId());
modelInfo.setModelName(modelManagementDo.getModelName());
modelInfo.setSpeciesImage(modelManagementDo.getSpeciesImageList());
modelInfo.setPlantSpeciesName(modelManagementDo.getSpeciesName());
modelInfo.setPlanNumber(planObj.getPlanNumber());
modelInfo.setPlanStatus(planObj.getPlanStatus());
modelInfo.setPlanSubStatus(ObjectUtils.defaultIfNull(planObj.getPlanSubStatus(), planObj.getPlanStatus()));
modelInfo.setPlanStatusName(PLAN_MAP.getOrDefault(planObj.getPlanStatus(), ""));
modelInfo.setPlanSubStatusName(PLAN_MAP.getOrDefault(planObj.getPlanSubStatus(), ""));
modelInfo.setManagementCycleName(managementCycleName);
modelInfo.setPredictedArea(planObj.getPredictedArea().intValue());
modelInfo.setPredictedYields(planObj.getPredictedYields());
modelInfo.setProgressBar(progressBar);
modelInfo.setProgressRatio(progressRatio);
modelInfo.setProgressNumerator(progressNumerator);
modelInfo.setProgressDenominator(progressDenominator);
modelInfo.setBaseName(planObj.getBaseName());
modelInfo.setBaseManager(employeeNameMap.get(employeeId)); // 分割,
return modelInfo;
} else {
if (baseObj == null) {
return null;
}
String employeeId = baseObj.getManager();
ModelManagementDO modelManagementDo = modelManagementService.getModelManagement("id", planObj.getSpeciesModelId());
String managementCycleName = modelManagementService.getModelCycleName(planObj.getSpeciesModelId());
// 农事记录进度
// 任务进度 - 分子 (添加到: 种植中心-农事记录里的记录数)
int progressNumerator = farmingRecordService.getFarmRecordCount(planObj.getId());
// 任务进度 - 分母 (引用模型中的所有模型周期的农事记录总和)
int progressDenominator = modelManagementService.getFarmRecordCount(planObj.getSpeciesModelId());
String progressBar = progressNumerator + "/" + progressDenominator; // 进度条
String progressRatio = (int) Math.round((double) progressNumerator / progressDenominator * 100) + "%";
ProductionPlanResp2VO.ModelInfo modelInfo = new ProductionPlanResp2VO.ModelInfo();
modelInfo.setId(modelManagementDo.getId());
modelInfo.setModelName(modelManagementDo.getModelName());
modelInfo.setSpeciesImage(modelManagementDo.getSpeciesImageList());
modelInfo.setPlantSpeciesName(modelManagementDo.getSpeciesName());
modelInfo.setPlanNumber(planObj.getPlanNumber());
modelInfo.setPlanStatus(planObj.getPlanStatus());
modelInfo.setPlanSubStatus(ObjectUtils.defaultIfNull(planObj.getPlanSubStatus(), planObj.getPlanStatus()));
modelInfo.setPlanStatusName(PLAN_MAP.getOrDefault(planObj.getPlanStatus(), ""));
modelInfo.setPlanSubStatusName(PLAN_MAP.getOrDefault(planObj.getPlanSubStatus(), ""));
modelInfo.setManagementCycleName(managementCycleName);
modelInfo.setPredictedArea(planObj.getPredictedArea().intValue());
modelInfo.setPredictedYields(planObj.getPredictedYields());
modelInfo.setProgressBar(progressBar);
modelInfo.setProgressRatio(progressRatio);
modelInfo.setProgressNumerator(progressNumerator);
modelInfo.setProgressDenominator(progressDenominator);
modelInfo.setBaseName(planObj.getBaseName());
modelInfo.setBaseManager(employeeNameMap.get(employeeId)); // 分割,
return modelInfo;
}
private int countIntervalDays(ProductionPlanDO aDo) {

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordService.java
View File

@@ -75,4 +75,11 @@ public interface FarmingRecordService {
void createFarmingRecordList(List<FarmingRecordSaveReqVO> farmingRecordSaveReqVOList);
int getFarmRecordOverview(String baseId);
/**
* 获取农事记录数量
* @param planId
* @return
*/
int getFarmRecordCount(String planId);
}

8
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/farmingrecord/FarmingRecordServiceImpl.java
View File

@@ -246,4 +246,12 @@ public class FarmingRecordServiceImpl implements FarmingRecordService {
return count.intValue();
}
@Override
public int getFarmRecordCount(String planId) {
LambdaQueryWrapperX<FarmingRecordDO> x = new LambdaQueryWrapperX<>();
x.eq(FarmingRecordDO::getProductionPlanId, planId);
Long count = farmingRecordMapper.selectCount(x);
return count.intValue();
}
}

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

@@ -14,7 +14,6 @@ import java.util.Map;
*/
public interface HomeService {
List<HomeInfo> getHomeInfoList(String baseId);
/**
* 首页综合信息
@@ -23,14 +22,6 @@ public interface HomeService {
*/
HomeInfo getHomeInfo(String baseId);
/**
* 首页概要信息
* @param baseId 基地ID
* @return
*/
OutlinedInfoVO getOutlinedInfo(String baseId);
List<BaseNameVO> getBaseNameList();
Map<String, Object> getCompanyBaseFarming();
}

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

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.security.core.LoginUser;
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.HomeInfo.*;
import cn.iocoder.yudao.module.farm.controller.admin.home.vo.OutlinedInfoVO;
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.dataobject.productionplan.ProductionPlanDO;
@@ -12,6 +11,7 @@ import cn.iocoder.yudao.module.farm.dal.dataobject.specieslibrary.SpeciesLibrary
import cn.iocoder.yudao.module.farm.service.baseinfo.BaseInfoService;
import cn.iocoder.yudao.module.farm.service.cropFarmingCenter.CropFarmingCenterService;
import cn.iocoder.yudao.module.farm.service.deviceplotrelation.DevicePlotRelationService;
import cn.iocoder.yudao.module.farm.service.farmingrecord.FarmingRecordService;
import cn.iocoder.yudao.module.farm.service.modelmanagement.ModelManagementService;
import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagementService;
import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService;
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -48,8 +47,9 @@ public class HomeServiceImpl implements HomeService {
private final PersonnelManagementService personnelManagementService;
private final ModelManagementService modelManagementService;
private final SpeciesLibraryService speciesLibraryService;
private final FarmingRecordService farmingRecordService;
public HomeServiceImpl(BaseInfoService baseInfoService, PlotInfoService plotInfoService, ProductionPlanService productionPlanService, DevicePlotRelationService driverPropertyInfoService, CropFarmingCenterService cropFarmingCenterService, PersonnelManagementService personnelManagementService, ModelManagementService modelManagementService, SpeciesLibraryService speciesLibraryService) {
public HomeServiceImpl(BaseInfoService baseInfoService, PlotInfoService plotInfoService, ProductionPlanService productionPlanService, DevicePlotRelationService driverPropertyInfoService, CropFarmingCenterService cropFarmingCenterService, PersonnelManagementService personnelManagementService, ModelManagementService modelManagementService, SpeciesLibraryService speciesLibraryService, FarmingRecordService farmingRecordService) {
this.baseInfoService = baseInfoService;
this.plotInfoService = plotInfoService;
this.productionPlanService = productionPlanService;
@@ -58,6 +58,7 @@ public class HomeServiceImpl implements HomeService {
this.personnelManagementService = personnelManagementService;
this.modelManagementService = modelManagementService;
this.speciesLibraryService = speciesLibraryService;
this.farmingRecordService = farmingRecordService;
}
@Override
@@ -123,7 +124,7 @@ public class HomeServiceImpl implements HomeService {
res.setBaseArea(BigDecimalUtil.roundedViaMath(baseObj.getArea()));
res.setManager(employeeName);
res.setPoint(baseObj.getPoint());
res.setPointName(""); // TODO: 2025/8/31 需要前端传入,才能获取
res.setPointName(""); // TODO: 2025/8/31 需要前端传入,才能获取 行政区划
res.setBeingPlot(plotRatio);
res.setBeingCrop(growingCropCount);
return res;
@@ -171,8 +172,11 @@ public class HomeServiceImpl implements HomeService {
if (ObjectUtils.isEmpty(predictedArea)) {
predictedArea = 0.00;
}
String growFlag = ObjectUtils.isEmpty(predictedArea) ? GROW_FLAG_2 : GROW_FLAG_1;
String growFlag = predictedArea == 0.0 ? GROW_FLAG_2 : GROW_FLAG_1;
// 在种作物数量
int growingCropCount = productionPlanService.getGrowingCropCount(e.getBaseId(), e.getPlotId());
// 生产计划数量
int taskCount = productionPlanService.getPlanCount(e.getPlotId());
PlotOrCropInfo t = new PlotOrCropInfo();
t.setLabel(label);
@@ -183,7 +187,7 @@ public class HomeServiceImpl implements HomeService {
t.setGrowFlag(growFlag);
t.setGrowArea(predictedArea);
t.setBeingCrop(growingCropCount);
t.setTaskCount(0); // TODO: 2025/8/31 农事任务数量
t.setTaskCount(taskCount);
t.setLotCount(0); // TODO: 2025/8/31 物联设备数量
t.setManager(employeeName);
t.setQrCodeUrl(""); // TODO: 2025/8/31 暂无
@@ -204,6 +208,12 @@ public class HomeServiceImpl implements HomeService {
String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), null);
// 模型管理-管理周期名称
String cycleName = modelManagementService.getModelCycleName(e.getSpeciesModelId());
// 任务进度 - 分子 (添加到: 种植中心-农事记录里的记录数)
int progressBarNumerator = farmingRecordService.getFarmRecordCount(e.getId());
// 任务进度 - 分母 (引用模型中的所有模型周期的农事记录总和)
int progressBarDenominator = modelManagementService.getFarmRecordCount(e.getSpeciesModelId());
// 任务进度
String progressBar = progressBarNumerator +"/"+progressBarDenominator;
PlanInfo target = new PlanInfo();
target.setBaseId(e.getBaseId());
@@ -214,9 +224,9 @@ public class HomeServiceImpl implements HomeService {
target.setPlantSpeciesName(beingCropName);
target.setPlanNumber(e.getPlanNumber());
target.setCycleName(cycleName);
target.setProgressBar("1/10"); // TODO: 2025/9/1
target.setProgressBarNumerator(1); // TODO: 2025/9/1
target.setProgressBarDenominator(10); // TODO: 2025/9/1
target.setProgressBar(progressBar);
target.setProgressBarNumerator(progressBarNumerator);
target.setProgressBarDenominator(progressBarDenominator);
target.setPredictedArea(Double.valueOf(beingPlotArea));
target.setPredictedYields(e.getPredictedYields());
target.setPlanStatus(e.getPlanStatus());
@@ -231,37 +241,12 @@ public class HomeServiceImpl implements HomeService {
return targetList;
}
@Override
public OutlinedInfoVO getOutlinedInfo(String baseId) {
OutlinedInfoVO res = new OutlinedInfoVO();
res.setTaskCount(0); // todo 任务数量
res.setWarningCount(0); // todo 告警数量
res.setIotCount(0); // todo 物联设备
return res;
}
@Override
public List<BaseNameVO> getBaseNameList() {
List<BaseInfoDO> baseNameList = baseInfoService.getBaseInfos();
return baseNameList.stream().map(e -> new BaseNameVO(e.getId(), e.getName())).collect(Collectors.toList());
}
@Override
public Map<String, Object> getCompanyBaseFarming() {
LoginUser user = getLoginUser();
int baseCount = baseInfoService.getBaseCount(user.getTenantId()); // 基地数量
int cropCount = cropFarmingCenterService.getCropCount(user.getTenantId()); // 作物数量
Double totalArea = cropFarmingCenterService.getTotalArea(user.getTenantId()); // 总面积
int personnelCount = personnelManagementService.personnelCount(user.getTenantId()); // 在职人员
Map<String, Object> map = new HashMap<>();
map.put("baseCount", baseCount);
map.put("cropCount", cropCount);
map.put("totalArea", totalArea);
map.put("personnelCount", personnelCount);
return map;
}
private BaseOverviewInfo getCompanyInfo() {
LoginUser user = getLoginUser();
int baseCount = baseInfoService.getBaseCount(user.getTenantId()); // 基地数量

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementService.java
View File

@@ -97,4 +97,11 @@ public interface ModelManagementService {
* @return
*/
List<ModelManagementForPlanRespVO> getModelManagementForPlan(String speciesId);
/**
* 通过引用模型ID 获取所有管理周期下的农事记录总和
* @param speciesModelId
* @return
*/
int getFarmRecordCount(String speciesModelId);
}

14
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/modelmanagement/ModelManagementServiceImpl.java
View File

@@ -587,6 +587,20 @@ public class ModelManagementServiceImpl implements ModelManagementService {
}
@Override
public int getFarmRecordCount(String speciesModelId) {
LambdaQueryWrapperX<ModelCycleDO> wrapperX = new LambdaQueryWrapperX<>();
wrapperX.eq(ModelCycleDO::getModelId, speciesModelId);
wrapperX.eq(ModelCycleDO::getTenantId, getLoginUser().getTenantId());
List<ModelCycleDO> cycleDOS = modelCycleMapper.selectList(wrapperX);
long count = 0;
for (ModelCycleDO cycleDO : cycleDOS) {
Long operationCount = modelFarmingOperationMapper.selectCount("cycle_id", cycleDO.getId());
count += operationCount;
}
return (int) count;
}
private List<ModelCycleDO> getModelCycleListByModelId(String modelId) {
LambdaQueryWrapperX<ModelCycleDO> wrapperXx = new LambdaQueryWrapperX<>();
wrapperXx.eq(ModelCycleDO::getModelId, modelId);

7
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java
View File

@@ -210,4 +210,11 @@ public interface ProductionPlanService {
* @return
*/
CommonResult<List<FarmingDistributionRespVO>> getFarmingDistributionChart(FarmingDistributionReqVO req);
/**
* 使用地块ID 获取该地块的计划数量
* @param plotId
* @return 获取该地块的计划数量
*/
int getPlanCount(String plotId);
}

6
yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java
View File

@@ -412,4 +412,10 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
public CommonResult<List<FarmingDistributionRespVO>> getFarmingDistributionChart(FarmingDistributionReqVO req) {
return null;
}
@Override
public int getPlanCount(String plotId) {
List<ProductionPlanDO> planDOList = productionPlanMapper.selectList("plot_id", plotId);
return planDOList.size();
}
}