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/TItemTypeController.java | 135 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 135 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
new file mode 100644
index 0000000..96e1b44
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java
@@ -0,0 +1,135 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.model.TItemType;
+import com.ruoyi.system.query.TItemTypeQuery;
+import com.ruoyi.system.service.TItemService;
+import com.ruoyi.system.service.TItemTypeService;
+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-type")
+public class TItemTypeController {
+
+ private final TItemTypeService itemTypeService;
+ private final TItemService itemService;
+ @Autowired
+ public TItemTypeController(TItemTypeService itemTypeService, TItemService itemService) {
+ this.itemTypeService = itemTypeService;
+ this.itemService = itemService;
+ }
+
+ /**
+ * 获取维修物品分类管理列表
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class_list')")
+ @ApiOperation(value = "获取维修物品分类分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TItemType>> pageList(@RequestBody TItemTypeQuery query) {
+ return R.ok(itemTypeService.pageList(query));
+ }
+
+ /**
+ * 获取维修物品分类管理列表
+ */
+ @ApiOperation(value = "获取维修物品分类列表")
+ @PostMapping(value = "/list")
+ public R<List<TItemType>> list() {
+ return R.ok(itemTypeService.list(Wrappers.lambdaQuery(TItemType.class).orderByDesc(TItemType::getSortBy).orderByDesc(TItemType::getCreateTime)));
+ }
+
+ /**
+ * 添加维修物品分类管理
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class:add')")
+ @Log(title = "维修物品分类信息-新增维修物品分类", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加维修物品分类")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TItemType dto) {
+ if (itemTypeService.isExit(dto)) {
+ return R.fail("维修物品分类名称已存在");
+ }
+ return R.ok(itemTypeService.save(dto));
+ }
+
+ /**
+ * 修改维修物品分类
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
+ @Log(title = "维修物品分类信息-修改维修物品分类", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改维修物品分类")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TItemType dto) {
+ if (itemTypeService.isExit(dto)) {
+ return R.fail("维修物品分类名称已存在");
+ }
+ return R.ok(itemTypeService.updateById(dto));
+ }
+
+ /**
+ * 查看维修物品分类详情
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class:edit')")
+ @ApiOperation(value = "查看维修物品分类详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TItemType> getDetailById(@RequestParam String id) {
+ return R.ok(itemTypeService.getById(id));
+ }
+
+ /**
+ * 删除维修物品分类
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
+ @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除维修物品分类")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ long count = itemService.count(Wrappers.lambdaQuery(TItem.class).eq(TItem::getTypeId, id));
+ if (count>0) {
+ return R.fail("该分类下有维修物品，无法删除");
+ }
+ return R.ok(itemTypeService.removeById(id));
+ }
+
+ /**
+ * 批量删除维修物品分类
+ */
+ @PreAuthorize("@ss.hasPermi('houseManage:class:delete')")
+ @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除维修物品分类")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ List<TItem> items = itemService.list(Wrappers.lambdaQuery(TItem.class).in(TItem::getTypeId, ids));
+ for (String id : ids) {
+ if (items.stream().anyMatch(t -> t.getTypeId().equals(id))) {
+ TItemType itemType = itemTypeService.getById(id);
+ return R.fail("该分类["+itemType.getTypeName()+"]下有维修物品，无法删除");
+ }
+ }
+ return R.ok(itemTypeService.removeByIds(ids));
+ }
+
+}
+
--
Gitblit v1.7.1