Merge remote-tracking branch 'origin/master'

xuhy

2025-02-10 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d

 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;
@@ -104,9 +106,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 +121,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));
    }