feat(safe): 完善安全巡检系统功能

liding

2026-06-30 d4a3ddfeac6aea951c51bee91d9cf4eb57c4f4c4

 src/main/java/com/ruoyi/safe/controller/SafeLineInspectionController.java

@@ -6,6 +6,10 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.safe.pojo.SafeLineInspection;
import com.ruoyi.safe.pojo.SafeLineInspectionHazard;
import com.ruoyi.safe.pojo.SafeLineInspectionRecord;
import com.ruoyi.safe.service.SafeLineInspectionHazardService;
import com.ruoyi.safe.service.SafeLineInspectionRecordService;
import com.ruoyi.safe.service.SafeLineInspectionService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,6 +34,8 @@
public class SafeLineInspectionController {

    private SafeLineInspectionService safeLineInspectionService;
    private SafeLineInspectionHazardService safeLineInspectionHazardService;
    private SafeLineInspectionRecordService safeLineInspectionRecordService;

    @GetMapping("/page")
    @Operation(summary = "分页查询")
@@ -47,8 +53,15 @@
    @Log(title = "线路巡检", businessType = BusinessType.INSERT)
    @PostMapping()
    public R add(@RequestBody SafeLineInspection safeLineInspection) {
        // 新增时默认状态为"待巡检"
        if (isInspectionCodeExists(safeLineInspection.getInspectionCode(), null)) {
            return R.fail("巡检编号「" + safeLineInspection.getInspectionCode() + "」已存在");
        }
        safeLineInspection.setStatus("待巡检");
        Long currentUserId = SecurityUtils.getUserId();
        safeLineInspection.setAssignUserId(currentUserId.intValue());
        if (safeLineInspection.getInspectorId() != null && safeLineInspection.getInspectorId().isEmpty()) {
            safeLineInspection.setInspectorId(null);
        }
        return R.ok(safeLineInspectionService.save(safeLineInspection));
    }

@@ -56,7 +69,21 @@
    @Log(title = "线路巡检", businessType = BusinessType.UPDATE)
    @PutMapping()
    public R update(@RequestBody SafeLineInspection safeLineInspection) {
        if (isInspectionCodeExists(safeLineInspection.getInspectionCode(), safeLineInspection.getId())) {
            return R.fail("巡检编号「" + safeLineInspection.getInspectionCode() + "」已存在");
        }
        if (safeLineInspection.getInspectorId() != null && safeLineInspection.getInspectorId().isEmpty()) {
            safeLineInspection.setInspectorId(null);
        }
        return R.ok(safeLineInspectionService.updateById(safeLineInspection));
    }

    private boolean isInspectionCodeExists(String code, Integer excludeId) {
        if (code == null || code.isEmpty()) return false;
        return safeLineInspectionService.lambdaQuery()
                .eq(SafeLineInspection::getInspectionCode, code)
                .ne(excludeId != null, SafeLineInspection::getId, excludeId)
                .count() > 0;
    }

    @Operation(summary = "完成巡检")
@@ -66,6 +93,14 @@
        SafeLineInspection inspection = safeLineInspectionService.getById(id);
        if (inspection == null) {
            return R.fail("巡检任务不存在");
        }

        // 校验是否有未整改的隐患
        List<SafeLineInspectionHazard> hazards = safeLineInspectionHazardService.listByInspectionId(id);
        boolean hasUnrectified = hazards.stream()
                .anyMatch(h -> !"已整改".equals(h.getStatus()));
        if (hasUnrectified) {
            return R.fail("存在未整改的隐患，请先完成隐患整改");
        }

        Long currentUserId = SecurityUtils.getUserId();
@@ -79,7 +114,16 @@
    @Operation(summary = "删除线路巡检任务")
    @Log(title = "线路巡检", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public R delSafeLineInspection(@RequestBody List<Integer> ids) {
    public R delSafeLineInspection(@PathVariable List<Integer> ids) {
        for (Integer id : ids) {
            long recordCount = safeLineInspectionRecordService.lambdaQuery()
                    .eq(SafeLineInspectionRecord::getInspectionId, id).count();
            long hazardCount = safeLineInspectionHazardService.lambdaQuery()
                    .eq(SafeLineInspectionHazard::getInspectionId, id).count();
            if (recordCount > 0 || hazardCount > 0) {
                return R.fail("该巡检任务存在关联的巡检记录或隐患，无法删除");
            }
        }
        return R.ok(safeLineInspectionService.removeBatchByIds(ids));
    }
}