diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java index fee8534..137aa77 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/planrate/PlanRateDetailController.java @@ -80,6 +80,19 @@ public class PlanRateDetailController { return success(BeanUtils.toBean(detailList, PlanRateDetailRespVO.class)); } + @GetMapping("/get-rate-value") + @Operation(summary = "获得计划频次明细") + @Parameter(name = "busi_Line", description = "业务线", required = true, example = "1024") + @Parameter(name = "plan_type_id", description = "计划类型ID", required = true, example = "如浇水:101") + @Parameter(name = "level_id", description = "道路等级", required = true, example = "如10:特级") + @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')") + public CommonResult getPlanRateValue(@RequestParam("busi_Line") @NotBlank String busiLine, + @RequestParam("plan_type_id") @NotNull Integer planTypeId, + @RequestParam("level_id") @NotNull Integer levelId) { + PlanRateDetailDO detail = planRateDetailService.getPlanRateValue(busiLine, planTypeId, levelId ); + return success(BeanUtils.toBean(detail, PlanRateDetailRespVO.class)); + } + @GetMapping("/page") @Operation(summary = "获得计划频次明细分页") @PreAuthorize("@ss.hasPermission('garden:plan-rate-detail:query')") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java index cca92de..b24465f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java @@ -91,7 +91,7 @@ public class RoadController { @PostMapping("/list") @Operation(summary = "获得道路列表") @PreAuthorize("@ss.hasPermission('garden:road:query')") - public CommonResult> getRoadList(@Valid RoadListReqVO reqVO) { + public CommonResult> getRoadList(@Valid @RequestBody RoadListReqVO reqVO) { List roadList = roadService.getRoadList(reqVO); return success(BeanUtils.toBean(roadList, RoadListRespVO.class)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java index 34eec00..a6c1517 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java @@ -71,6 +71,7 @@ public interface ErrorCodeConstants { //========== 频次 TODO 补充编号 ========== ErrorCode PLAN_RATE_EXISTS = new ErrorCode(1-200-200-001, "养护频次已存在"); ErrorCode PLAN_RATE_LEVEL_ID_DUPLICATE = new ErrorCode(1-200-200-002, "养护等级重复"); + ErrorCode PLAN_RATE_NOT_EXISTS = new ErrorCode(1-200-200-002, "未配置计划频次"); ErrorCode MATERIAL_TYPE_NOT_EXISTS = new ErrorCode(1-100-004-001, "物料类型不存在"); ErrorCode MATERIAL_TYPE_MANAGER_NOT_EXISTS = new ErrorCode(1-100-004-002, "耗材类别管理不存在"); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java index 304848b..2ccee3d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailService.java @@ -5,7 +5,6 @@ import jakarta.validation.*; import com.zteits.urbanops.module.garden.controller.admin.planrate.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.planrate.PlanRateDetailDO; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; /** * 计划频次明细 Service 接口 @@ -67,4 +66,13 @@ public interface PlanRateDetailService { */ List getPlanRateDetailByRateNo(String rateNo); + /** + * 获取养护频次值对象 + * @param busiLine 业务线 + * @param planTypeId 计划类型 + * @param levelId 道路等级 + * @return 对象 + */ + PlanRateDetailDO getPlanRateValue(String busiLine,Integer planTypeId,Integer levelId); + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java index e2cd5eb..4459abb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/planrate/PlanRateDetailServiceImpl.java @@ -13,6 +13,9 @@ import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.dal.mysql.planrate.PlanRateDetailMapper; +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.PLAN_RATE_NOT_EXISTS; + /** * 计划频次明细 Service 实现类 * @@ -82,4 +85,15 @@ public class PlanRateDetailServiceImpl implements PlanRateDetailService { return planRateDetailMapper.selectList(sql); } + @Override + public PlanRateDetailDO getPlanRateValue(String busiLine, Integer planTypeId, Integer levelId) { + QueryWrapper sql = new QueryWrapper<>(); + sql.lambda().eq(PlanRateDetailDO::getBusiLine, busiLine).eq(PlanRateDetailDO::getPlanTypeId, planTypeId).eq(PlanRateDetailDO::getLevelId, levelId); + PlanRateDetailDO planRateDetailDO = planRateDetailMapper.selectOne(sql); + if (planRateDetailDO == null) { + throw exception(PLAN_RATE_NOT_EXISTS); + } + return planRateDetailDO; + } + } \ No newline at end of file