feat: 设备保养优化,保养项目拆分

gongchunyi

4 天以前 5aa8be8da9aa87bfdcaed5e620643b5acd76d632

feat: 设备保养优化,保养项目拆分

 doc/20261016_É豸±£ÑøÏîÄ¿ÍêÕû½Å±¾.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
DROP TABLE IF EXISTS device_maintenance_item;
DROP TABLE IF EXISTS maintenance_task_item;
DROP TABLE IF EXISTS maintenance_item;

CREATE TABLE maintenance_item
(
    id               BIGINT       NOT NULL AUTO_INCREMENT COMMENT '保养内容ID',
    item_name        TEXT         NOT NULL COMMENT '保养内容',
    item_project     VARCHAR(200) NOT NULL COMMENT '保养项目',
    device_ledger_id BIGINT NULL COMMENT '所属设备台账ID，为空表示通用保养内容',
    frequency_type   VARCHAR(20)  NOT NULL COMMENT '保养频率：DAILY/WEEKLY/MONTHLY/QUARTERLY/ALL（通用频率）',
    sort_num         INT          NOT NULL DEFAULT 0 COMMENT '显示顺序',
    is_active        TINYINT      NOT NULL DEFAULT 1 COMMENT '状态：1启用，0停用',
    remarks          VARCHAR(500) NULL COMMENT '备注',
    deleted          TINYINT      NOT NULL DEFAULT 0 COMMENT '删除标志：0正常，1删除',
    create_user      INT NULL COMMENT '创建人',
    update_user      INT NULL COMMENT '更新人',
    create_time      DATETIME NULL COMMENT '创建时间',
    update_time      DATETIME NULL COMMENT '更新时间',
    tenant_id        BIGINT NULL COMMENT '租户ID',
    dept_id          BIGINT NULL COMMENT '部门ID',
    PRIMARY KEY (id),
    KEY              idx_maintenance_item_scope (tenant_id, dept_id, device_ledger_id, frequency_type, is_active, deleted),
    KEY              idx_maintenance_item_device_frequency (device_ledger_id, frequency_type, is_active, deleted)
) COMMENT='设备保养内容字典';

CREATE TABLE maintenance_task_item
(
    id                  BIGINT       NOT NULL AUTO_INCREMENT COMMENT '任务项目关系ID',
    maintenance_task_id BIGINT       NOT NULL COMMENT '保养任务ID',
    maintenance_item_id BIGINT NULL COMMENT '保养内容ID，为空表示本任务专用的自定义内容',
    item_project        VARCHAR(200) NOT NULL COMMENT '保养项目快照',
    item_name           TEXT         NOT NULL COMMENT '任务配置时的保养内容快照',
    sort_num            INT          NOT NULL DEFAULT 0 COMMENT '任务内显示顺序',
    create_time         DATETIME NULL COMMENT '创建时间',
    update_time         DATETIME NULL COMMENT '更新时间',
    tenant_id           BIGINT NULL COMMENT '租户ID',
    dept_id             BIGINT NULL COMMENT '部门ID',
    PRIMARY KEY (id),
    UNIQUE KEY uk_task_item (maintenance_task_id, maintenance_item_id),
    KEY                 idx_task_item_item (maintenance_item_id)
) COMMENT='设备保养任务项目';

CREATE TABLE device_maintenance_item
(
    id                       BIGINT       NOT NULL AUTO_INCREMENT COMMENT '保养记录项目ID',
    device_maintenance_id    BIGINT       NOT NULL COMMENT '保养记录ID',
    maintenance_task_item_id BIGINT NULL COMMENT '来源任务项目ID',
    maintenance_item_id      BIGINT NULL COMMENT '来源保养内容ID',
    item_project             VARCHAR(200) NOT NULL COMMENT '本次保养项目快照',
    item_name                TEXT         NOT NULL COMMENT '本次保养内容快照',
    item_status              TINYINT      NOT NULL DEFAULT 0 COMMENT '项目状态：0待完成，1已完成，2异常/未完成',
    completed_by             VARCHAR(100) NULL COMMENT '项目完成操作人',
    completed_time           DATETIME NULL COMMENT '项目完成时间',
    remarks                  VARCHAR(500) NULL COMMENT '单项说明',
    sort_num                 INT          NOT NULL DEFAULT 0 COMMENT '记录内显示顺序',
    create_time              DATETIME NULL COMMENT '创建时间',
    update_time              DATETIME NULL COMMENT '更新时间',
    tenant_id                BIGINT NULL COMMENT '租户ID',
    dept_id                  BIGINT NULL COMMENT '部门ID',
    PRIMARY KEY (id),
    KEY                      idx_device_maintenance_item_record (device_maintenance_id, sort_num),
    KEY                      idx_device_maintenance_item_task_item (maintenance_task_item_id)
) COMMENT='设备保养记录项目明细';

 src/main/java/com/ruoyi/device/controller/MaintenanceItemController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
package com.ruoyi.device.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.MaintenanceItem;
import com.ruoyi.device.service.MaintenanceItemService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@Tag(name = "设备保养项目")
@RestController
@RequestMapping("/deviceMaintenanceItem")
@RequiredArgsConstructor
public class MaintenanceItemController {

    private final MaintenanceItemService maintenanceItemService;

