From 6eaa3fec441392e59c411b1aed33fd643e15280c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:40:12 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 accebe7..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
@@ -8,6 +8,8 @@
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;
@@ -51,7 +53,6 @@
return R.ok(faultAreaDicService.pageList(query));
}
- @PreAuthorize("@ss.hasPermi('system:faultArea:list')")
@ApiOperation(value = "获取故障区域列表")
@PostMapping(value = "/list")
public R<List<TFaultAreaDic>> list() {
@@ -75,7 +76,7 @@
/**
* 修改故障区域
*/
- @PreAuthorize("@ss.hasPermi('system:faultArea:update')")
+ @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
@Log(title = "故障区域信息-修改故障区域", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改故障区域")
@PostMapping(value = "/update")
@@ -89,7 +90,7 @@
/**
* 查看故障区域详情
*/
- @PreAuthorize("@ss.hasPermi('system:faultArea:detail')")
+ @PreAuthorize("@ss.hasPermi('system:faultArea:edit')")
@ApiOperation(value = "查看故障区域详情")
@GetMapping(value = "/getDetailById")
public R<TFaultAreaDic> getDetailById(@RequestParam String id) {
@@ -104,9 +105,10 @@
@ApiOperation(value = "删除故障区域")
@DeleteMapping(value = "/deleteById")
public R<Boolean> deleteById(@RequestParam String id) {
- // 删除故障描述关联信息
- faultDescribeDicService.remove(Wrappers.lambdaQuery(TFaultDescribeDic.class)
- .eq(TFaultDescribeDic::getFaultId, 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));
}
@@ -118,9 +120,13 @@
@ApiOperation(value = "批量删除故障区域")
@DeleteMapping(value = "/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
- // 删除故障描述关联信息
- faultDescribeDicService.remove(Wrappers.lambdaQuery(TFaultDescribeDic.class)
- .in(TFaultDescribeDic::getFaultId, 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