From d5dff36d38fc7a211b34916796bbc37f17e7a2d0 Mon Sep 17 00:00:00 2001 From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local> Date: 星期三, 15 一月 2025 16:33:15 +0800 Subject: [PATCH] 完成设备管理部分功能 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsEquTypeController.java | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/SysEquTypeController.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsEquTypeController.java similarity index 68% rename from eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/SysEquTypeController.java rename to eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsEquTypeController.java index c0c712f..c3dfe48 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/SysEquTypeController.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsEquTypeController.java @@ -7,20 +7,19 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.eims.domain.vo.EimsEquTypeVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.eims.domain.vo.SysEquTypeVo; -import org.dromara.eims.domain.bo.SysEquTypeBo; -import org.dromara.eims.service.ISysEquTypeService; +import org.dromara.eims.domain.bo.EimsEquTypeBo; +import org.dromara.eims.service.IEimsEquTypeService; /** * 璁惧绫诲瀷 @@ -32,17 +31,17 @@ @RequiredArgsConstructor @RestController @RequestMapping("/eims/equType") -public class SysEquTypeController extends BaseController { +public class EimsEquTypeController extends BaseController { - private final ISysEquTypeService sysEquTypeService; + private final IEimsEquTypeService eimsEquTypeService; /** * 鏌ヨ璁惧绫诲瀷鍒楄〃 */ @SaCheckPermission("eims:equType:list") @GetMapping("/list") - public R<List<SysEquTypeVo>> list(SysEquTypeBo bo) { - List<SysEquTypeVo> list = sysEquTypeService.queryList(bo); + public R<List<EimsEquTypeVo>> list(EimsEquTypeBo bo) { + List<EimsEquTypeVo> list = eimsEquTypeService.queryList(bo); return R.ok(list); } @@ -51,8 +50,8 @@ */ @SaCheckPermission("eims:equType:list") @GetMapping("/tree") - public R<List<Tree<Long>>> equTypeTree(SysEquTypeBo bo) { - return R.ok(sysEquTypeService.selectEquTypeTreeList(bo)); + public R<List<Tree<Long>>> equTypeTree(EimsEquTypeBo bo) { + return R.ok(eimsEquTypeService.selectEquTypeTreeList(bo)); } /** @@ -61,9 +60,9 @@ @SaCheckPermission("eims:equType:export") @Log(title = "璁惧绫诲瀷", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysEquTypeBo bo, HttpServletResponse response) { - List<SysEquTypeVo> list = sysEquTypeService.queryList(bo); - ExcelUtil.exportExcel(list, "璁惧绫诲瀷", SysEquTypeVo.class, response); + public void export(EimsEquTypeBo bo, HttpServletResponse response) { + List<EimsEquTypeVo> list = eimsEquTypeService.queryList(bo); + ExcelUtil.exportExcel(list, "璁惧绫诲瀷", EimsEquTypeVo.class, response); } /** @@ -73,9 +72,9 @@ */ @SaCheckPermission("eims:equType:query") @GetMapping("/{equTypeId}") - public R<SysEquTypeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") + public R<EimsEquTypeVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") @PathVariable Long equTypeId) { - return R.ok(sysEquTypeService.queryById(equTypeId)); + return R.ok(eimsEquTypeService.queryById(equTypeId)); } /** @@ -85,8 +84,8 @@ @Log(title = "璁惧绫诲瀷", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R<Void> add(@Validated(AddGroup.class) @RequestBody SysEquTypeBo bo) { - return toAjax(sysEquTypeService.insertByBo(bo)); + public R<Void> add(@Validated(AddGroup.class) @RequestBody EimsEquTypeBo bo) { + return toAjax(eimsEquTypeService.insertByBo(bo)); } /** @@ -96,8 +95,8 @@ @Log(title = "璁惧绫诲瀷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysEquTypeBo bo) { - return toAjax(sysEquTypeService.updateByBo(bo)); + public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsEquTypeBo bo) { + return toAjax(eimsEquTypeService.updateByBo(bo)); } /** @@ -114,11 +113,11 @@ return R.warn("璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁"); } for (int i = 0; i < equTypeIds.length; i++) { - if (sysEquTypeService.hasChildByEquTypeId(equTypeIds[i])) { + if (eimsEquTypeService.hasChildByEquTypeId(equTypeIds[i])) { return R.warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�"); } } - return toAjax(sysEquTypeService.deleteWithValidByIds(List.of(equTypeIds), true)); + return toAjax(eimsEquTypeService.deleteWithValidByIds(List.of(equTypeIds), true)); } } -- Gitblit v1.9.3