    @GetMapping("/list")
    @Operation(summary = "设备保养项目列表")
    public AjaxResult list(MaintenanceItem query) {
        List<MaintenanceItem> items = maintenanceItemService.list(query);
        return AjaxResult.success(items);
    }

    @GetMapping("/page")
    @Operation(summary = "分页查询设备保养项目")
    public AjaxResult page(
            @RequestParam(defaultValue = "1") long pageNum,
            @RequestParam(defaultValue = "20") long pageSize,
            @RequestParam(defaultValue = "false") boolean includeCommon,
            MaintenanceItem query
    ) {
        Page<MaintenanceItem> result = maintenanceItemService.page(pageNum, pageSize, includeCommon, query);
        return AjaxResult.success(result);
    }

    @PostMapping
    @Log(title = "新增设备保养项目", businessType = BusinessType.INSERT)
    @Operation(summary = "新增设备保养项目")
    public AjaxResult add(@RequestBody MaintenanceItem item) {
        maintenanceItemService.createItem(item);
        return AjaxResult.success();
    }

    @PutMapping
    @Log(title = "修改设备保养项目", businessType = BusinessType.UPDATE)
    @Operation(summary = "修改设备保养项目")
    public AjaxResult update(@RequestBody MaintenanceItem item) {
        maintenanceItemService.updateItem(item);
        return AjaxResult.success();
    }

    @DeleteMapping("/{id}")
    @Log(title = "删除设备保养项目", businessType = BusinessType.DELETE)
    @Operation(summary = "删除设备保养项目")
    public AjaxResult delete(@PathVariable("id") Long id) {
        maintenanceItemService.deleteItem(id);
        return AjaxResult.success();
    }
}

 src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java

@@ -2,39 +2,38 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.service.MaintenanceItemService;
import com.ruoyi.device.service.MaintenanceTaskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @author :yys
 * @date : 2025/12/22 14:58
 */
@Tag(name = "设备保养定时任务管理")
@RestController
@RequestMapping("/deviceMaintenanceTask")
@AllArgsConstructor
@RequiredArgsConstructor
public class MaintenanceTaskController extends BaseController {


    private MaintenanceTaskService maintenanceTaskService;

    private final MaintenanceTaskService maintenanceTaskService;
    private final MaintenanceItemService maintenanceItemService;

    @GetMapping("/listPage")
    @Operation(summary = "设备保养定时任务列表")
    public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
        return maintenanceTaskService.listPage(page,maintenanceTask);
        return maintenanceTaskService.listPage(page, maintenanceTask);
    }


    @PostMapping("/add")
    @Operation(summary = "添加设备保养定时任务")
@@ -57,5 +56,9 @@
        return maintenanceTaskService.delete(ids);
    }


    @GetMapping("/items")
    @Operation(summary = "启用的设备保养项目")
    public AjaxResult items() {
        return AjaxResult.success(maintenanceItemService.listActive());
    }
}

 src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceItemMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.device.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.device.pojo.DeviceMaintenanceItem;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface DeviceMaintenanceItemMapper extends BaseMapper<DeviceMaintenanceItem> {
}

 src/main/java/com/ruoyi/device/mapper/MaintenanceItemMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.ruoyi.device.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.device.pojo.MaintenanceItem;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface MaintenanceItemMapper extends BaseMapper<MaintenanceItem> {
}

 src/main/java/com/ruoyi/device/mapper/MaintenanceTaskItemMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,16 @@
