From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 105 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java
new file mode 100644
index 0000000..e201e93
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java
@@ -0,0 +1,105 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.query.TItemQuery;
+import com.ruoyi.system.service.TItemService;
+import com.ruoyi.system.vo.TItemVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 维修物品 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Api(tags = "维修物品管理")
+@RestController
+@RequestMapping("/t-item")
+public class TItemController {
+
+    private final TItemService itemService;
+    @Autowired
+    public TItemController(TItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    /**
+     * 获取维修物品管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('houseManage:list:list')")
+    @ApiOperation(value = "获取维修物品分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TItemVO>> pageList(@RequestBody TItemQuery query) {
+        return R.ok(itemService.pageList(query));
+    }
+
+    /**
+     * 添加维修物品管理
+     */
+    @PreAuthorize("@ss.hasPermi('houseManage:list:add')")
+    @Log(title = "维修物品信息-新增维修物品", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加维修物品")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TItem dto) {
+        return R.ok(itemService.save(dto));
+    }
+
+    /**
+     * 修改维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('houseManage:list:edit')")
+    @Log(title = "维修物品信息-修改维修物品", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改维修物品")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TItem dto) {
+        return R.ok(itemService.updateById(dto));
+    }
+
+    /**
+     * 查看维修物品详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:item:detail')")
+    @ApiOperation(value = "查看维修物品详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TItem> getDetailById(@RequestParam String id) {
+        return R.ok(itemService.getById(id));
+    }
+
+    /**
+     * 删除维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('houseManage:list:delete')")
+    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除维修物品")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(itemService.removeById(id));
+    }
+
+    /**
+     * 批量删除维修物品
+     */
+    @PreAuthorize("@ss.hasPermi('houseManage:list:delete')")
+    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除维修物品")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(itemService.removeByIds(ids));
+    }
+    
+}
+

--
Gitblit v1.7.1