diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java similarity index 98% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java index d0194de..bfa875e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFactoryController.java @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/factory") -public class TdFactoryController extends BaseController { +public class TbFactoryController extends BaseController { private final ITbFactoryService tdFactoryService; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java index 5572482..73a4f70 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java @@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.sis.domain.bo.SisElevatorFloorRefBo; +import org.dromara.sis.domain.vo.SisElevatorFloorRefVo; import org.dromara.sis.service.ISisElevatorFloorRefService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -69,7 +70,7 @@ public class SisElevatorInfoController extends BaseController { @SaCheckPermission("sis:elevatorInfo:query") @GetMapping("/{elevatorId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("elevatorId") Long elevatorId) { + @PathVariable("elevatorId") Long elevatorId) { return R.ok(sisElevatorInfoService.queryById(elevatorId)); } @@ -115,7 +116,18 @@ public class SisElevatorInfoController extends BaseController { */ @RepeatSubmit() @PostMapping("/ref/add") - public R add(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) { + public R addRef(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) { return toAjax(sisElevatorFloorRefService.insertByBo(bo)); } + + /** + * 查询电梯⇄楼层关联 + * + * @param id 电梯id + */ + @GetMapping("/ref/{id}") + public R> queryRef(@NotNull(message = "电梯id不能为空") + @PathVariable("id") Long id) { + return R.ok(sisElevatorFloorRefService.queryByElevatorId(id)); + } }