package com.ruoyi.device.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.ruoyi.device.pojo.MaintenanceTaskItem;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@Mapper
public interface MaintenanceTaskItemMapper extends BaseMapper<MaintenanceTaskItem> {
    @Select("SELECT * FROM maintenance_task_item WHERE maintenance_task_id = #{taskId} ORDER BY sort_num, id")
    @InterceptorIgnore(tenantLine = "true")
    List<MaintenanceTaskItem> selectByTaskId(Long taskId);
}

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -95,6 +95,12 @@
    @TableField(exist = false)
    private List<SparePartUse> sparePartsUseList;

    @TableField(exist = false)
    private List<Long> maintenanceItemIds;

    @TableField(exist = false)
    private List<DeviceMaintenanceItem> maintenanceItems;

    @Data
    public static class SparePartUse {
        private Long id;

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceItem.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDateTime;

@Data
@TableName("device_maintenance_item")
public class DeviceMaintenanceItem {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long deviceMaintenanceId;
    private Long maintenanceTaskItemId;
    private Long maintenanceItemId;
    private String itemProject;
    private String itemName;
    private Integer itemStatus;
    private String completedBy;
    private LocalDateTime completedTime;
    private String remarks;
    private Integer sortNum;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}

 src/main/java/com/ruoyi/device/pojo/MaintenanceItem.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDateTime;

@Data
@TableName("maintenance_item")
public class MaintenanceItem {

    @TableId(type = IdType.AUTO)
    private Long id;

    private String itemName;
    private String itemProject;
    private Long deviceLedgerId;
    private String frequencyType;

    private Integer sortNum;
    private Integer isActive;
    private String remarks;
    private Integer deleted;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}

 src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java

@@ -13,6 +13,7 @@

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

/**
 * @author :yys
@@ -91,6 +92,15 @@
    @TableField(exist = false)
    private String dateStr;

    @TableField(exist = false)
    private List<Long> maintenanceItemIds;

    @TableField(exist = false)
    private List<MaintenanceTaskItem> customItems;

    @TableField(exist = false)
    private List<MaintenanceTaskItem> maintenanceItems;

    @Schema(description = "创建该记录的用户")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
    private Integer createUser;

 src/main/java/com/ruoyi/device/pojo/MaintenanceTaskItem.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDateTime;

@Data
@TableName("maintenance_task_item")
public class MaintenanceTaskItem {

    @TableId(type = IdType.AUTO)
    private Long id;

    private Long maintenanceTaskId;
    private Long maintenanceItemId;
    private String itemProject;
    private String itemName;
    private Integer sortNum;

    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}

 src/main/java/com/ruoyi/device/service/MaintenanceItemService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.ruoyi.device.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.MaintenanceItem;

import java.util.List;

public interface MaintenanceItemService {

    List<MaintenanceItem> listActive();

    List<MaintenanceItem> list(MaintenanceItem query);

    Page<MaintenanceItem> page(long pageNum, long pageSize, boolean includeCommon, MaintenanceItem query);

    void createItem(MaintenanceItem item);

    void updateItem(MaintenanceItem item);

    void deleteItem(Long id);
}

 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java

@@ -11,7 +11,11 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceItemMapper;
import com.ruoyi.device.mapper.MaintenanceItemMapper;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceMaintenanceItem;
import com.ruoyi.device.pojo.MaintenanceItem;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
@@ -20,15 +24,23 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.time.LocalDateTime;


@Service
@@ -39,18 +51,29 @@
    private final SparePartsMapper sparePartsMapper;
    private final SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
    private final FileUtil fileUtil;
    private final DeviceMaintenanceItemMapper deviceMaintenanceItemMapper;
    private final MaintenanceItemMapper maintenanceItemMapper;

    @Override
    public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {

        return deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
        IPage<DeviceMaintenanceDto> result = deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
        if (result.getRecords() != null && !result.getRecords().isEmpty()) {
            List<Long> ids = result.getRecords().stream().map(DeviceMaintenance::getId).toList();
            List<DeviceMaintenanceItem> items = deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().in(DeviceMaintenanceItem::getDeviceMaintenanceId, ids).orderByAsc(DeviceMaintenanceItem::getSortNum));
            Map<Long, List<DeviceMaintenanceItem>> byRecord = items.stream().collect(Collectors.groupingBy(DeviceMaintenanceItem::getDeviceMaintenanceId));
            result.getRecords().forEach(record -> record.setMaintenanceItems(byRecord.getOrDefault(record.getId(), new ArrayList<>())));
        }
        return result;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
        List<MaintenanceItem> selectedItems = getSelectedItems(deviceMaintenance.getMaintenanceItemIds(), null, deviceMaintenance.getDeviceLedgerId(), deviceMaintenance.getFrequencyType());
        if (selectedItems == null) return AjaxResult.error("请选择至少一个有效的保养项目");
        boolean save = this.save(deviceMaintenance);
        if (save){
        if (save) {
            saveRecordItems(deviceMaintenance, selectedItems);
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
            return AjaxResult.success();
@@ -62,8 +85,13 @@
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
        DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
        if (oldDeviceMaintenance == null) return AjaxResult.error("保养记录不存在");
        if (deviceMaintenance.getMaintenanceItems() != null) {
            AjaxResult validation = validateRecordItems(deviceMaintenance, oldDeviceMaintenance);
            if (validation != null) return validation;
        }
        // å¤„理备件使用情况
        if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
        if (CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
            List<Long> sparePartIds = new ArrayList<>();
            for (DeviceMaintenance.SparePartUse sparePartUse : deviceMaintenance.getSparePartsUseList()) {
                // èŽ·å–备件信息
@@ -95,6 +123,16 @@
            }
        }

        if (deviceMaintenance.getMaintenanceItems() != null) {
            AjaxResult itemResult = updateRecordItems(deviceMaintenance, oldDeviceMaintenance);
            if (itemResult != null) return itemResult;
        } else if (deviceMaintenance.getMaintenanceItemIds() != null) {
            List<MaintenanceItem> selectedItems = getSelectedItems(deviceMaintenance.getMaintenanceItemIds(), deviceMaintenance.getId(), oldDeviceMaintenance.getDeviceLedgerId(), oldDeviceMaintenance.getFrequencyType());
            if (selectedItems == null) return AjaxResult.error("请选择至少一个有效的保养项目");
            deviceMaintenanceItemMapper.delete(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, deviceMaintenance.getId()));
            saveRecordItems(deviceMaintenance, selectedItems);
        }

        if (this.updateById(deviceMaintenance)) {
            // å¤„理图片上传
            fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
@@ -109,7 +147,9 @@
        ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
        supplierManageList.forEach(deviceMaintenance -> {
            DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
            BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
            BeanUtils.copyProperties(deviceMaintenance, deviceRepairExeclDto);
            List<DeviceMaintenanceItem> recordItems = deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, deviceMaintenance.getId()).orderByAsc(DeviceMaintenanceItem::getSortNum));
            deviceRepairExeclDto.setMachineryCategory(recordItems.stream().map(DeviceMaintenanceItem::getItemName).collect(Collectors.joining("、")));
            deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "待维修" : deviceMaintenance.getStatus() == 1 ? "完结" : "失败");
//            deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "ç»´ä¿®" : "完好");
            deviceLedgerExeclDtos.add(deviceRepairExeclDto);
@@ -121,7 +161,71 @@
    @Override
    public DeviceMaintenanceVo detailById(Long id) {
        DeviceMaintenanceVo vo = deviceMaintenanceMapper.detailById(id);
        if (vo != null) {
            vo.setMaintenanceItems(deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, id).orderByAsc(DeviceMaintenanceItem::getSortNum)));
        }
        vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_MAINTENANCE, id));
        return vo;
    }

    private List<MaintenanceItem> getSelectedItems(List<Long> ids, Long recordId, Long deviceId, String frequencyType) {
        if (deviceId == null || !List.of("DAILY", "WEEKLY", "MONTHLY", "QUARTERLY").contains(frequencyType) || ids == null || ids.isEmpty() || new HashSet<>(ids).size() != ids.size())
            return null;
        List<MaintenanceItem> items = maintenanceItemMapper.selectList(new LambdaQueryWrapper<MaintenanceItem>().in(MaintenanceItem::getId, ids));
        if (items.size() != ids.size()) return null;
        if (items.stream().anyMatch(item -> (item.getDeviceLedgerId() != null && !deviceId.equals(item.getDeviceLedgerId())) || !(frequencyType.equals(item.getFrequencyType()) || "ALL".equals(item.getFrequencyType()))))
            return null;
        Map<Long, MaintenanceItem> itemMap = items.stream().collect(Collectors.toMap(MaintenanceItem::getId, item -> item));
        Set<Long> existingIds = recordId == null ? Collections.emptySet() : deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, recordId)).stream().map(DeviceMaintenanceItem::getMaintenanceItemId).collect(Collectors.toSet());
        if (items.stream().anyMatch(item -> (item.getDeleted() != null && item.getDeleted() == 1 || item.getIsActive() == null || item.getIsActive() != 1) && !existingIds.contains(item.getId())))
            return null;
        return ids.stream().map(itemMap::get).toList();
    }

    private void saveRecordItems(DeviceMaintenance record, List<MaintenanceItem> selectedItems) {
        for (int i = 0; i < selectedItems.size(); i++) {
            MaintenanceItem source = selectedItems.get(i);
            DeviceMaintenanceItem item = new DeviceMaintenanceItem();
            item.setDeviceMaintenanceId(record.getId());
            item.setMaintenanceItemId(source.getId());
            item.setItemProject(source.getItemProject());
            item.setItemName(source.getItemName());
            item.setItemStatus(0);
            item.setSortNum(i);
            item.setTenantId(record.getTenantId());
            item.setDeptId(record.getDeptId());
            deviceMaintenanceItemMapper.insert(item);
        }
    }

    private AjaxResult updateRecordItems(DeviceMaintenanceDto request, DeviceMaintenance record) {
        AjaxResult validation = validateRecordItems(request, record);
        if (validation != null) return validation;
        List<DeviceMaintenanceItem> current = deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, record.getId()));
        Map<Long, DeviceMaintenanceItem> currentById = current.stream().collect(Collectors.toMap(DeviceMaintenanceItem::getId, item -> item));
        for (DeviceMaintenanceItem requested : request.getMaintenanceItems()) {
            DeviceMaintenanceItem item = currentById.get(requested.getId());
            int status = requested.getItemStatus() == null ? 0 : requested.getItemStatus();
            item.setItemStatus(status);
            if (requested.getRemarks() != null) item.setRemarks(requested.getRemarks());
            item.setCompletedBy(status == 1 ? request.getMaintenanceActuallyName() : null);
            item.setCompletedTime(status == 1 ? LocalDateTime.now() : null);
            deviceMaintenanceItemMapper.updateById(item);
        }
        return null;
    }

    private AjaxResult validateRecordItems(DeviceMaintenanceDto request, DeviceMaintenance record) {
        List<DeviceMaintenanceItem> requestedItems = request.getMaintenanceItems();
        if (requestedItems.stream().anyMatch(item -> item == null || item.getId() == null || (item.getItemStatus() != null && (item.getItemStatus() < 0 || item.getItemStatus() > 2)))) {
            return AjaxResult.error("保养项目状态无效");
        }
        List<DeviceMaintenanceItem> current = deviceMaintenanceItemMapper.selectList(new LambdaQueryWrapper<DeviceMaintenanceItem>().eq(DeviceMaintenanceItem::getDeviceMaintenanceId, record.getId()));
        Set<Long> currentIds = current.stream().map(DeviceMaintenanceItem::getId).collect(Collectors.toSet());
        Set<Long> requestedIds = requestedItems.stream().map(DeviceMaintenanceItem::getId).collect(Collectors.toSet());
        if (requestedIds.size() != current.size() || !requestedIds.equals(currentIds)) {
            return AjaxResult.error("保养项目清单已变化，请刷新后重试");
        }
        return null;
    }
}

 src/main/java/com/ruoyi/device/service/impl/MaintenanceItemServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
package com.ruoyi.device.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.device.mapper.MaintenanceItemMapper;
import com.ruoyi.device.pojo.MaintenanceItem;
import com.ruoyi.device.service.MaintenanceItemService;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@Service
@RequiredArgsConstructor
public class MaintenanceItemServiceImpl
        extends ServiceImpl<MaintenanceItemMapper, MaintenanceItem>
        implements MaintenanceItemService {

    private static final List<String> VALID_FREQUENCIES = List.of(
            "DAILY",
            "WEEKLY",
            "MONTHLY",
            "QUARTERLY",
            "ALL"
    );

    private final MaintenanceItemMapper maintenanceItemMapper;

    @Override
    public List<MaintenanceItem> listActive() {
        return list(new LambdaQueryWrapper<MaintenanceItem>()
                .eq(MaintenanceItem::getDeleted, 0)
                .eq(MaintenanceItem::getIsActive, 1)
                .orderByAsc(MaintenanceItem::getSortNum)
                .orderByAsc(MaintenanceItem::getId));
    }

    @Override
    public List<MaintenanceItem> list(MaintenanceItem query) {
        LambdaQueryWrapper<MaintenanceItem> wrapper = buildQueryWrapper(query, false)
                .orderByDesc(MaintenanceItem::getId);
        return maintenanceItemMapper.selectList(wrapper);
    }

    @Override
    public Page<MaintenanceItem> page(
            long pageNum,
            long pageSize,
            boolean includeCommon,
            MaintenanceItem query
    ) {
        long safePageNum = Math.max(pageNum, 1);
        long safePageSize = Math.min(Math.max(pageSize, 1), 100);

        LambdaQueryWrapper<MaintenanceItem> wrapper = buildQueryWrapper(query, includeCommon)
                .orderByAsc(MaintenanceItem::getSortNum)
                .orderByAsc(MaintenanceItem::getId);
        return maintenanceItemMapper.selectPage(new Page<>(safePageNum, safePageSize), wrapper);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void createItem(MaintenanceItem item) {
        if (!isValid(item)) {
            throw new ServiceException("保养项目、保养内容和频率不能为空或无效");
        }

        normalize(item);
        item.setDeleted(0);
        if (existsName(item, null)) {
            throw new ServiceException("该设备和频率下已存在同名保养内容");
        }

        if (maintenanceItemMapper.insert(item) <= 0) {
            throw new ServiceException("新增保养项目失败");
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateItem(MaintenanceItem item) {
        if (item == null || item.getId() == null || !isValid(item)) {
            throw new ServiceException("保养项目、保养内容和频率不能为空或无效");
        }

        MaintenanceItem existingItem = maintenanceItemMapper.selectById(item.getId());
        if (existingItem == null || Integer.valueOf(1).equals(existingItem.getDeleted())) {
            throw new ServiceException("保养项目不存在");
        }

        normalize(item);
        if (existsName(item, item.getId())) {
            throw new ServiceException("该设备和频率下已存在同名保养内容");
        }

        existingItem.setItemProject(item.getItemProject());
        existingItem.setItemName(item.getItemName());
        existingItem.setDeviceLedgerId(item.getDeviceLedgerId());
        existingItem.setFrequencyType(item.getFrequencyType());
        existingItem.setSortNum(item.getSortNum() == null ? 0 : item.getSortNum());
        existingItem.setIsActive(item.getIsActive() == null ? existingItem.getIsActive() : item.getIsActive());
        existingItem.setRemarks(item.getRemarks());

        if (maintenanceItemMapper.updateById(existingItem) <= 0) {
            throw new ServiceException("修改保养项目失败");
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteItem(Long id) {
        if (id == null) {
            throw new ServiceException("保养项目编号不能为空");
        }

        MaintenanceItem item = maintenanceItemMapper.selectById(id);
        if (item == null || Integer.valueOf(1).equals(item.getDeleted())) {
            throw new ServiceException("保养项目不存在");
        }

        item.setDeleted(1);
        item.setIsActive(0);
        if (maintenanceItemMapper.updateById(item) <= 0) {
            throw new ServiceException("删除保养项目失败");
        }
    }

    private LambdaQueryWrapper<MaintenanceItem> buildQueryWrapper(
            MaintenanceItem query,
            boolean includeCommon
    ) {
        MaintenanceItem filter = query == null ? new MaintenanceItem() : query;
        LambdaQueryWrapper<MaintenanceItem> wrapper = new LambdaQueryWrapper<MaintenanceItem>()
                .eq(MaintenanceItem::getDeleted, 0);

        if (StringUtils.isNotBlank(filter.getItemName())) {
            wrapper.like(MaintenanceItem::getItemName, filter.getItemName().trim());
        }
        if (StringUtils.isNotBlank(filter.getItemProject())) {
            wrapper.like(MaintenanceItem::getItemProject, filter.getItemProject().trim());
        }
        if (filter.getIsActive() != null) {
            wrapper.eq(MaintenanceItem::getIsActive, filter.getIsActive());
        }
        if (filter.getDeviceLedgerId() != null) {
            if (includeCommon) {
                wrapper.and(condition -> condition
                        .eq(MaintenanceItem::getDeviceLedgerId, filter.getDeviceLedgerId())
                        .or()
                        .isNull(MaintenanceItem::getDeviceLedgerId));
            } else {
                wrapper.eq(MaintenanceItem::getDeviceLedgerId, filter.getDeviceLedgerId());
            }
        }
        if (StringUtils.isNotBlank(filter.getFrequencyType())) {
            if (includeCommon) {
                wrapper.and(condition -> condition
                        .eq(MaintenanceItem::getFrequencyType, filter.getFrequencyType())
                        .or()
                        .eq(MaintenanceItem::getFrequencyType, "ALL"));
            } else {
                wrapper.eq(MaintenanceItem::getFrequencyType, filter.getFrequencyType());
            }
        }

        return wrapper;
    }

    private boolean isValid(MaintenanceItem item) {
        return item != null
                && StringUtils.isNotBlank(item.getItemProject())
                && StringUtils.isNotBlank(item.getItemName())
                && StringUtils.isNotBlank(item.getFrequencyType())
                && VALID_FREQUENCIES.contains(item.getFrequencyType());
    }

    private void normalize(MaintenanceItem item) {
        item.setItemProject(item.getItemProject().trim());
        item.setItemName(item.getItemName().trim());
        item.setSortNum(item.getSortNum() == null ? 0 : item.getSortNum());
        item.setIsActive(item.getIsActive() == null ? 1 : item.getIsActive());
    }

    private boolean existsName(MaintenanceItem item, Long excludedId) {
        LambdaQueryWrapper<MaintenanceItem> wrapper = new LambdaQueryWrapper<MaintenanceItem>()
                .eq(MaintenanceItem::getDeleted, 0)
                .eq(MaintenanceItem::getItemName, item.getItemName())
                .eq(MaintenanceItem::getFrequencyType, item.getFrequencyType());

        if (item.getDeviceLedgerId() == null) {
            wrapper.isNull(MaintenanceItem::getDeviceLedgerId);
        } else {
            wrapper.eq(MaintenanceItem::getDeviceLedgerId, item.getDeviceLedgerId());
        }
        if (excludedId != null) {
            wrapper.ne(MaintenanceItem::getId, excludedId);
        }

        return maintenanceItemMapper.selectCount(wrapper) > 0;
    }
}

 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskJob.java

@@ -1,6 +1,11 @@
package com.ruoyi.device.service.impl;

import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.mapper.MaintenanceTaskItemMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceItemMapper;
import com.ruoyi.device.pojo.MaintenanceTaskItem;
import com.ruoyi.device.pojo.DeviceMaintenanceItem;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import lombok.RequiredArgsConstructor;
import org.quartz.*;
@@ -29,6 +34,12 @@
    @Autowired
    private JdbcTemplate jdbcTemplate;

    @Autowired
    private MaintenanceTaskItemMapper maintenanceTaskItemMapper;

    @Autowired
    private DeviceMaintenanceItemMapper deviceMaintenanceItemMapper;

    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
@@ -49,9 +60,26 @@
                throw new JobExecutionException("MaintenanceTaskJob找不到定时任务: " + taskId);
            }

            // 2. åˆ›å»ºå¹¶ä¿å­˜å·¡æ£€ä»»åŠ¡è®°å½• - è¿™å°±æ˜¯æ‚¨æä¾›çš„代码应该放的位置
            List<MaintenanceTaskItem> taskItems = maintenanceTaskItemMapper.selectByTaskId(timingTask.getId());
            if (taskItems.isEmpty()) {
                throw new JobExecutionException("保养任务未配置保养项目: " + taskId);
            }
            // æŒ‰ä»»åŠ¡é¡¹ç›®å¿«ç…§ç”Ÿæˆæœ¬æ¬¡ä¿å…»è®°å½•åŠé¡¹ç›®æ¸…单。
            DeviceMaintenance deviceMaintenance = createInspectionTask(timingTask);
            deviceMaintenanceService.save(deviceMaintenance);
            for (MaintenanceTaskItem taskItem : taskItems) {
                DeviceMaintenanceItem recordItem = new DeviceMaintenanceItem();
                recordItem.setDeviceMaintenanceId(deviceMaintenance.getId());
                recordItem.setMaintenanceTaskItemId(taskItem.getId());
                recordItem.setMaintenanceItemId(taskItem.getMaintenanceItemId());
                recordItem.setItemProject(taskItem.getItemProject());
                recordItem.setItemName(taskItem.getItemName());
                recordItem.setItemStatus(0);
                recordItem.setSortNum(taskItem.getSortNum());
                recordItem.setTenantId(deviceMaintenance.getTenantId());
                recordItem.setDeptId(timingTask.getDeptId());
                deviceMaintenanceItemMapper.insert(recordItem);
            }

            // 3. æ›´æ–°å®šæ—¶ä»»åŠ¡çš„执行时间
            if (!tasks.isEmpty()) {
@@ -230,14 +258,29 @@

        for (String dayStr : dayStrs) {
            switch (dayStr) {
                case "MON": days.add(DayOfWeek.MONDAY); break;
                case "TUE": days.add(DayOfWeek.TUESDAY); break;
                case "WED": days.add(DayOfWeek.WEDNESDAY); break;
                case "THU": days.add(DayOfWeek.THURSDAY); break;
                case "FRI": days.add(DayOfWeek.FRIDAY); break;
                case "SAT": days.add(DayOfWeek.SATURDAY); break;
                case "SUN": days.add(DayOfWeek.SUNDAY); break;
                default: throw new IllegalArgumentException("无效的星期几: " + dayStr);
                case "MON":
                    days.add(DayOfWeek.MONDAY);
                    break;
                case "TUE":
                    days.add(DayOfWeek.TUESDAY);
                    break;
                case "WED":
                    days.add(DayOfWeek.WEDNESDAY);
                    break;
                case "THU":
                    days.add(DayOfWeek.THURSDAY);
                    break;
                case "FRI":
                    days.add(DayOfWeek.FRIDAY);
                    break;
                case "SAT":
                    days.add(DayOfWeek.SATURDAY);
                    break;
                case "SUN":
                    days.add(DayOfWeek.SUNDAY);
                    break;
                default:
                    throw new IllegalArgumentException("无效的星期几: " + dayStr);
            }
        }


 src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java

@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.mapper.MaintenanceItemMapper;
import com.ruoyi.device.mapper.MaintenanceTaskItemMapper;
import com.ruoyi.device.pojo.MaintenanceItem;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.pojo.MaintenanceTaskItem;
import com.ruoyi.device.service.MaintenanceTaskService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.inspectiontask.pojo.TimingTask;
@@ -15,9 +19,18 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * @author :yys
@@ -29,13 +42,15 @@
public class MaintenanceTaskServiceImpl extends ServiceImpl<MaintenanceTaskMapper, MaintenanceTask> implements MaintenanceTaskService {

    private final MaintenanceTaskMapper maintenanceTaskMapper;
    private final MaintenanceItemMapper maintenanceItemMapper;
    private final MaintenanceTaskItemMapper maintenanceTaskItemMapper;
    private final SysUserMapper sysUserMapper;
    private final TimingTaskServiceImpl timingTaskService;
    private final MaintenanceTaskScheduler maintenanceTaskScheduler;

    @Override
    public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
       LambdaQueryWrapper<MaintenanceTask> queryWrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<MaintenanceTask> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(MaintenanceTask::getId);
        Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, queryWrapper);
        // 2. å¦‚果没有数据，直接返回空分页
@@ -65,11 +80,17 @@
                task.setRegistrant(userNickNameMap.getOrDefault(task.getRegistrantId(), "未知用户"));
            }
        });
        taskPage.getRecords().forEach(this::fillTaskItems);
        return AjaxResult.success(taskPage);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(MaintenanceTask maintenanceTask) {
        List<MaintenanceItem> selectedItems = getSelectedItems(maintenanceTask.getMaintenanceItemIds(), null, maintenanceTask.getTaskId(), maintenanceTask.getFrequencyType());
        List<MaintenanceTaskItem> customItems = normalizeCustomItems(maintenanceTask.getCustomItems());
        if (selectedItems == null || selectedItems.size() + customItems.size() == 0)
            return AjaxResult.error("请选择至少一个有效的保养项目");
        // è®¡ç®—首次执行时间
        TimingTask task = new TimingTask();
        task.setFrequencyType(maintenanceTask.getFrequencyType());
@@ -78,6 +99,7 @@
        maintenanceTask.setNextExecutionTime(firstExecutionTime);
        int insert = maintenanceTaskMapper.insert(maintenanceTask);
        if (insert > 0) {
            saveTaskItems(maintenanceTask, selectedItems, customItems);
            // åªæœ‰å½“ isActive ä¸º 1 æ—¶æ‰æ·»åŠ åˆ°å®šæ—¶ä»»åŠ¡è°ƒåº¦å™¨
            if (maintenanceTask.getIsActive() != null && maintenanceTask.getIsActive() == 1) {
                maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
@@ -87,11 +109,16 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
        MaintenanceTask maintenanceTask1 = maintenanceTaskMapper.selectById(maintenanceTask.getId());
        if (maintenanceTask1 == null) {
            return AjaxResult.warn("没有此数据");
        }
        List<MaintenanceItem> selectedItems = getSelectedItems(maintenanceTask.getMaintenanceItemIds(), maintenanceTask1.getId(), maintenanceTask.getTaskId(), maintenanceTask.getFrequencyType());
        List<MaintenanceTaskItem> customItems = normalizeCustomItems(maintenanceTask.getCustomItems());
        if (selectedItems == null || selectedItems.size() + customItems.size() == 0)
            return AjaxResult.error("请选择至少一个有效的保养项目");

        // ä¿å­˜æ—§çš„ isActive çŠ¶æ€
        Integer oldIsActive = maintenanceTask1.getIsActive();
@@ -100,6 +127,9 @@
        BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
        int update = maintenanceTaskMapper.updateById(maintenanceTask1);
        if (update > 0) {
            maintenanceTaskItemMapper.delete(new LambdaQueryWrapper<MaintenanceTaskItem>()
                    .eq(MaintenanceTaskItem::getMaintenanceTaskId, maintenanceTask1.getId()));
            saveTaskItems(maintenanceTask1, selectedItems, customItems);
            // å¤„理 isActive çŠ¶æ€å˜åŒ–
            if (newIsActive != null && newIsActive == 1) {
                // æ–°çŠ¶æ€ä¸ºå¯ç”¨ï¼šæ·»åŠ åˆ°å®šæ—¶ä»»åŠ¡è°ƒåº¦å™¨
@@ -134,8 +164,88 @@
        // å†ä»Žæ•°æ®åº“中删除记录
        int delete = maintenanceTaskMapper.deleteBatchIds(ids);
        if (delete > 0) {
            maintenanceTaskItemMapper.delete(new LambdaQueryWrapper<MaintenanceTaskItem>()
                    .in(MaintenanceTaskItem::getMaintenanceTaskId, ids));
        }
        if (delete > 0) {
            return AjaxResult.success("删除成功");
        }
        return AjaxResult.error("删除失败");
    }

    private List<MaintenanceTaskItem> normalizeCustomItems(List<MaintenanceTaskItem> customItems) {
        if (customItems == null) return new ArrayList<>();
        return customItems.stream().filter(Objects::nonNull)
                .filter(item -> item.getItemProject() != null && !item.getItemProject().trim().isEmpty()
                        && item.getItemName() != null && !item.getItemName().trim().isEmpty())
                .peek(item -> {
                    item.setItemProject(item.getItemProject().trim());
                    item.setItemName(item.getItemName().trim());
                })
                .toList();
    }

    private List<MaintenanceItem> getSelectedItems(List<Long> ids, Long taskId, Long deviceId, String frequencyType) {
        if (deviceId == null || !List.of("DAILY", "WEEKLY", "MONTHLY", "QUARTERLY").contains(frequencyType)
                || (ids != null && new HashSet<>(ids).size() != ids.size())) return null;
        if (ids == null || ids.isEmpty()) return new ArrayList<>();
        List<MaintenanceItem> items = maintenanceItemMapper.selectList(new LambdaQueryWrapper<MaintenanceItem>()
                .in(MaintenanceItem::getId, ids));
        if (items.size() != ids.size()) return null;
        if (items.stream().anyMatch(item -> (item.getDeviceLedgerId() != null && !deviceId.equals(item.getDeviceLedgerId()))
                || !(frequencyType.equals(item.getFrequencyType()) || "ALL".equals(item.getFrequencyType()))))
            return null;
        Map<Long, MaintenanceItem> itemMap = new HashMap<>();
        items.forEach(item -> itemMap.put(item.getId(), item));
        Set<Long> existingIds = taskId == null ? Collections.emptySet() : maintenanceTaskItemMapper.selectList(
                        new LambdaQueryWrapper<MaintenanceTaskItem>()
                                .eq(MaintenanceTaskItem::getMaintenanceTaskId, taskId))
                .stream().map(MaintenanceTaskItem::getMaintenanceItemId).collect(Collectors.toSet());
        if (items.stream().anyMatch(item -> (item.getDeleted() != null && item.getDeleted() == 1
                || item.getIsActive() == null || item.getIsActive() != 1)
                && !existingIds.contains(item.getId()))) return null;
        List<MaintenanceItem> sorted = new ArrayList<>();
        ids.forEach(id -> sorted.add(itemMap.get(id)));
        return sorted;
    }

    private void saveTaskItems(MaintenanceTask task, List<MaintenanceItem> selectedItems, List<MaintenanceTaskItem> customItems) {
        for (int i = 0; i < selectedItems.size(); i++) {
            MaintenanceItem source = selectedItems.get(i);
            MaintenanceTaskItem link = new MaintenanceTaskItem();
            link.setMaintenanceTaskId(task.getId());
            link.setMaintenanceItemId(source.getId());
            link.setItemProject(source.getItemProject());
            link.setItemName(source.getItemName());
            link.setSortNum(i);
            link.setTenantId(task.getTenantId());
            link.setDeptId(task.getDeptId());
            maintenanceTaskItemMapper.insert(link);
        }
        for (int i = 0; i < customItems.size(); i++) {
            MaintenanceTaskItem link = new MaintenanceTaskItem();
            link.setMaintenanceTaskId(task.getId());
            link.setMaintenanceItemId(null);
            link.setItemProject(customItems.get(i).getItemProject());
            link.setItemName(customItems.get(i).getItemName());
            link.setSortNum(selectedItems.size() + i);
            link.setTenantId(task.getTenantId());
            link.setDeptId(task.getDeptId());
            maintenanceTaskItemMapper.insert(link);
        }
        task.setMaintenanceItems(maintenanceTaskItemMapper.selectList(new LambdaQueryWrapper<MaintenanceTaskItem>()
                .eq(MaintenanceTaskItem::getMaintenanceTaskId, task.getId())
                .orderByAsc(MaintenanceTaskItem::getSortNum)));
        task.setMaintenanceItemIds(task.getMaintenanceItems().stream()
                .map(MaintenanceTaskItem::getMaintenanceItemId).filter(Objects::nonNull).collect(Collectors.toList()));
    }

    private void fillTaskItems(MaintenanceTask task) {
        List<MaintenanceTaskItem> items = maintenanceTaskItemMapper.selectList(new LambdaQueryWrapper<MaintenanceTaskItem>()
                .eq(MaintenanceTaskItem::getMaintenanceTaskId, task.getId())
                .orderByAsc(MaintenanceTaskItem::getSortNum));
        task.setMaintenanceItems(items);
        task.setMaintenanceItemIds(items.stream().map(MaintenanceTaskItem::getMaintenanceItemId).filter(Objects::nonNull)
                .collect(Collectors.toList()));
    }
}