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/TFaultAreaDicController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
index 7d8127e..5225de3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java
@@ -1,13 +1,18 @@
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.TFaultAreaDic;
+import com.ruoyi.system.model.TFaultDescribeDic;
+import com.ruoyi.system.model.TItem;
+import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.service.TFaultAreaDicService;
+import com.ruoyi.system.service.TFaultDescribeDicService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +36,11 @@
public class TFaultAreaDicController {
private final TFaultAreaDicService faultAreaDicService;
+ private final TFaultDescribeDicService faultDescribeDicService;
@Autowired
- public TFaultAreaDicController(TFaultAreaDicService faultAreaDicService) {
+ public TFaultAreaDicController(TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService) {
this.faultAreaDicService = faultAreaDicService;
+ this.faultDescribeDicService = faultDescribeDicService;
}
/**
@@ -46,11 +53,10 @@
return R.ok(faultAreaDicService.pageList(query));
}
- @PreAuthorize("@ss.hasPermi('system:faultArea:list')")
@ApiOperation(value = "获取故障区域列表")
@PostMapping(value = "/list")
public R<List<TFaultAreaDic>> list() {
- return R.ok(faultAreaDicService.list());
+ return R.ok(faultAreaDicService.list(Wrappers.lambdaQuery(TFaultAreaDic.class).orderByDesc(TFaultAreaDic::getSortBy).orderByDesc(TFaultAreaDic::getCreateTime)));
}
/**
@@ -61,24 +67,30 @@
@ApiOperation(value = "添加故障区域")
@PostMapping(value = "/add")
public R<Boolean> add(@Validated @RequestBody TFaultAreaDic dto) {
+ if (faultAreaDicService.isExit(dto)) {
+ return R.fail("故障区域名称已存在");
+ }
return R.ok(faultAreaDicService.save(dto));
}
/**
* 修改故障区域
*/
- @PreAuthorize("@ss.hasPermi('system:faultArea:update')")
+ @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
@Log(title = "故障区域信息-修改故障区域", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改故障区域")
@PostMapping(value = "/update")
public R<Boolean> update(@Validated @RequestBody TFaultAreaDic dto) {
+ if (faultAreaDicService.isExit(dto)) {
+ return R.fail("故障区域名称已存在");
+ }
return R.ok(faultAreaDicService.updateById(dto));
}
/**
* 查看故障区域详情
*/
- @PreAuthorize("@ss.hasPermi('system:faultArea:detail')")
+ @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
@ApiOperation(value = "查看故障区域详情")
@GetMapping(value = "/getDetailById")
public R<TFaultAreaDic> getDetailById(@RequestParam String id) {
@@ -93,6 +105,10 @@
@ApiOperation(value = "删除故障区域")
@DeleteMapping(value = "/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
+ long count = faultDescribeDicService.count(Wrappers.lambdaQuery(TFaultDescribeDic.class).eq(TFaultDescribeDic::getFaultId, id));
+ if (count>0) {
+ return R.fail("该区域下有故障描述，无法删除");
+ }
return R.ok(faultAreaDicService.removeById(id));
}
@@ -104,6 +120,13 @@
@ApiOperation(value = "批量删除故障区域")
@DeleteMapping(value = "/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ List<TFaultDescribeDic> items = faultDescribeDicService.list(Wrappers.lambdaQuery(TFaultDescribeDic.class).in(TFaultDescribeDic::getFaultId, ids));
+ for (String id : ids) {
+ if (items.stream().anyMatch(t -> t.getFaultId().equals(id))) {
+ TFaultAreaDic faultAreaDic = faultAreaDicService.getById(id);
+ return R.fail("该区域["+faultAreaDic.getFaultAreaName()+"]下有故障描述，无法删除");
+ }
+ }
return R.ok(faultAreaDicService.removeByIds(ids));
}
--
Gitblit v1.7.1