From c374b1fc541b31e7c4fdcf819acdb7b8434ed02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Mon, 15 Sep 2025 11:09:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=BE=AE=E6=9C=8D=E5=8A=A1API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 绕过token配置 --- .../farm/controller/admin/api/ApiController.java | 12 +++++++++--- .../mysql/productionplan/ProductionPlanMapper.java | 2 +- .../farm/service/baseinfo/BaseInfoServiceImpl.java | 4 ++-- .../productionplan/ProductionPlanService.java | 2 +- .../productionplan/ProductionPlanServiceImpl.java | 4 ++-- .../mapper/disasterdata/DisasterDataMapper.xml | 12 +++++++----- yudao-server/src/main/resources/application.yaml | 1 + 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/ApiController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/ApiController.java index 17cc981a..0224de63 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/ApiController.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/ApiController.java @@ -26,7 +26,6 @@ import java.util.List; @RestController @RequestMapping("/farm/remote") @Validated -@PermitAll public class ApiController { private final ProductionPlanService productionPlanService; @@ -45,6 +44,7 @@ public class ApiController { * @param req 根据租户id、开始时间、结束时间 ,已完成状态 * @return 种植计划id、种植计划名称 */ + @PermitAll @PostMapping("/production-plan/page") @Operation(summary = "生产计划-分页") public CommonResult> getPageForFarmProductionPlan(@Valid @RequestBody FarmProductionPlanReqVO req) { @@ -59,12 +59,14 @@ public class ApiController { * @param req 根据租户id、种植计划id * @return 种植计划id、种植计划名称、种植开始时间、种植结束时间、计划所属的基地图片、基地简介、基地中心坐标点 */ + @PermitAll @PostMapping("/production-plan/get") @Operation(summary = "生产计划-详情") public CommonResult getDetailForFarmProductionPlan(@Valid @RequestBody FarmProductionPlanDetailReqVO req) { return productionPlanService.getDetailForFarmProductionPlan(req); } + @PermitAll @PostMapping("/digital-cockpit/get") @Operation(summary = "数字驾驶舱-基地概要信息") public CommonResult getBaseOverview(@Valid @RequestBody FarmBaseOverviewReqVO req) { @@ -72,31 +74,35 @@ public class ApiController { } // TODO: 2025/9/4 地图展示信息 - 设备坐标 - + @PermitAll @PostMapping("/digital-cockpit/list") @Operation(summary = "数字驾驶舱-基地信息列表") public CommonResult> getBaseInfoList(@Valid @RequestBody FarmBaseInfoReqVO req) { return baseInfoService.getBaseInfoList(req); } + @PermitAll @PostMapping("/digital-cockpit/chart/yield-comparison") @Operation(summary = "数字驾驶舱-生产数据-产量对比") public CommonResult> getYieldComparisonChart(@Valid @RequestBody YieldComparisonChartReqVO req) { return productionPlanService.getYieldComparisonChart(req); } + @PermitAll @PostMapping("/digital-cockpit/chart/planting-plan-completion") @Operation(summary = "数字驾驶舱-生产数据-种植计划完成情况") - public CommonResult> getPlantingPlanCompletionChart(@Valid @RequestBody PlantingPlanCompletionReqVO req) { + public CommonResult getPlantingPlanCompletionChart(@Valid @RequestBody PlantingPlanCompletionReqVO req) { return productionPlanService.getPlantingPlanCompletionChart(req); } + @PermitAll @PostMapping("/digital-cockpit/chart/disaster-statistics") @Operation(summary = "数字驾驶舱-灾害统计-灾害分析") public CommonResult> getDisasterStatisticsChart(@Valid @RequestBody DisasterAnalysisReqVO req) { return productionPlanService.getDisasterStatisticsChart(req); // TODO: 2025/9/4 未实现 } + @PermitAll @PostMapping("/digital-cockpit/chart/farming-distribution") @Operation(summary = "数字驾驶舱-灾害统计-农事分布") public CommonResult> getFarmingDistributionChart(@Valid @RequestBody FarmingDistributionReqVO req) { diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java index 4d091c98..fce89e6e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/dal/mysql/productionplan/ProductionPlanMapper.java @@ -82,5 +82,5 @@ public interface ProductionPlanMapper extends BaseMapperX { List getYieldComparisonChart(YieldComparisonChartReqVO req); - List getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); + PlantingPlanCompletionRespVO getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); } \ No newline at end of file diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java index 43babac4..a7df657a 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/baseinfo/BaseInfoServiceImpl.java @@ -171,8 +171,8 @@ public class BaseInfoServiceImpl implements BaseInfoService { public List getBaseInfosById(String id) { LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); String tenantId = String.valueOf(getLoginUser().getTenantId()); - wrapperX.eq(BaseInfoDO::getTenantId, tenantId); - wrapperX.eq(BaseInfoDO::getDeleted, CommonConstants.NO_CODE); + wrapperX.eqIfPresent(BaseInfoDO::getTenantId, tenantId); + wrapperX.eqIfPresent(BaseInfoDO::getDeleted, CommonConstants.NO_CODE); wrapperX.eqIfPresent(BaseInfoDO::getId, id); return baseInfoMapper.selectList(wrapperX); } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java index ca9b0703..9fba8af9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanService.java @@ -193,7 +193,7 @@ public interface ProductionPlanService { * @param req * @return */ - CommonResult> getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); + CommonResult getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req); /** * api 接口 diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java index 939fa715..a3fed8dc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/productionplan/ProductionPlanServiceImpl.java @@ -398,8 +398,8 @@ public class ProductionPlanServiceImpl implements ProductionPlanService { } @Override - public CommonResult> getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req) { - List res = productionPlanMapper.getPlantingPlanCompletionChart(req); + public CommonResult getPlantingPlanCompletionChart(PlantingPlanCompletionReqVO req) { + PlantingPlanCompletionRespVO res = productionPlanMapper.getPlantingPlanCompletionChart(req); return CommonResult.success(res); } diff --git a/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml b/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml index 7c13aff5..994c1e06 100644 --- a/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/disasterdata/DisasterDataMapper.xml @@ -86,14 +86,16 @@ - SELECT FROM farm_disaster_data - WHERE deleted = 0 AND id = #{id} - + + deleted = 0 + + AND id = #{id} + + diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 3ada4957..17133f8f 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -288,6 +288,7 @@ yudao: - /admin-api/system/user/profile/** - /admin-api/system/auth/** - /admin-api/app/traceability-code/scan + - /admin-api/farm/remote/** ignore-tables: - region - farm_mqtt_connection