完成设备管理部分功能

朱桂飞

2025-01-15 d5dff36d38fc7a211b34916796bbc37f17e7a2d0

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsEquController.java

ÎļþÃû´Ó eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/SysEquController.java ÐÞ¸Ä
@@ -2,9 +2,9 @@

import java.util.List;

import org.dromara.eims.domain.bo.SysEquBo;
import org.dromara.eims.domain.vo.SysEquVo;
import org.dromara.eims.service.ISysEquService;
import org.dromara.eims.domain.bo.EimsEquBo;
import org.dromara.eims.domain.vo.EimsEquVo;
import org.dromara.eims.service.IEimsEquService;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
@@ -34,28 +34,28 @@
@RequiredArgsConstructor
@RestController
@RequestMapping("/eims/equ")
public class SysEquController extends BaseController {
public class EimsEquController extends BaseController {

    private final ISysEquService sysEquipmentService;
    private final IEimsEquService eimsEquipmentService;

    /**
     * æŸ¥è¯¢ã€è®¾å¤‡å°è´¦ã€‘列表
     */
    @SaCheckPermission("system:equipment:list")
    @SaCheckPermission("eims:equ:list")
    @GetMapping("/list")
    public TableDataInfo<SysEquVo> list(SysEquBo bo, PageQuery pageQuery) {
        return sysEquipmentService.queryPageList(bo, pageQuery);
    public TableDataInfo<EimsEquVo> list(EimsEquBo bo, PageQuery pageQuery) {
        return eimsEquipmentService.queryPageList(bo, pageQuery);
    }

    /**
     * å¯¼å‡ºã€è®¾å¤‡å°è´¦ã€‘列表
     */
    @SaCheckPermission("system:equipment:export")
    @SaCheckPermission("eims:equ:export")
    @Log(title = "【设备台账】", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(SysEquBo bo, HttpServletResponse response) {
        List<SysEquVo> list = sysEquipmentService.queryList(bo);
        ExcelUtil.exportExcel(list, "【设备台账】", SysEquVo.class, response);
    public void export(EimsEquBo bo, HttpServletResponse response) {
        List<EimsEquVo> list = eimsEquipmentService.queryList(bo);
        ExcelUtil.exportExcel(list, "【设备台账】", EimsEquVo.class, response);
    }

    /**
@@ -63,33 +63,33 @@
     *
     * @param equId ä¸»é”®
     */
    @SaCheckPermission("system:equipment:query")
    @SaCheckPermission("eims:equ:query")
    @GetMapping("/{equId}")
    public R<SysEquVo> getInfo(@NotNull(message = "主键不能为空")
    public R<EimsEquVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Long equId) {
        return R.ok(sysEquipmentService.queryById(equId));
        return R.ok(eimsEquipmentService.queryById(equId));
    }

    /**
     * æ–°å¢žã€è®¾å¤‡å°è´¦ã€‘
     */
    @SaCheckPermission("system:equipment:add")
    @SaCheckPermission("eims:equ:add")
    @Log(title = "【设备台账】", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping()
    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysEquBo bo) {
        return toAjax(sysEquipmentService.insertByBo(bo));
    public R<Void> add(@Validated(AddGroup.class) @RequestBody EimsEquBo bo) {
        return toAjax(eimsEquipmentService.insertByBo(bo));
    }

    /**
     * ä¿®æ”¹ã€è®¾å¤‡å°è´¦ã€‘
     */
    @SaCheckPermission("system:equipment:edit")
    @SaCheckPermission("eims:equ:edit")
    @Log(title = "【设备台账】", businessType = BusinessType.UPDATE)
    @RepeatSubmit()
    @PutMapping()
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysEquBo bo) {
        return toAjax(sysEquipmentService.updateByBo(bo));
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody EimsEquBo bo) {
        return toAjax(eimsEquipmentService.updateByBo(bo));
    }

    /**
@@ -97,11 +97,11 @@
     *
     * @param equIds ä¸»é”®ä¸²
     */
    @SaCheckPermission("system:equipment:remove")
    @SaCheckPermission("eims:equ:remove")
    @Log(title = "【设备台账】", businessType = BusinessType.DELETE)
    @DeleteMapping("/{equIds}")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
                          @PathVariable Long[] equIds) {
        return toAjax(sysEquipmentService.deleteWithValidByIds(List.of(equIds), true));
        return toAjax(eimsEquipmentService.deleteWithValidByIds(List.of(equIds), true));
    }
}