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/TFaultDescribeDicController.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java
new file mode 100644
index 0000000..d3530a7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java
@@ -0,0 +1,108 @@
+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.TFaultDescribeDic;
+import com.ruoyi.system.query.TFaultDescribeDicQuery;
+import com.ruoyi.system.service.TFaultDescribeDicService;
+import com.ruoyi.system.vo.TFaultDescribeDicVO;
+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.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 故障描述 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Api(tags = "故障描述")
+@RestController
+@RequestMapping("/t-fault-describe-dic")
+public class TFaultDescribeDicController {
+
+
+ private final TFaultDescribeDicService faultDescribeDicService;
+ @Autowired
+ public TFaultDescribeDicController(TFaultDescribeDicService faultDescribeDicService) {
+ this.faultDescribeDicService = faultDescribeDicService;
+ }
+
+ /**
+ * 获取故障描述管理列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:list')")
+ @ApiOperation(value = "获取故障描述分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TFaultDescribeDicVO>> pageList(@RequestBody TFaultDescribeDicQuery query) {
+ return R.ok(faultDescribeDicService.pageList(query));
+ }
+
+ /**
+ * 添加故障描述管理
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:add')")
+ @Log(title = "故障描述信息-新增故障描述", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加故障描述")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TFaultDescribeDic dto) {
+ return R.ok(faultDescribeDicService.save(dto));
+ }
+
+ /**
+ * 修改故障描述
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ @Log(title = "故障描述信息-修改故障描述", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改故障描述")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TFaultDescribeDic dto) {
+ dto.setUpdateTime(LocalDateTime.now());
+ return R.ok(faultDescribeDicService.updateById(dto));
+ }
+
+ /**
+ * 查看故障描述详情
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:edit')")
+ @ApiOperation(value = "查看故障描述详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TFaultDescribeDic> getDetailById(@RequestParam String id) {
+ return R.ok(faultDescribeDicService.getById(id));
+ }
+
+ /**
+ * 删除故障描述
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:delete')")
+ @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除故障描述")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(faultDescribeDicService.removeById(id));
+ }
+
+ /**
+ * 批量删除故障描述
+ */
+ @PreAuthorize("@ss.hasPermi('system:tag:delete')")
+ @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除故障描述")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ return R.ok(faultDescribeDicService.removeByIds(ids));
+ }
+
+}
+
--
Gitblit v1.7.1