yys 转移设备代码

云

2 天以前 41e45a0d768d7f01dcdde1ffe619259ba666ec56

yys
转移设备代码

 src/main/java/com/ruoyi/common/enums/FileNameType.java

@@ -1,7 +1,5 @@
package com.ruoyi.common.enums;

import com.ruoyi.approve.pojo.ApproveProcess;

public enum FileNameType {

    SALE(1),      // é”€å”®
@@ -11,7 +9,11 @@
    MEASURING(5),  //计量器具台账
    MEASURINGRecord(6),//计量器具台账记录
    ApproveNode(7),  //协同审批节点审核
    ApproveProcess(8);  //协同审批主数据
    ApproveProcess(8),//协同审批主数据
    SHIP(9),//发货台账
    INSPECTION_PRODUCTION_BEFORE(10),
    INSPECTION_PRODUCTION_AFTER(11),
    INSPECTION(12);//巡检 ç”Ÿäº§å‰

    private final int value;


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

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;

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

@@ -2,22 +2,22 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
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.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.ehcache.spi.service.MaintainableService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -25,7 +25,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备台账管理")
@@ -87,6 +86,7 @@

    @PostMapping("import")
    @ApiModelProperty("导入设备台账")
    @Log(title = "设备台账导入", businessType = BusinessType.IMPORT)
    public AjaxResult importData(MultipartFile file) throws IOException {
        Boolean b = deviceLedgerService.importData(file);
        if (b) {
@@ -95,6 +95,14 @@
        return AjaxResult.error("导入失败");
    }

    @PostMapping("/downloadTemplate")
    @ApiModelProperty("下载导入模板")
    @Log(title = "设备台账导入", businessType = BusinessType.IMPORT)
    public void downloadTemplate(HttpServletResponse response) {
        ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
        util.importTemplateExcel(response, "设备台账模板");
    }


    @GetMapping("getDeviceLedger")
    @ApiModelProperty("获取设备台账")

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

@@ -3,13 +3,12 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -17,8 +16,8 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备保养")
@RestController
@@ -87,4 +86,27 @@
    }


    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æ¯æœˆæŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/monthlyAmount")
    @ApiModelProperty("按年份查询每月报修金额（按设备台账分组）")
    public AjaxResult getMonthlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<DeviceMonthlyRepairTableDTO> result = deviceMaintenanceService.getMonthlyRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/yearlyAmount")
    @ApiModelProperty("按年份查询报修金额（按设备台账分组）")
    public AjaxResult yearlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<RepairAmountGroupDTO> result = deviceMaintenanceService.getRepairAmountByYear(year);
        return AjaxResult.success(result);
    }


}

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

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

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 å‰ç«¯æŽ§åˆ¶å™¨
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@RestController
@RequestMapping("/maintenanceTaskFile")
@Api(tags = "设备保养附件")
public class DeviceMaintenanceFileController {

    @Resource
    private DeviceMaintenanceFileService deviceMaintenanceFileService;


    /**
     * æ–°å¢ž
     * @param deviceMaintenanceFile
     * @return
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
    }

    /**
     * åˆ é™¤
     * @param ids
     * @return
     */
    @DeleteMapping("/del")
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
        }
        //删除检验附件
        return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
    }

    /**
     *分页查询
     * @param page
     * @param deviceMaintenanceFile
     * @return
     */
    @GetMapping("/listPage")
    public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
        return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
    }


}

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

@@ -2,8 +2,9 @@


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
@@ -14,8 +15,8 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@Api(tags = "设备报修管理")
@RequestMapping("/device/repair")
@@ -75,4 +76,27 @@
    public void export(HttpServletResponse response, Long[] ids) {
        deviceRepairService.export(response, ids);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æ¯æœˆæŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/monthlyAmount")
    @ApiModelProperty("按年份查询每月报修金额（按设备台账分组）")
    public AjaxResult getMonthlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<DeviceMonthlyRepairTableDTO> result = deviceRepairService.getMonthlyRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

    /**
     * æŒ‰å¹´ä»½æŸ¥è¯¢æŠ¥ä¿®é‡‘额（按设备台账分组）
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如2025）
     */
    @GetMapping("/yearlyAmount")
    @ApiModelProperty("按年份查询报修金额（按设备台账分组）")
    public AjaxResult yearlyAmount(@RequestParam(defaultValue = "2025", required = true,name = "year") String year) {
        List<RepairAmountGroupDTO> result = deviceRepairService.getRepairAmountByYear(year);
        return AjaxResult.success(result);
    }

}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.MaintenanceTask;
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.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

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


    @Autowired
    private MaintenanceTaskService maintenanceTaskService;


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


    @PostMapping("/add")
    @ApiOperation(value = "添加设备保养定时任务")
    @Log(title = "设备保养定时任务", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
        return maintenanceTaskService.add(maintenanceTask);
    }

    @PostMapping("/update")
    @ApiOperation(value = "修改设备保养定时任务")
    @Log(title = "设备保养定时任务", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody MaintenanceTask maintenanceTask) {
        return maintenanceTaskService.updateByMaintenanceTaskId(maintenanceTask);
    }

    @DeleteMapping("/delete")
    @ApiOperation(value = "删除设备保养定时任务")
    @Log(title = "设备保养定时任务", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        return maintenanceTaskService.delete(ids);
    }


}

 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java

@@ -51,10 +51,6 @@
     */
    private BigDecimal number;

    private String deviceBrand;

    private String storageLocation;

    /**
     * å«ç¨Žå•ä»·
     */
@@ -75,6 +71,10 @@
     */
    private BigDecimal unTaxIncludingPriceTotal;

    private String deviceBrand;

    private String storageLocation;

    /**
     * å½•å…¥æ—¶é—´
     */

 src/main/java/com/ruoyi/device/dto/DeviceMaintenanceDto.java

@@ -5,8 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@Data
public class DeviceMaintenanceDto {
@@ -16,6 +16,9 @@

    private Long id;

    @ApiModelProperty("设备保养金额")
    private BigDecimal maintenancePrice;

    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;


 src/main/java/com/ruoyi/device/dto/DeviceMonthlyRepairTableDTO.java

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author :yys
 * @date : 2025/11/19 10:58
 */
@Data
public class DeviceMonthlyRepairTableDTO {

    private String deviceName; // è®¾å¤‡åç§°
    private BigDecimal month1; // 1月金额
    private BigDecimal month2; // 2月金额
    private BigDecimal month3; // 3月金额
    private BigDecimal month4; // 4月金额
    private BigDecimal month5; // 5月金额
    private BigDecimal month6; // 6月金额
    private BigDecimal month7; // 7月金额
    private BigDecimal month8; // 8月金额
    private BigDecimal month9; // 9月金额
    private BigDecimal month10; // 10月金额
    private BigDecimal month11; // 11月金额
    private BigDecimal month12; // 12月金额
    private BigDecimal total; // æ€»è®¡

}

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -6,18 +6,28 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@Data
public class DeviceRepairDto {

    @ApiModelProperty("督办人")
    private String supervisoryName;

    @ApiModelProperty("审核人")
    private String auditName;

    @ApiModelProperty("设备报修id")
    private Long id;

    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("报修金额")
    private BigDecimal repairPrice;

    @ApiModelProperty("设备名称")
    private String deviceName;


 src/main/java/com/ruoyi/device/dto/RepairAmountGroupDTO.java

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

import lombok.Data;

import java.math.BigDecimal;

/**
 * @author :yys
 * @date : 2025/11/19 10:44
 */
@Data
public class RepairAmountGroupDTO {

    // å¹´æœˆï¼ˆæ ¼å¼ï¼šMM）
    private String repairYearMonth;
    // è®¾å¤‡å°è´¦id
    private Long deviceLedgerId;
    // è®¾å¤‡å°è´¦åç§°
    private String deviceName;
    // è¯¥è®¾å¤‡æŠ¥ä¿®é‡‘额总和
    private BigDecimal totalRepairPrice;

}

 src/main/java/com/ruoyi/device/execl/DeviceLedgerExeclDto.java

@@ -1,13 +1,9 @@
package com.ruoyi.device.execl;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;

@Data
public class DeviceLedgerExeclDto {
@@ -41,31 +37,31 @@
     * æ•°é‡
     */
    @Excel(name = "数量",sort = 5)
    private BigDecimal number;
    private Integer number;

    /**
     * å«ç¨Žå•ä»·
     * èµ„产原值
     */
    @Excel(name = "含税单价",sort = 6)
    @Excel(name = "资产原值",sort = 6)
    private BigDecimal taxIncludingPriceUnit;
//
//    /**
//     * å«ç¨Žæ€»ä»·
//     */
//    @Excel(name = "含税总价",sort = 7)
//    private BigDecimal taxIncludingPriceTotal;
//
//    /**
//     * ç¨ŽçŽ‡
//     */
//    @Excel(name = "税率",sort = 8)
//    private BigDecimal taxRate;

    /**
     * å«ç¨Žæ€»ä»·
     */
    @Excel(name = "含税总价",sort = 7)
    private BigDecimal taxIncludingPriceTotal;

    /**
     * ç¨ŽçŽ‡
     */
    @Excel(name = "税率",sort = 8)
    private BigDecimal taxRate;

    /**
     * ä¸å«ç¨Žæ€»ä»·
     */
    @Excel(name = "不含税总价",sort = 9)
    private BigDecimal unTaxIncludingPriceTotal;
//    /**
//     * ä¸å«ç¨Žæ€»ä»·
//     */
//    @Excel(name = "不含税总价",sort = 9)
//    private BigDecimal unTaxIncludingPriceTotal;
//
//    /**
//     * å½•å…¥æ—¶é—´
@@ -75,6 +71,18 @@
//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime createTime;

    /**
     * å•ä½
     */
    @Excel(name = "存放地点",sort = 7)
    private String storageLocation;

    /**
     * å•ä½
     */
    @Excel(name = "设备品牌",sort = 8)
    private String deviceBrand;



    /**

 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -17,6 +18,11 @@
    @Excel(name = "设备名称")
    private String deviceName;


    @ApiModelProperty("设备保养金额")
    @Excel(name = "设备保养金额")
    private BigDecimal maintenancePrice;

    @Excel(name = "规格型号")
    @ApiModelProperty("规格型号")
    private String deviceModel;

 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java

@@ -1,12 +1,11 @@
package com.ruoyi.device.execl;


import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@@ -17,6 +16,10 @@
    @Excel(name = "设备名称")
    private String deviceName;

    @ApiModelProperty("报修金额")
    @Excel(name = "报修金额")
    private BigDecimal repairPrice;

    @ApiModelProperty("设备型号")
    @Excel(name = "设备型号")
    private String deviceModel;

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

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

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

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 Mapper æŽ¥å£
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@Mapper
public interface DeviceMaintenanceFileMapper extends BaseMapper<DeviceMaintenanceFile> {

}

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

@@ -6,9 +6,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@@ -21,4 +23,31 @@

    @InterceptorIgnore(tenantLine = "true")
    List<DeviceMaintenance> list1(Long id);

    /**
     * æŒ‰â€œæŒ‡å®šå¹´ä»½çš„年月+设备台账id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  DATE_FORMAT(maintenance_actually_time, '%m') AS repairYearMonth, " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(maintenance_price) AS totalRepairPrice " +
            "FROM device_maintenance " +
            "WHERE DATE_FORMAT(maintenance_actually_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id,DATE_FORMAT(maintenance_actually_time, '%Y-%m')  " +
            "ORDER BY repairYearMonth ASC") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByMonthAndDeviceLedger(@Param("year") String year);

    /**
     * æŒ‰â€œè®¾å¤‡å°è´¦id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(maintenance_price) AS totalRepairPrice " +
            "FROM device_maintenance " +
            "WHERE DATE_FORMAT(maintenance_actually_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id ") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByDeviceLedger(@Param("year") String year);

}

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

@@ -4,13 +4,44 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);

    DeviceRepairDto detailById(Long id);


    /**
     * æŒ‰â€œæŒ‡å®šå¹´ä»½çš„年月+设备台账id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  DATE_FORMAT(repair_time, '%m') AS repairYearMonth, " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(repair_price) AS totalRepairPrice " +
            "FROM device_repair " +
            "WHERE DATE_FORMAT(repair_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id,DATE_FORMAT(repair_time, '%Y-%m')  " +
            "ORDER BY repairYearMonth ASC") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByMonthAndDeviceLedger(@Param("year") String year);

    /**
     * æŒ‰â€œè®¾å¤‡å°è´¦id”分组，求和报修金额
     * @param year å‰ç«¯ä¼ å…¥çš„年份（如"2025"）
     */
    @Select("SELECT " +
            "  device_ledger_id AS deviceLedgerId, " +
            "  SUM(repair_price) AS totalRepairPrice " +
            "FROM device_repair " +
            "WHERE DATE_FORMAT(repair_time, '%Y') = #{year} " + // åªæŸ¥è¯¢æŒ‡å®šå¹´ä»½çš„数据
            "GROUP BY device_ledger_id ") // æŒ‰æœˆä»½æŽ’序，方便前端展示
    List<RepairAmountGroupDTO> groupByDeviceLedger(@Param("year") String year);
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.device.pojo.MaintenanceTask;

/**
 * @author :yys
 * @date : 2025/12/22 14:56
 */
public interface MaintenanceTaskMapper extends BaseMapper<MaintenanceTask> {
}

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

@@ -12,7 +12,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * è®¾å¤‡å°è´¦å®žä½“ç±»

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

@@ -1,15 +1,16 @@
package com.ruoyi.device.pojo;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.*;
import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;

@Data
@TableName("device_maintenance")
@@ -22,6 +23,24 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("设备保养金额")
    private BigDecimal maintenancePrice;

    @ApiModelProperty("保养任务id")
    private Long maintenanceTaskId;

    @ApiModelProperty(value = "频次")
    private String frequencyType;

    @ApiModelProperty(value = "频次详情")
    private String frequencyDetail;

    @ApiModelProperty(value = "下次执行时间")
    private LocalDateTime nextExecutionTime;

    @ApiModelProperty(value = "最后执行时间")
    private LocalDateTime lastExecutionTime;


    private String deviceName;


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

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

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@Getter
@Setter
@TableName("device_maintenance_file")
@ApiModel(value = "DeviceMaintenanceFile对象", description = "设备保养记录附件")
public class DeviceMaintenanceFile implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("文件名称")
    private String name;

    @ApiModelProperty("文件路径")
    private String url;

    @ApiModelProperty("文件大小")
    private Integer fileSize;

    @ApiModelProperty("设备保养记录ID")
    private Integer deviceMaintenanceId;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty("创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Long createUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty("修改用户")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateUser;

    @ApiModelProperty("租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;
}

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

@@ -4,14 +4,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import nonapi.io.github.classgraph.json.Id;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;

@@ -24,6 +21,9 @@

    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("报修金额")
    private BigDecimal repairPrice;

    private String deviceName;

@@ -49,9 +49,15 @@
    @ApiModelProperty("维修结果")
    private String maintenanceResult;

    @ApiModelProperty("状态 0 å¾…ç»´ä¿® 1完结")
    @ApiModelProperty("状态 0 å¾…ç»´ä¿® 1完结 2待审核 3审核不通过")
    private Integer status;

    @ApiModelProperty("审核人")
    private String auditName;

    @ApiModelProperty("督办人")
    private String supervisoryName;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

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

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 com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDate;
import java.time.LocalDateTime;

/**
 * @author :yys
 * @date : 2025/9/19 10:27
 */
@Data
@ApiModel
@TableName("maintenance_task")
public class MaintenanceTask {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "规格型号")
    private String deviceModel;

    /**
     * ä¸»é”®ID
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "设备名称")
    @Excel(name = "保养任务名称")
    private String taskName;

    @ApiModelProperty(value = "设备id")
    private Long taskId;

    @ApiModelProperty(value = "批量设备id")
    private String taskIds;

    @ApiModelProperty(value = "频次")
    @Excel(name = "频次")
    private String frequencyType;

    @ApiModelProperty(value = "频次详情")
    @Excel(name = "开始日期与时间")
    private String frequencyDetail;

    @ApiModelProperty(value = "下次执行时间")
    private LocalDateTime nextExecutionTime;

    @ApiModelProperty(value = "最后执行时间")
    private LocalDateTime lastExecutionTime;

    @ApiModelProperty(value = "是否激活")
    private boolean isActive;

    @ApiModelProperty(value = "备注")
    @Excel(name = "备注")
    private String remarks;

    @ApiModelProperty(value = "录入人id")
    private Long registrantId;

    @ApiModelProperty(value = "录入人")
    @Excel(name = "录入人")
    private String registrant;

    @ApiModelProperty(value = "录入日期")
    @Excel(name = "录入日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate registrationDate;

    @ApiModelProperty(value = "状态 å¾…审核 å®¡æ ¸ä¸é€šè¿‡ å®¡æ ¸é€šè¿‡")
    private String status;

    @ApiModelProperty(value = "审核人")
    @Excel(name = "审核人")
    private String auditName;

    @ApiModelProperty("督办人")
    private String supervisoryName;

    @ApiModelProperty(value = "软删除标志，0=未删除，1=已删除")
    private Integer deleted;

    @TableField(exist = false)
    private String dateStr;

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

    @ApiModelProperty(value = "记录创建时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
//    @JsonFormat(pattern = "yyyy-MM-dd")
//    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "最后修改该记录的用户")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "记录最后更新时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
    private Long tenantId;

}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 æœåŠ¡ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
public interface DeviceMaintenanceFileService extends IService<DeviceMaintenanceFile> {

}

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

@@ -10,7 +10,6 @@

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;

public interface IDeviceLedgerService  extends IService<DeviceLedger> {
    IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);

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

@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.framework.web.domain.AjaxResult;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

public interface IDeviceMaintenanceService extends IService<DeviceMaintenance> {

@@ -20,4 +23,8 @@
    void export(HttpServletResponse response, Long[] ids);

    DeviceMaintenanceDto detailById(Long id);

    List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year);

    List<RepairAmountGroupDTO> getRepairAmountByYear(String year);
}

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

@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.framework.web.domain.AjaxResult;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


public interface IDeviceRepairService extends IService<DeviceRepair> {
@@ -21,4 +24,8 @@
    void export(HttpServletResponse response, Long[] ids);

    DeviceRepairDto detailById(Long id);

    List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year);

    List<RepairAmountGroupDTO> getRepairAmountByYear(String year);
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.framework.web.domain.AjaxResult;

import java.util.List;

/**
 * @author :yys
 * @date : 2025/12/22 14:56
 */
public interface MaintenanceTaskService extends IService<MaintenanceTask> {
    AjaxResult listPage(Page page, MaintenanceTask maintenanceTask);

    AjaxResult add(MaintenanceTask maintenanceTask);

    AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);

    AjaxResult delete(List<Long> ids);
}

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

@@ -10,7 +10,6 @@
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
import com.ruoyi.device.service.IDeviceRepairService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
@@ -24,7 +22,7 @@

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.ZoneOffset;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -47,11 +45,11 @@

    @Override
    public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
        LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
        deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceModel,deviceLedger.getDeviceModel());
        if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
            return AjaxResult.error("设备型号已存在");
        }
//        LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
//        deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceModel,deviceLedger.getDeviceModel());
//        if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
//            return AjaxResult.error("设备型号已存在");
//        }
        boolean save = this.save(deviceLedger);
        if (save){
            return AjaxResult.success();
@@ -106,15 +104,18 @@
        ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
        List<DeviceLedgerExeclDto> userList = util.importExcel(file.getInputStream());
        userList.forEach(c -> {
            DeviceLedger deviceLedger = new DeviceLedger();
            SysUser sysUser = sysUserMapper.selectUserByUserName(c.getCreateUser());
            if (sysUser!=null) {
                deviceLedger.setCreateUser(sysUser.getUserId().intValue());
            }else {
                deviceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
            for (Integer i = 0; i < c.getNumber(); i++) {
                DeviceLedger deviceLedger = new DeviceLedger();
                SysUser sysUser = sysUserMapper.selectUserByUserName(c.getCreateUser());
                if (sysUser!=null) {
                    deviceLedger.setCreateUser(sysUser.getUserId().intValue());
                }else {
                    deviceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
                }
                BeanUtils.copyProperties(c,deviceLedger);
                deviceLedger.setNumber(new BigDecimal(1));
                deviceLedgerMapper.insert(deviceLedger);
            }
            BeanUtils.copyProperties(c,deviceLedger);
            deviceLedgerMapper.insert(deviceLedger);
        });

        return true;

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.device.mapper.DeviceMaintenanceFileMapper;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * è®¾å¤‡ä¿å…»é™„件 æœåŠ¡å®žçŽ°ç±»
 * </p>
 *
 * @author èŠ¯å¯¼è½¯ä»¶ï¼ˆæ±Ÿè‹ï¼‰æœ‰é™å…¬å¸
 * @since 2026-01-27 09:48:09
 */
@Service
public class DeviceMaintenanceFileServiceImpl extends ServiceImpl<DeviceMaintenanceFileMapper, DeviceMaintenanceFile> implements DeviceMaintenanceFileService {

}

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

@@ -7,18 +7,24 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;


@Service
@@ -73,4 +79,96 @@

        return deviceMaintenanceMapper.detailById(id);
    }

    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceMaintenanceMapper.groupByMonthAndDeviceLedger(year);
        // 1. å…ˆé€šè¿‡è®¾å¤‡å°è´¦id关联设备名称（如果RepairAmountGroupDTO没有deviceName，需先查设备台账表）
        // è¿™é‡Œå‡è®¾ä½ èƒ½é€šè¿‡deviceLedgerId获取到deviceName，比如：
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        // 2. æŒ‰è®¾å¤‡åç§°åˆ†ç»„，存储每个设备的各月金额
        Map<String, DeviceMonthlyRepairTableDTO> deviceTableMap = new HashMap<>();

        for (RepairAmountGroupDTO dto : repairAmountGroupDTOS) {
            // æ‹†åˆ†repairYearMonth为月份（如"2025-01" â†’ "01" â†’ 1）
            String yearMonth = dto.getRepairYearMonth(); // æ ¼å¼ï¼šyyyy-MM
            int month = Integer.parseInt(yearMonth); // æå–MM并转成数字（1-12）

            // èŽ·å–设备名称
            String deviceName = deviceNameMap.get(dto.getDeviceLedgerId());
            if (deviceName == null) {
                deviceName = "未知设备"; // å…œåº•
            }

            // ä»ŽMap中获取该设备的表格DTO，不存在则初始化
            DeviceMonthlyRepairTableDTO tableDTO = deviceTableMap.getOrDefault(deviceName, new DeviceMonthlyRepairTableDTO());
            tableDTO.setDeviceName(deviceName);

            // æ ¹æ®æœˆä»½å¡«å……金额（BigDecimal默认0，避免null）
            BigDecimal amount = dto.getTotalRepairPrice() == null ? BigDecimal.ZERO : dto.getTotalRepairPrice();
            switch (month) {
                case 1: tableDTO.setMonth1(amount); break;
                case 2: tableDTO.setMonth2(amount); break;
                case 3: tableDTO.setMonth3(amount); break;
                case 4: tableDTO.setMonth4(amount); break;
                case 5: tableDTO.setMonth5(amount); break;
                case 6: tableDTO.setMonth6(amount); break;
                case 7: tableDTO.setMonth7(amount); break;
                case 8: tableDTO.setMonth8(amount); break;
                case 9: tableDTO.setMonth9(amount); break;
                case 10: tableDTO.setMonth10(amount); break;
                case 11: tableDTO.setMonth11(amount); break;
                case 12: tableDTO.setMonth12(amount); break;
            }

            // é‡æ–°æ”¾å…¥Map
            deviceTableMap.put(deviceName, tableDTO);
        }


        // 3. è®¡ç®—每个设备的总计，并补充序号
        List<DeviceMonthlyRepairTableDTO> resultList = new ArrayList<>();
        for (DeviceMonthlyRepairTableDTO tableDTO : deviceTableMap.values()) {
            // è®¡ç®—总计：1-12月金额相加
            BigDecimal total = Stream.of(
                            tableDTO.getMonth1(), tableDTO.getMonth2(), tableDTO.getMonth3(),
                            tableDTO.getMonth4(), tableDTO.getMonth5(), tableDTO.getMonth6(),
                            tableDTO.getMonth7(), tableDTO.getMonth8(), tableDTO.getMonth9(),
                            tableDTO.getMonth10(), tableDTO.getMonth11(), tableDTO.getMonth12()
                    )
                    .map(amt -> amt == null ? BigDecimal.ZERO : amt)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            tableDTO.setTotal(total);
            resultList.add(tableDTO);
        }
        return resultList;
    }

    @Override
    public List<RepairAmountGroupDTO> getRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceMaintenanceMapper.groupByDeviceLedger(year);
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        Map<Long, String> finalDeviceNameMap = deviceNameMap;
        repairAmountGroupDTOS.forEach(dto -> {
            dto.setDeviceName(finalDeviceNameMap.get(dto.getDeviceLedgerId()));
        });
        return repairAmountGroupDTOS;
    }
}

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

@@ -6,11 +6,12 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.dto.DeviceMonthlyRepairTableDTO;
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.dto.RepairAmountGroupDTO;
import com.ruoyi.device.execl.DeviceRepairExeclDto;
import com.ruoyi.device.mapper.DeviceDefectRecordMapper;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
@@ -21,11 +22,13 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@Service
@AllArgsConstructor
@@ -49,6 +52,7 @@
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        deviceRepair.setDeviceName(byId.getDeviceName());
        deviceRepair.setDeviceModel(byId.getDeviceModel());
        deviceRepair.setStatus(2);
        boolean save = this.save(deviceRepair);
        if (save){
            return AjaxResult.success();
@@ -116,4 +120,96 @@
        return deviceRepairMapper.detailById(id);
    }

    @Autowired
    private DeviceLedgerMapper deviceLedgerMapper;

    @Override
    public List<DeviceMonthlyRepairTableDTO> getMonthlyRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceRepairMapper.groupByMonthAndDeviceLedger(year);
        // 1. å…ˆé€šè¿‡è®¾å¤‡å°è´¦id关联设备名称（如果RepairAmountGroupDTO没有deviceName，需先查设备台账表）
        // è¿™é‡Œå‡è®¾ä½ èƒ½é€šè¿‡deviceLedgerId获取到deviceName，比如：
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        // 2. æŒ‰è®¾å¤‡åç§°åˆ†ç»„，存储每个设备的各月金额
        Map<String, DeviceMonthlyRepairTableDTO> deviceTableMap = new HashMap<>();

        for (RepairAmountGroupDTO dto : repairAmountGroupDTOS) {
            // æ‹†åˆ†repairYearMonth为月份（如"2025-01" â†’ "01" â†’ 1）
            String yearMonth = dto.getRepairYearMonth(); // æ ¼å¼ï¼šyyyy-MM
            int month = Integer.parseInt(yearMonth); // æå–MM并转成数字（1-12）

            // èŽ·å–设备名称
            String deviceName = deviceNameMap.get(dto.getDeviceLedgerId());
            if (deviceName == null) {
                deviceName = "未知设备"; // å…œåº•
            }

            // ä»ŽMap中获取该设备的表格DTO，不存在则初始化
            DeviceMonthlyRepairTableDTO tableDTO = deviceTableMap.getOrDefault(deviceName, new DeviceMonthlyRepairTableDTO());
            tableDTO.setDeviceName(deviceName);

            // æ ¹æ®æœˆä»½å¡«å……金额（BigDecimal默认0，避免null）
            BigDecimal amount = dto.getTotalRepairPrice() == null ? BigDecimal.ZERO : dto.getTotalRepairPrice();
            switch (month) {
                case 1: tableDTO.setMonth1(amount); break;
                case 2: tableDTO.setMonth2(amount); break;
                case 3: tableDTO.setMonth3(amount); break;
                case 4: tableDTO.setMonth4(amount); break;
                case 5: tableDTO.setMonth5(amount); break;
                case 6: tableDTO.setMonth6(amount); break;
                case 7: tableDTO.setMonth7(amount); break;
                case 8: tableDTO.setMonth8(amount); break;
                case 9: tableDTO.setMonth9(amount); break;
                case 10: tableDTO.setMonth10(amount); break;
                case 11: tableDTO.setMonth11(amount); break;
                case 12: tableDTO.setMonth12(amount); break;
            }

            // é‡æ–°æ”¾å…¥Map
            deviceTableMap.put(deviceName, tableDTO);
        }


        // 3. è®¡ç®—每个设备的总计，并补充序号
        List<DeviceMonthlyRepairTableDTO> resultList = new ArrayList<>();
        for (DeviceMonthlyRepairTableDTO tableDTO : deviceTableMap.values()) {
            // è®¡ç®—总计：1-12月金额相加
            BigDecimal total = Stream.of(
                            tableDTO.getMonth1(), tableDTO.getMonth2(), tableDTO.getMonth3(),
                            tableDTO.getMonth4(), tableDTO.getMonth5(), tableDTO.getMonth6(),
                            tableDTO.getMonth7(), tableDTO.getMonth8(), tableDTO.getMonth9(),
                            tableDTO.getMonth10(), tableDTO.getMonth11(), tableDTO.getMonth12()
                    )
                    .map(amt -> amt == null ? BigDecimal.ZERO : amt)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
            tableDTO.setTotal(total);
            resultList.add(tableDTO);
        }
        return resultList;
    }

    @Override
    public List<RepairAmountGroupDTO> getRepairAmountByYear(String year) {
        List<RepairAmountGroupDTO> repairAmountGroupDTOS = deviceRepairMapper.groupByDeviceLedger(year);
        Map<Long, String> deviceNameMap = new HashMap<>(); // key:deviceLedgerId, value:deviceName
        // ï¼ˆå®žé™…需调用设备台账的Mapper查询：deviceNameMap = deviceLedgerMapper.listAll().stream().collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName))）
        deviceNameMap = deviceLedgerMapper.selectList(null)
                .stream()
                .collect(Collectors.toMap(DeviceLedger::getId, DeviceLedger::getDeviceName));
        if(CollectionUtils.isEmpty(deviceNameMap)){
            return Collections.emptyList();
        }
        Map<Long, String> finalDeviceNameMap = deviceNameMap;
        repairAmountGroupDTOS.forEach(dto -> {
            dto.setDeviceName(finalDeviceNameMap.get(dto.getDeviceLedgerId()));
        });
        return repairAmountGroupDTOS;
    }

}

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

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

import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.pojo.MaintenanceTask;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.YearMonth;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

@Component
@DisallowConcurrentExecution // ç¦æ­¢å¹¶å‘执行同一个Job
public class MaintenanceTaskJob implements Job, Serializable {
    private static final long serialVersionUID = 1L; // å¿…须定义序列化ID

    @Autowired
    private DeviceMaintenanceServiceImpl deviceMaintenanceService;

    @Autowired
    private JdbcTemplate jdbcTemplate;

    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
        // ä¿®å¤ç±»åž‹è½¬æ¢é”™è¯¯ï¼Œæ­£ç¡®èŽ·å–taskId
        Long taskId = jobDataMap.getLong("maintenanceTaskId");

        try {
            // 3. å°è¯•æŸ¥è¯¢ä½ çš„业务数据
            // é€šè¿‡JDBC模板查询定时任务信息，使用参数化查询防止SQL注入
            String yourSql = "SELECT * FROM maintenance_task where id = ? and status = '审核通过'";
            List<MaintenanceTask> tasks = jdbcTemplate.query(
                    yourSql,
                    new BeanPropertyRowMapper<>(MaintenanceTask.class),
                    taskId
            );
            MaintenanceTask timingTask = tasks.isEmpty() ? null : tasks.get(0);
            if (timingTask == null) {
                throw new JobExecutionException("MaintenanceTaskJob找不到定时任务: " + taskId);
            }

            // 2. åˆ›å»ºå¹¶ä¿å­˜å·¡æ£€ä»»åŠ¡è®°å½• - è¿™å°±æ˜¯æ‚¨æä¾›çš„代码应该放的位置
            List<DeviceMaintenance> deviceMaintenance = createInspectionTask(timingTask);
            deviceMaintenanceService.saveBatch(deviceMaintenance);

            // 3. æ›´æ–°å®šæ—¶ä»»åŠ¡çš„执行时间
            if (!tasks.isEmpty()) {
                MaintenanceTask task = tasks.get(0);

                // æ›´æ–°æœ€åŽæ‰§è¡Œæ—¶é—´ä¸ºå½“前时间
                LocalDateTime lastExecutionTime = LocalDateTime.now();

                // è®¡ç®—下次执行时间
                LocalDateTime nextExecutionTime = calculateNextExecutionTime(
                        task.getFrequencyType(),
                        task.getFrequencyDetail(),
                        lastExecutionTime
                );

                // æ‰§è¡Œæ›´æ–°æ“ä½œ
                String updateSql = "UPDATE maintenance_task " +
                        "SET last_execution_time = ?, next_execution_time = ? " +
                        "WHERE id = ?";

                jdbcTemplate.update(
                        updateSql,
                        lastExecutionTime,
                        nextExecutionTime,
                        taskId
                );
            }
        } catch (Exception e) {
            throw new JobExecutionException(e);
        }
    }

    // è¿™å°±æ˜¯æ‚¨æä¾›çš„代码封装成的方法
    private List<DeviceMaintenance> createInspectionTask(MaintenanceTask timingTask) {
        List<DeviceMaintenance> inspectionTasks = new java.util.ArrayList<>();
        String[] split = timingTask.getTaskIds().split(",");
        String[] split1 = timingTask.getTaskName().split(",");
        String[] split2 = timingTask.getDeviceModel().split(",");
        int i = 0;
        for (String s : split) {
            DeviceMaintenance inspectionTask = new DeviceMaintenance();
            // å¤åˆ¶åŸºæœ¬å±žæ€§
            inspectionTask.setDeviceName(split1[i]);
            inspectionTask.setMaintenanceTaskId(timingTask.getId());
            inspectionTask.setDeviceLedgerId(Long.parseLong(s));
            inspectionTask.setMaintenancePlanTime(LocalDateTime.now());
            inspectionTask.setFrequencyType(timingTask.getFrequencyType());
            inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
            inspectionTask.setTenantId(timingTask.getTenantId());
            inspectionTask.setStatus(0);
            inspectionTask.setDeviceModel(split2[i]);
            inspectionTask.setCreateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
            inspectionTask.setUpdateTime(LocalDateTime.now());
            inspectionTask.setCreateTime(LocalDateTime.now());
            inspectionTask.setUpdateUser(Integer.parseInt(timingTask.getRegistrantId().toString()));
            i++;
            inspectionTasks.add(inspectionTask);
        }

        return inspectionTasks;
    }


    /**
     * è®¡ç®—下次执行时间
     */
    private LocalDateTime calculateNextExecutionTime(String frequencyType,
                                                     String frequencyDetail,
                                                     LocalDateTime currentTime) {
        try {
            switch (frequencyType) {
                case "DAILY":
                    return calculateDailyNextTime(frequencyDetail, currentTime);
                case "WEEKLY":
                    return calculateWeeklyNextTime(frequencyDetail, currentTime);
                case "MONTHLY":
                    return calculateMonthlyNextTime(frequencyDetail, currentTime);
                case "QUARTERLY":
                    return calculateQuarterlyNextTime(frequencyDetail, currentTime);
                default:
                    throw new IllegalArgumentException("不支持的频率类型: " + frequencyType);
            }
        } catch (Exception e) {
            throw new RuntimeException("计算下次执行时间失败: " + e.getMessage(), e);
        }
    }

    /**
     * è®¡ç®—每日任务的下次执行时间
     */
    private LocalDateTime calculateDailyNextTime(String timeStr, LocalDateTime current) {
        LocalTime executionTime = LocalTime.parse(timeStr); // è§£æžæ ¼å¼ "HH:mm"
        LocalDateTime nextTime = LocalDateTime.of(current.toLocalDate(), executionTime);

        // å¦‚果今天的时间已过，则安排明天
        return current.isBefore(nextTime) ? nextTime : nextTime.plusDays(1);
    }

    /**
     * è®¡ç®—每周任务的下次执行时间
     */
    private LocalDateTime calculateWeeklyNextTime(String detail, LocalDateTime current) {
        String[] parts = detail.split(",");
        String dayOfWeekStr = parts[0];  // å¦‚ "MON" æˆ– "MON|WED|FRI"
        LocalTime time = LocalTime.parse(parts[1]); // æ—¶é—´éƒ¨åˆ†

        // è§£æžæ˜ŸæœŸå‡ (支持多个星期)
        Set<DayOfWeek> targetDays = parseDayOfWeeks(dayOfWeekStr);

        // ä»Žå½“前时间开始找下一个符合条件的星期几
        LocalDateTime nextTime = current;
        while (true) {
            nextTime = nextTime.plusDays(1);
            if (targetDays.contains(nextTime.getDayOfWeek())) {
                return LocalDateTime.of(nextTime.toLocalDate(), time);
            }

            // é˜²æ­¢æ— é™å¾ªçŽ¯(理论上不会发生)
            if (nextTime.isAfter(current.plusYears(1))) {
                throw new RuntimeException("无法找到下次执行时间");
            }
        }
    }

    /**
     * è®¡ç®—每月任务的下次执行时间
     */
    private LocalDateTime calculateMonthlyNextTime(String detail, LocalDateTime current) {
        String[] parts = detail.split(",");
        int dayOfMonth = Integer.parseInt(parts[0]);
        LocalTime time = LocalTime.parse(parts[1]);

        // ä»Žä¸‹ä¸ªæœˆå¼€å§‹è®¡ç®—
        LocalDateTime nextTime = current.plusMonths(1)
                .withDayOfMonth(Math.min(dayOfMonth, current.plusMonths(1).toLocalDate().lengthOfMonth()))
                .with(time);

        return nextTime;
    }

    /**
     * è®¡ç®—每季度任务的下次执行时间
     */
    private LocalDateTime calculateQuarterlyNextTime(String detail, LocalDateTime current) {
        String[] parts = detail.split(",");
        int quarterMonth = Integer.parseInt(parts[0]); // 1=第1个月，2=第2个月，3=第3个月
        int dayOfMonth = Integer.parseInt(parts[1]);
        LocalTime time = LocalTime.parse(parts[2]);

        // è®¡ç®—当前季度
        int currentQuarter = (current.getMonthValue() - 1) / 3 + 1;
        int currentMonthInQuarter = (current.getMonthValue() - 1) % 3 + 1;

        YearMonth targetYearMonth;
        if (currentMonthInQuarter < quarterMonth) {
            // æœ¬å­£åº¦å†…还有执行机会
            targetYearMonth = YearMonth.from(current)
                    .plusMonths(quarterMonth - currentMonthInQuarter);
        } else {
            // éœ€è¦åˆ°ä¸‹ä¸ªå­£åº¦
            targetYearMonth = YearMonth.from(current)
                    .plusMonths(3 - currentMonthInQuarter + quarterMonth);
        }

        // å¤„理月末日期
        int adjustedDay = Math.min(dayOfMonth, targetYearMonth.lengthOfMonth());

        return LocalDateTime.of(
                targetYearMonth.getYear(),
                targetYearMonth.getMonthValue(),
                adjustedDay,
                time.getHour(),
                time.getMinute()
        );
    }

    /**
     * è§£æžæ˜ŸæœŸå‡ å­—符串
     */
    private Set<DayOfWeek> parseDayOfWeeks(String dayOfWeekStr) {
        Set<DayOfWeek> days = new HashSet<>();
        String[] dayStrs = dayOfWeekStr.split("\\|");

        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);
            }
        }

        return days;
    }
}

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

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

import com.ruoyi.device.pojo.MaintenanceTask;
import lombok.extern.slf4j.Slf4j;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeParseException;
import java.util.Arrays;
import java.util.Date;
import java.util.stream.Collectors;

/**
 * @author :yys
 * @date : 2025/12/22 15:16
 */
@Service
@Slf4j
public class MaintenanceTaskScheduler {

    @Autowired
    private Scheduler scheduler;

    /**
     * æ·»åŠ æ–°ä»»åŠ¡åˆ°è°ƒåº¦å™¨
     */
    public void scheduleMaintenanceTask(MaintenanceTask task){
        try {
            JobDetail jobDetail = buildJobDetail(task);
            Trigger trigger = buildJobTrigger(task, jobDetail);
            scheduler.scheduleJob(jobDetail, trigger);
        }catch (SchedulerException e){
            log.error("SchedulerException scheduleMaintenanceTask ERROR",e);
            throw new RuntimeException(e);
        }
    }

    /**
     * æ›´æ–°å·²æœ‰ä»»åŠ¡
     */
    public void rescheduleMaintenanceTask(MaintenanceTask task){
       try{
           TriggerKey triggerKey = new TriggerKey("triggerMaintenanceTask_" + task.getId());

           // èŽ·å–现有触发器并转换为 CronTrigger
           Trigger oldTrigger = scheduler.getTrigger(triggerKey);
           if (!(oldTrigger instanceof CronTrigger)) {
               throw new SchedulerException("Existing trigger is not a CronTrigger");
           }

           // 3. æž„建CronTrigger，确保持久化配置
           CronTrigger newTrigger = TriggerBuilder.newTrigger()
                   .withIdentity(triggerKey)                // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                   .withDescription(task.getTaskName() + "_TRIGGER") // è§¦å‘器描述
                   .forJob(oldTrigger.getJobKey())                       // å…³è”对应的Job
                   .withSchedule(CronScheduleBuilder
                           .cronSchedule(convertToCronExpression(task)) // é”™è¿‡æ‰§è¡Œæ—¶çš„策略（根据业务调整）
                   )
                   // 4. è®¾ç½®å¼€å§‹æ—¶é—´ï¼ˆè‹¥ä¸ºnull则立即生效）
                   .startAt(task.getNextExecutionTime() != null
                           ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                           : new Date())
                   .build();
           scheduler.rescheduleJob(triggerKey, newTrigger);
       }catch (SchedulerException e){
           log.error("SchedulerException rescheduleMaintenanceTask ERROR",e);
           throw new RuntimeException(e);
       }
    }

    /**
     * æš‚停任务
     */
    public void pauseMaintenanceTask(Long taskId) throws SchedulerException {
        JobKey jobKey = new JobKey("MaintenanceTask_" + taskId);
        scheduler.pauseJob(jobKey);
    }

    /**
     * æ¢å¤ä»»åŠ¡
     */
    public void resumeMaintenanceTask(Long taskId) throws SchedulerException {
        JobKey jobKey = new JobKey("MaintenanceTask_" + taskId);
        scheduler.resumeJob(jobKey);
    }

    /**
     * åˆ é™¤ä»»åŠ¡
     */
    public void unscheduleMaintenanceTask(Long taskId){
        try {
            JobKey jobKey = new JobKey("MaintenanceTask_" + taskId);
            scheduler.deleteJob(jobKey);
        }catch (SchedulerException e){
            log.error("SchedulerException unscheduleMaintenanceTask ERROR",e);
            throw new RuntimeException(e);
        }
    }

    private JobDetail buildJobDetail(MaintenanceTask task) {
        // 1. æž„建唯一JobKey（基于任务ID，确保重启后能识别）
        JobKey jobKey = new JobKey("MaintenanceTask_" + task.getId());

        // 2. å°è£…任务数据（仅使用基本类型，确保可序列化）
        JobDataMap jobDataMap = new JobDataMap();
        jobDataMap.put("maintenanceTaskId", task.getId());           // ä»»åŠ¡ID（Long，可序列化）
        jobDataMap.put("taskName", task.getTaskName());   // ä»»åŠ¡åç§°ï¼ˆString，可序列化）
        jobDataMap.put("taskType", task.getFrequencyType()); // ä»»åŠ¡ç±»åž‹ï¼ˆString）
        // æŒ‰éœ€æ·»åŠ å…¶ä»–必要的基本类型参数

        // 3. æž„建JobDetail，设置持久化相关属性
        return JobBuilder.newJob(MaintenanceTaskJob.class)
                .withIdentity(jobKey)                    // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                .withDescription(task.getTaskName())     // ä»»åŠ¡æè¿°ï¼Œå­˜å…¥æ•°æ®åº“
                .usingJobData(jobDataMap)                // ç»‘定任务数据
                .storeDurably(true)                          // å³ä½¿æ²¡æœ‰è§¦å‘器关联也持久化保存
                .requestRecovery(true)                   // å½“调度器崩溃后恢复时，重新执行未完成的任务
                .build();
    }

    private Trigger buildJobTrigger(MaintenanceTask task, JobDetail jobDetail) {
        // 1. æž„建唯一TriggerKey（基于任务ID）
        TriggerKey triggerKey = new TriggerKey("triggerMaintenanceTask_" + task.getId());

        // 2. ç”ŸæˆCron表达式（原逻辑不变）
        String cronExpression = convertToCronExpression(task);

        // 3. æž„建CronTrigger，确保持久化配置
        return TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)                // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                .withDescription(task.getTaskName() + "_TRIGGER") // è§¦å‘器描述
                .forJob(jobDetail)                       // å…³è”对应的Job
                .withSchedule(CronScheduleBuilder
                        .cronSchedule(cronExpression)
                        .withMisfireHandlingInstructionDoNothing() // é”™è¿‡æ‰§è¡Œæ—¶çš„策略（根据业务调整）
                )
                // 4. è®¾ç½®å¼€å§‹æ—¶é—´ï¼ˆè‹¥ä¸ºnull则立即生效）
                .startAt(task.getNextExecutionTime() != null
                        ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                        : new Date())
                .build();
    }
    private String convertToCronExpression(MaintenanceTask task) {
        // å‚数校验
        if (task == null || task.getFrequencyType() == null || task.getFrequencyDetail() == null) {
            throw new IllegalArgumentException("任务参数不能为空");
        }

        // ä½¿ç”¨switch确保条件互斥
        String frequencyType = task.getFrequencyType().toUpperCase(); // ç»Ÿä¸€è½¬ä¸ºå¤§å†™æ¯”较
        switch (frequencyType) {
            case "DAILY":
                return convertDailyToCron(task.getFrequencyDetail());
            case "WEEKLY":
                return convertWeeklyToCron(task.getFrequencyDetail());
            case "MONTHLY":
                return convertMonthlyToCron(task.getFrequencyDetail());
            case "QUARTERLY":
                return convertQuarterlyToCron(task.getFrequencyDetail());
            default:
                throw new IllegalArgumentException("不支持的频率类型: " + task.getFrequencyType());
        }
    }

    // æ¯æ—¥ä»»åŠ¡è½¬æ¢
    private String convertDailyToCron(String frequencyDetail) {
        LocalTime time = parseTime(frequencyDetail);
        return String.format("0 %d %d * * ?", time.getMinute(), time.getHour());
    }

    // æ¯å‘¨ä»»åŠ¡è½¬æ¢
    private String convertWeeklyToCron(String frequencyDetail) {
        String[] parts = validateAndSplit(frequencyDetail, ",", 2);
        String daysOfWeek = convertDayNamesToCron(parts[0]);
        LocalTime time = parseTime(parts[1]);
        return String.format("0 %d %d ? * %s", time.getMinute(), time.getHour(), daysOfWeek);
    }

    // æ¯æœˆä»»åŠ¡è½¬æ¢
    private String convertMonthlyToCron(String frequencyDetail) {
        String[] parts = validateAndSplit(frequencyDetail, ",", 2);
        int day = validateDayOfMonth(parts[0]);
        LocalTime time = parseTime(parts[1]);
        return String.format("0 %d %d %d * ?", time.getMinute(), time.getHour(), day);
    }

    // æ¯å­£åº¦ä»»åŠ¡è½¬æ¢
    private String convertQuarterlyToCron(String frequencyDetail) {
        String[] parts = validateAndSplit(frequencyDetail, ",", 3);
        int month = validateMonth(parts[0]);  // éªŒè¯æœˆä»½(1-12)
        int day = validateDayOfMonth(parts[1]);  // éªŒè¯æ—¥æœŸ
        LocalTime time = parseTime(parts[2]);  // è§£æžæ—¶é—´

        // è®¡ç®—季度起始月份(1月=1, 4月=4, 7月=7, 10月=10)
        int quarterStartMonth = ((month - 1) / 3) * 3 + 1;

        return String.format("0 %d %d %d %d/3 ?",
                time.getMinute(),
                time.getHour(),
                day,
                quarterStartMonth);
    }

    // æ–°å¢žéªŒè¯æœˆä»½çš„方法(1-12)
    private int validateMonth(String monthStr) {
        try {
            int month = Integer.parseInt(monthStr);
            if (month < 1 || month > 12) {
                throw new IllegalArgumentException("月份必须在1-12之间");
            }
            return month;
        } catch (NumberFormatException e) {
            throw new IllegalArgumentException("无效的月份格式");
        }
    }

    // è¾…助方法：解析时间
    private LocalTime parseTime(String timeStr) {
        try {
            return LocalTime.parse(timeStr);
        } catch (DateTimeParseException e) {
            throw new IllegalArgumentException("时间格式必须为HH:mm", e);
        }
    }

    // è¾…助方法：验证并分割字符串
    private String[] validateAndSplit(String input, String delimiter, int expectedParts) {
        String[] parts = input.split(delimiter);
        if (parts.length != expectedParts) {
            throw new IllegalArgumentException(
                    String.format("格式错误，应为%d部分用'%s'分隔", expectedParts, delimiter));
        }
        return parts;
    }

    // è¾…助方法：验证月份中的日
    private int validateDayOfMonth(String dayStr) {
        int day = Integer.parseInt(dayStr);
        if (day < 1 || day > 31) {
            throw new IllegalArgumentException("日期必须在1-31之间");
        }
        return day;
    }

    // è¾…助方法：验证季度中的月
    private int validateMonthInQuarter(String monthStr) {
        int month = Integer.parseInt(monthStr);
        if (month < 1 || month > 3) {
            throw new IllegalArgumentException("季度月份必须是1、2或3");
        }
        return month;
    }

    // è½¬æ¢æ˜ŸæœŸå‡ åç§°
    private String convertDayNamesToCron(String dayNames) {
        return Arrays.stream(dayNames.split("\\|"))
                .map(this::convertSingleDayName)
                .collect(Collectors.joining(","));
    }

    // è½¬æ¢å•ä¸ªæ˜ŸæœŸå‡ åç§°
    private String convertSingleDayName(String dayName) {
        switch (dayName.toUpperCase()) {
            case "MON": return "MON";
            case "TUE": return "TUE";
            case "WED": return "WED";
            case "THU": return "THU";
            case "FRI": return "FRI";
            case "SAT": return "SAT";
            case "SUN": return "SUN";
            default: throw new IllegalArgumentException("无效的星期几: " + dayName);
        }
    }
    
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.service.MaintenanceTaskService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.*;

/**
 * @author :yys
 * @date : 2025/12/22 14:57
 */
@Service
@Slf4j
public class MaintenanceTaskServiceImpl extends ServiceImpl<MaintenanceTaskMapper, MaintenanceTask> implements MaintenanceTaskService {

    @Autowired
    private MaintenanceTaskMapper maintenanceTaskMapper;

    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private TimingTaskServiceImpl timingTaskService;

    @Autowired
    private MaintenanceTaskScheduler maintenanceTaskScheduler;

    @Override
    public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
        Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
        // 2. å¦‚果没有数据，直接返回空分页
        if (taskPage.getRecords().isEmpty()) {
            return AjaxResult.success(taskPage);
        }

        // 3. æ”¶é›†æ‰€æœ‰éœ€è¦æŸ¥è¯¢çš„用户ID
        Set<Long> userIds = new HashSet<>();

        // æ”¶é›†ç™»è®°äººID
        taskPage.getRecords().forEach(task -> {
            if (task.getRegistrantId() != null) {
                userIds.add(task.getRegistrantId());
            }
        });

        // 4. æ‰¹é‡æŸ¥è¯¢ç”¨æˆ·ä¿¡æ¯
        Map<Long, String> userNickNameMap = new HashMap<>();
        if (!userIds.isEmpty()) {
            List<SysUser> users = sysUserMapper.selectUserByIds((new ArrayList<>(userIds)));
            users.forEach(user -> userNickNameMap.put(user.getUserId(), user.getNickName()));
        }
        taskPage.getRecords().forEach(task -> {
            // è®¾ç½®ç™»è®°äººæ˜µç§°
            if (task.getRegistrantId() != null) {
                task.setRegistrant(userNickNameMap.getOrDefault(task.getRegistrantId(), "未知用户"));
            }
        });
        return AjaxResult.success(taskPage);
    }

    @Override
    public AjaxResult add(MaintenanceTask maintenanceTask) {
        if(StringUtils.isEmpty(maintenanceTask.getAuditName())) {
            return AjaxResult.warn("请填写审核人");
        }
        maintenanceTask.setActive(true);
        // è®¡ç®—首次执行时间
        TimingTask task = new TimingTask();
        task.setFrequencyType(maintenanceTask.getFrequencyType());
        task.setFrequencyDetail(maintenanceTask.getFrequencyDetail());
        LocalDateTime firstExecutionTime = timingTaskService.calculateFirstExecutionTime(task);
        maintenanceTask.setNextExecutionTime(firstExecutionTime);
        maintenanceTask.setStatus("待审核");
        int insert = maintenanceTaskMapper.insert(maintenanceTask);
        if (insert > 0) {
            maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
        }
        return AjaxResult.success("添加成功");
    }

    @Override
    public AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
        MaintenanceTask maintenanceTask1 = maintenanceTaskMapper.selectById(maintenanceTask.getId());
        if (maintenanceTask1 == null) {
            return AjaxResult.warn("没有此数据");
        }
        BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
        int update = maintenanceTaskMapper.updateById(maintenanceTask1);
        if (update > 0) {
            maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
        }
        return AjaxResult.success("更新成功");
    }

    @Override
    public AjaxResult delete(List<Long> ids) {
        int delete = maintenanceTaskMapper.deleteBatchIds(ids);
        if (delete > 0) {
            ids.forEach(id -> {
                maintenanceTaskScheduler.unscheduleMaintenanceTask(id);
            });
        }
        return AjaxResult.success("删除成功");
    }
}

 src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java

@@ -6,17 +6,16 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
 * @author :yys
@@ -60,7 +59,7 @@
    @PostMapping("/addOrEditInspectionTask")
    @ApiOperation("巡检任务表新增修改")
    @Transactional(rollbackFor = Exception.class)
    public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
    public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
        return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
    }


 src/main/java/com/ruoyi/inspectiontask/controller/QrCodeController.java

@@ -9,7 +9,6 @@
import com.ruoyi.inspectiontask.service.QrCodeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/ruoyi/inspectiontask/controller/QrCodeScanRecordController.java

@@ -9,7 +9,6 @@
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;


 src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java

@@ -10,7 +10,6 @@
import com.ruoyi.inspectiontask.service.TimingTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

 src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java

@@ -1,8 +1,7 @@
package com.ruoyi.inspectiontask.dto;

import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;

import java.util.List;
@@ -10,11 +9,22 @@
@Data
public class InspectionTaskDto extends InspectionTask {

    private List<StorageBlobDTO> storageBlobDTO;
    private List<StorageBlobDTO> beforeProduction;
    private List<StorageBlobDTO> afterProduction;
    private List<StorageBlobDTO> productionIssues;
//    private List<StorageBlobDTO> storageBlobDTO;
//    private List<StorageBlobDTO> beforeProduction;
//    private List<StorageBlobDTO> afterProduction;
//    private List<StorageBlobDTO> productionIssues;

    private List<StorageAttachment> attachments;
    private List<String> tempFileIds;
    private List<CommonFile> commonFileList; //生产中
    private List<CommonFile> commonFileListAfter;  //生产后
    private List<CommonFile> commonFileListBefore; //生产前

    private String searchAll;

    private String status;

    private String dateStr;

//    private List<StorageAttachment> attachments;

}

 src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java

@@ -67,22 +67,22 @@
    private Integer deleted;

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

    @ApiModelProperty(value = "记录创建时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "最后修改该记录的用户")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "记录最后更新时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

    @ApiModelProperty(value = "租户")

 src/main/java/com/ruoyi/inspectiontask/pojo/QrCodeScanRecord.java

@@ -53,21 +53,21 @@
    private Integer deleted;

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

    @ApiModelProperty(value = "记录创建时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "最后修改该记录的用户")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty(value = "记录最后更新时间")
    @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT_UPDATE)
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private LocalDateTime updateTime;

}

 src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java

@@ -23,6 +23,9 @@
@TableName("timing_task")
public class TimingTask {

    @TableField(exist = false)
    private String searchAll;

    private static final long serialVersionUID = 1L;

    /**
@@ -38,6 +41,9 @@
    @ApiModelProperty(value = "设备id")
    private Integer taskId;

    @ApiModelProperty(value = "批量设备id")
    private String taskIds;

    @ApiModelProperty(value = "巡检人")
    @Excel(name = "执行巡检人")
    private String inspectorIds;

 src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java

@@ -6,6 +6,8 @@
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.pojo.InspectionTask;

import java.io.IOException;

/**
 * @author :yys
 * @date : 2025/9/19 10:49
@@ -14,7 +16,7 @@

    IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto);

    int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto);
    int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) throws IOException;

    int delByIds(Long[] ids);
}

 src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java

@@ -8,9 +8,9 @@
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.mapper.StorageAttachmentMapper;
import com.ruoyi.basic.mapper.StorageBlobMapper;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.service.StorageAttachmentService;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.MinioUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -21,16 +21,18 @@
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

import static com.ruoyi.common.constant.StorageAttachmentConstants.StorageAttachmentFile;
import static com.ruoyi.common.enums.StorageAttachmentRecordType.InspectionTasks;

/**
 * @author :yys
@@ -59,9 +61,20 @@
    @Autowired
    private SysUserMapper sysUserMapper;

    @Autowired
    private CommonFileServiceImpl commonFileService;

    @Autowired
    private CommonFileMapper commonFileMapper;

    @Override
    public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
        LambdaQueryWrapper<InspectionTask> queryWrapper = new LambdaQueryWrapper<>();
        if(inspectionTaskDto != null){
            if(StringUtils.isNotEmpty(inspectionTaskDto.getSearchAll())){
                queryWrapper.like(InspectionTask::getTaskName, inspectionTaskDto.getSearchAll());
            }
        }
        queryWrapper.orderByDesc(InspectionTask::getCreateTime);
        IPage<InspectionTask> entityPage = inspectionTaskMapper.selectPage(page, queryWrapper);

@@ -81,9 +94,6 @@
        } else {
            sysUserMap = new HashMap<>();
        }
        //巡检人ids
        List<String> inspectorIds = entityPage.getRecords().stream().map(InspectionTask::getInspectorId).collect(Collectors.toList());

        //获取所有不重复的用户ID
        Set<Long> allUserIds = entityPage.getRecords().stream()
                .map(InspectionTask::getInspectorId) // èŽ·å–"2,3"这样的字符串
@@ -110,22 +120,13 @@
                        (existing, replacement) -> existing));

        //处理附件
        Map<Long, List<StorageAttachment>> attachmentsMap = storageAttachmentMapper.selectList(new LambdaQueryWrapper<StorageAttachment>().in(StorageAttachment::getRecordId, ids)
                        .eq(StorageAttachment::getRecordType, InspectionTasks.ordinal()))
                .stream()
                .collect(Collectors.groupingBy(StorageAttachment::getRecordId));
        //  æ‰¹é‡æŸ¥è¯¢æ‰€æœ‰éœ€è¦çš„文件数据
        Set<Long> blobIds = attachmentsMap.values()
                .stream()
                .flatMap(List::stream)
                .map(StorageAttachment::getStorageBlobId)
                .collect(Collectors.toSet());
        Map<Long, StorageBlob> blobMap = blobIds.isEmpty()
                ? Collections.emptyMap()
                : storageBlobMapper.selectList(new LambdaQueryWrapper<StorageBlob>().in(StorageBlob::getId, blobIds))
                .stream()
                .collect(Collectors.toMap(StorageBlob::getId, Function.identity()));

        List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
                .in(CommonFile::getCommonId, ids)
                .in(CommonFile::getType, Arrays.asList(FileNameType.INSPECTION.getValue(), FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue(), FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())));
        if(commonFiles == null){
            commonFiles = new ArrayList<>();
        }
        List<CommonFile> finalCommonFiles1 = commonFiles;
        List<InspectionTaskDto> dtoList = entityPage.getRecords().stream().map(inspectionTask -> {
            InspectionTaskDto dto = new InspectionTaskDto();
            BeanUtils.copyProperties(inspectionTask, dto);  // å¤åˆ¶ä¸»å¯¹è±¡å±žæ€§
@@ -151,38 +152,16 @@
                dto.setInspector(inspectorNames);
            }

            // åˆå§‹åŒ–三个附件列表
            dto.setBeforeProduction(new ArrayList<>());
            dto.setAfterProduction(new ArrayList<>());
            dto.setProductionIssues(new ArrayList<>());

            // å¤„理附件分类
            Optional.ofNullable(attachmentsMap.get(inspectionTask.getId()))
                    .orElse(Collections.emptyList())
                    .forEach(attachment -> {
                        StorageBlob blob = blobMap.get(attachment.getStorageBlobId());
                        if (blob != null) {
                            // åˆ›å»ºé™„件DTO
                            StorageBlobDTO blobDto = createBlobDto(blob);

                            // æ ¹æ®type分类
                            switch ((int) blob.getType().longValue()) {
                                case 0:
                                    dto.getBeforeProduction().add(blobDto);
                                    break;
                                case 1:
                                    dto.getAfterProduction().add(blobDto);
                                    break;
                                case 2:
                                    dto.getProductionIssues().add(blobDto);
                                    break;
                                default:
                                    // å¯é€‰ï¼šè®°å½•æœªåˆ†ç±»ç±»åž‹
                                    break;
                            }
                        }
                    });

            dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
            List<CommonFile> finalCommonFiles = finalCommonFiles1.stream().filter(commonFile -> commonFile.getCommonId().equals(inspectionTask.getId())).collect(Collectors.toList());
            dto.setCommonFileList(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList()));
            dto.setCommonFileListAfter(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList()));
            dto.setCommonFileListBefore(finalCommonFiles.stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList()));
            if(CollectionUtils.isNotEmpty(dto.getCommonFileList()) || CollectionUtils.isNotEmpty(dto.getCommonFileListAfter()) || CollectionUtils.isNotEmpty(dto.getCommonFileListBefore())){
                dto.setStatus("已巡检");
            }else{
                dto.setStatus("未巡检");
            }
            return dto;
        }).collect(Collectors.toList());

@@ -216,7 +195,7 @@
    }

    @Override
    public int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) {
    public int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) throws IOException {
        InspectionTask inspectionTask = new InspectionTask();
        BeanUtils.copyProperties(inspectionTaskDto, inspectionTask);
        inspectionTask.setRegistrantId(SecurityUtils.getLoginUser().getUserId());
@@ -228,20 +207,21 @@
            i = inspectionTaskMapper.updateById(inspectionTask);
        }

        if (inspectionTaskDto.getStorageBlobDTO() != null && !inspectionTaskDto.getStorageBlobDTO().isEmpty()) {
            List<StorageAttachment> attachments = new ArrayList<>();

            for (StorageBlobDTO storageBlobDTO : inspectionTaskDto.getStorageBlobDTO()) {
                StorageAttachment storageAttachment = new StorageAttachment(
                        StorageAttachmentFile,
                        (long) InspectionTasks.ordinal(),
                        inspectionTask.getId()
                );
                storageAttachment.setStorageBlobDTO(storageBlobDTO);
                attachments.add(storageAttachment);
            }
            storageAttachmentService.saveStorageAttachment(attachments, inspectionTask.getId(), InspectionTasks, StorageAttachmentFile);
        }
//        if (inspectionTaskDto.getStorageBlobDTO() != null && !inspectionTaskDto.getStorageBlobDTO().isEmpty()) {
//            List<StorageAttachment> attachments = new ArrayList<>();
//
//            for (StorageBlobDTO storageBlobDTO : inspectionTaskDto.getStorageBlobDTO()) {
//                StorageAttachment storageAttachment = new StorageAttachment(
//                        StorageAttachmentFile,
//                        (long) InspectionTasks.ordinal(),
//                        inspectionTask.getId()
//                );
//                storageAttachment.setStorageBlobDTO(storageBlobDTO);
//                attachments.add(storageAttachment);
//            }
//            storageAttachmentService.saveStorageAttachment(attachments, inspectionTask.getId(), InspectionTasks, StorageAttachmentFile);
//        }
        commonFileService.migrateTempFilesToFormal(inspectionTask.getId(),inspectionTaskDto.getTempFileIds());
        return i;
    }

@@ -251,6 +231,9 @@
        if (ids == null || ids.length == 0) {
            return 0;
        }
        commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION.getValue());
        commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue());
        commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION_PRODUCTION_AFTER.getValue());
        return inspectionTaskMapper.deleteBatchIds(Arrays.asList(ids));
    }


 src/main/java/com/ruoyi/inspectiontask/service/impl/QrCodeScanRecordServiceImpl.java

@@ -11,7 +11,6 @@
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.basic.pojo.StorageBlob;
import com.ruoyi.basic.service.StorageAttachmentService;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.utils.MinioUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.inspectiontask.dto.QrCodeScanRecordDto;
@@ -22,8 +21,6 @@
import com.ruoyi.inspectiontask.service.QrCodeScanRecordService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 src/main/java/com/ruoyi/inspectiontask/service/impl/QuartzConfig.java

@@ -1,5 +1,6 @@
package com.ruoyi.inspectiontask.service.impl;

import org.quartz.Scheduler;
import org.quartz.spi.TriggerFiredBundle;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -10,10 +11,16 @@
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.scheduling.quartz.SpringBeanJobFactory;

import javax.sql.DataSource;

@Configuration
public class QuartzConfig {
    @Autowired
    private ApplicationContext applicationContext;

    // å‡è®¾å·²é…ç½®åä¸ºdataSource的数据源Bean
    @Autowired
    private DataSource dataSource;

    @Bean
    public SchedulerFactoryBean schedulerFactoryBean() {
@@ -24,10 +31,17 @@
        jobFactory.setApplicationContext(applicationContext);
        schedulerFactory.setJobFactory(jobFactory);

        // åœ¨schedulerFactoryBean()方法中添加
        schedulerFactory.setDataSource(dataSource);
        // å…¶ä»–配置...
        return schedulerFactory;
    }

    @Bean
    public Scheduler scheduler() {
        return schedulerFactoryBean().getScheduler();
    }

    // è‡ªå®šä¹‰JobFactory，支持自动注入
    public static class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory
            implements ApplicationContextAware {

 src/main/java/com/ruoyi/inspectiontask/service/impl/SpringContextHolder.java

@@ -1,6 +1,5 @@
package com.ruoyi.inspectiontask.service.impl;

import org.quartz.JobExecutionContext;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;

 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java

@@ -11,8 +11,6 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import javax.sql.DataSource;
import java.time.DayOfWeek;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -62,8 +60,11 @@
//            }

            // 2. åˆ›å»ºå¹¶ä¿å­˜å·¡æ£€ä»»åŠ¡è®°å½• - è¿™å°±æ˜¯æ‚¨æä¾›çš„代码应该放的位置
            InspectionTask inspectionTask = createInspectionTask(timingTask);
            inspectionTaskMapper.insert(inspectionTask);
            List<InspectionTask> inspectionTask = createInspectionTask(timingTask);
            for (InspectionTask task : inspectionTask) {
                inspectionTaskMapper.insert(task);
            }


            // 3. æ›´æ–°å®šæ—¶ä»»åŠ¡çš„执行时间
            if (!tasks.isEmpty()) {
@@ -103,21 +104,28 @@
    }

    // è¿™å°±æ˜¯æ‚¨æä¾›çš„代码封装成的方法
    private InspectionTask createInspectionTask(TimingTask timingTask) {
        InspectionTask inspectionTask = new InspectionTask();
    private List<InspectionTask> createInspectionTask(TimingTask timingTask) {
        List<InspectionTask> inspectionTasks = new java.util.ArrayList<>();
        String[] split = timingTask.getTaskIds().split(",");
        String[] split1 = timingTask.getTaskName().split(",");
        int i = 0;
        for (String s : split) {
            InspectionTask inspectionTask = new InspectionTask();
            // å¤åˆ¶åŸºæœ¬å±žæ€§
            inspectionTask.setTaskName(split1[i]);
            inspectionTask.setTaskId(Integer.parseInt(s));
            inspectionTask.setInspectorId(timingTask.getInspectorIds());
            inspectionTask.setInspectionLocation(timingTask.getInspectionLocation());
            inspectionTask.setRemarks("自动生成自定时任务ID: " + timingTask.getId());
            inspectionTask.setRegistrantId(timingTask.getRegistrantId());
            inspectionTask.setFrequencyType(timingTask.getFrequencyType());
            inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
            inspectionTask.setTenantId(timingTask.getTenantId());
            inspectionTasks.add(inspectionTask);
        }

        // å¤åˆ¶åŸºæœ¬å±žæ€§
        inspectionTask.setTaskName(timingTask.getTaskName());
        inspectionTask.setTaskId(timingTask.getTaskId());
        inspectionTask.setInspectorId(timingTask.getInspectorIds());
        inspectionTask.setInspectionLocation(timingTask.getInspectionLocation());
        inspectionTask.setRemarks("自动生成自定时任务ID: " + timingTask.getId());
        inspectionTask.setRegistrantId(timingTask.getRegistrantId());
        inspectionTask.setFrequencyType(timingTask.getFrequencyType());
        inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());
        inspectionTask.setTenantId(timingTask.getTenantId());

        return inspectionTask;
        return inspectionTasks;
    }



 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskScheduler.java

@@ -39,18 +39,21 @@
            throw new SchedulerException("Existing trigger is not a CronTrigger");
        }

        // æž„建新触发器
        Trigger newTrigger = TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)
                .withDescription(task.getTaskName())
                .withSchedule(CronScheduleBuilder.cronSchedule(convertToCronExpression(task)))
                .startAt(Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant()))
                .forJob(oldTrigger.getJobKey())
        // 3. æž„建CronTrigger，确保持久化配置
        CronTrigger newTrigger = TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)                // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                .withDescription(task.getTaskName() + "_TRIGGER") // è§¦å‘器描述
                .forJob(oldTrigger.getJobKey())                       // å…³è”对应的Job
                .withSchedule(CronScheduleBuilder
                        .cronSchedule(convertToCronExpression(task)) // é”™è¿‡æ‰§è¡Œæ—¶çš„策略（根据业务调整）
                )
                // 4. è®¾ç½®å¼€å§‹æ—¶é—´ï¼ˆè‹¥ä¸ºnull则立即生效）
                .startAt(task.getNextExecutionTime() != null
                        ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                        : new Date())
                .build();

        scheduler.rescheduleJob(triggerKey, newTrigger);
    }

    /**
     * æš‚停任务
     */
@@ -70,41 +73,60 @@
    /**
     * åˆ é™¤ä»»åŠ¡
     */
    public void unscheduleTimingTask(Long taskId) throws SchedulerException {
        JobKey jobKey = new JobKey("timingTask_" + taskId);
        scheduler.deleteJob(jobKey);
    public void unscheduleTimingTask(Long taskId) {
        try {
            JobKey jobKey = new JobKey("timingTask_" + taskId);
            scheduler.deleteJob(jobKey);
        }catch (Exception e){
            throw new RuntimeException(e.getMessage());
        }
    }

    private JobDetail buildJobDetail(TimingTask task) {
        JobDataMap jobDataMap = new JobDataMap();
        jobDataMap.put("taskId", task.getId());
        // 1. æž„建唯一JobKey（基于任务ID，确保重启后能识别）
        JobKey jobKey = new JobKey("timingTask_" + task.getId());

        // 2. å°è£…任务数据（仅使用基本类型，确保可序列化）
        JobDataMap jobDataMap = new JobDataMap();
        jobDataMap.put("taskId", task.getId());           // ä»»åŠ¡ID（Long，可序列化）
        jobDataMap.put("taskName", task.getTaskName());   // ä»»åŠ¡åç§°ï¼ˆString，可序列化）
        jobDataMap.put("taskType", task.getFrequencyType()); // ä»»åŠ¡ç±»åž‹ï¼ˆString）
        // æŒ‰éœ€æ·»åŠ å…¶ä»–必要的基本类型参数

        // 3. æž„建JobDetail，设置持久化相关属性
        return JobBuilder.newJob(TimingTaskJob.class)
                .withIdentity("timingTask_" + task.getId())
                .withDescription(task.getTaskName())
                .usingJobData(jobDataMap)
                .storeDurably()
                .withIdentity(jobKey)                    // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                .withDescription(task.getTaskName())     // ä»»åŠ¡æè¿°ï¼Œå­˜å…¥æ•°æ®åº“
                .usingJobData(jobDataMap)                // ç»‘定任务数据
                .storeDurably(true)                          // å³ä½¿æ²¡æœ‰è§¦å‘器关联也持久化保存
                .requestRecovery(true)                   // å½“调度器崩溃后恢复时，重新执行未完成的任务
                .build();
    }


    private Trigger buildJobTrigger(TimingTask task, JobDetail jobDetail) {
        // 1. æž„建唯一TriggerKey（基于任务ID）
        TriggerKey triggerKey = new TriggerKey("trigger_" + task.getId());

        // 2. ç”ŸæˆCron表达式（原逻辑不变）
        String cronExpression = convertToCronExpression(task);

            TriggerBuilder<CronTrigger> triggerBuilder = TriggerBuilder.newTrigger()
                .withIdentity("trigger_" + task.getId())
                .withDescription(task.getTaskName())
                .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression));

        if (jobDetail != null) {
            triggerBuilder.forJob(jobDetail);
        }

        if (task.getNextExecutionTime() != null) {
            triggerBuilder.startAt(Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant()));
        }

        return triggerBuilder.build();
        // 3. æž„建CronTrigger，确保持久化配置
        return TriggerBuilder.newTrigger()
                .withIdentity(triggerKey)                // å”¯ä¸€æ ‡è¯†ï¼Œç”¨äºŽæŒä¹…化存储
                .withDescription(task.getTaskName() + "_TRIGGER") // è§¦å‘器描述
                .forJob(jobDetail)                       // å…³è”对应的Job
                .withSchedule(CronScheduleBuilder
                        .cronSchedule(cronExpression)
                        .withMisfireHandlingInstructionDoNothing() // é”™è¿‡æ‰§è¡Œæ—¶çš„策略（根据业务调整）
                )
                // 4. è®¾ç½®å¼€å§‹æ—¶é—´ï¼ˆè‹¥ä¸ºnull则立即生效）
                .startAt(task.getNextExecutionTime() != null
                        ? Date.from(task.getNextExecutionTime().atZone(ZoneId.systemDefault()).toInstant())
                        : new Date())
                .build();
    }

    private String convertToCronExpression(TimingTask task) {
        // å‚数校验
        if (task == null || task.getFrequencyType() == null || task.getFrequencyDetail() == null) {

 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.inspectiontask.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,7 +48,13 @@
    @Override
    public IPage<TimingTaskDto> selectTimingTaskList(Page<TimingTask> page, TimingTask timingTask) {
        // 1. å…ˆåˆ†é¡µæŸ¥è¯¢å®šæ—¶ä»»åŠ¡æ•°æ®
        IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, null);
        LambdaQueryWrapper<TimingTask> timingTaskLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(timingTask != null){
            if(StringUtils.isNotEmpty(timingTask.getSearchAll())){
                timingTaskLambdaQueryWrapper.like(TimingTask::getTaskName, timingTask.getSearchAll());
            }
        }
        IPage<TimingTask> taskPage = timingTaskMapper.selectPage(page, timingTaskLambdaQueryWrapper);

        // 2. å¦‚果没有数据，直接返回空分页
        if (taskPage.getRecords().isEmpty()) {
@@ -144,7 +151,7 @@
        }
    }

    private LocalDateTime calculateFirstExecutionTime(TimingTask task) {
    public LocalDateTime calculateFirstExecutionTime(TimingTask task) {
        // æ ¹æ®é¢‘率类型和详情计算首次执行时间
        String frequencyType = task.getFrequencyType();
        if ("DAILY".equals(frequencyType)) {
@@ -444,7 +451,13 @@

    @Override
    public int delByIds(Long[] ids) {
        return timingTaskMapper.deleteBatchIds(Arrays.asList(ids));
        int i = timingTaskMapper.deleteBatchIds(Arrays.asList(ids));
        if(i > 0){
            for (Long id : ids) {
                timingTaskScheduler.unscheduleTimingTask(id);
            }
        }
        return i;
    }

}

 src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java

@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -14,7 +12,6 @@
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerService;
import com.ruoyi.measuringinstrumentledger.service.impl.MeasuringInstrumentLedgerServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import io.swagger.annotations.Api;

 src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java

@@ -7,7 +7,6 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
import io.swagger.annotations.Api;

 src/main/java/com/ruoyi/measuringinstrumentledger/dto/MeasuringInstrumentLedgerDto.java

@@ -1,8 +1,6 @@
package com.ruoyi.measuringinstrumentledger.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerRecordServiceImpl.java

@@ -21,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -35,7 +34,6 @@
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

/**
 * @author :yys

 src/main/java/com/ruoyi/measuringinstrumentledger/service/impl/MeasuringInstrumentLedgerServiceImpl.java

@@ -8,7 +8,6 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerDto;
import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerMapper;
import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper;

 src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.sales.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.other.mapper.TempFileMapper;
@@ -151,4 +152,14 @@
            }
        }
    }

    public void deleteByBusinessId(Long businessId,Integer type) {
        commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, businessId)
                .eq(CommonFile::getType, type));
    }

    public void deleteByBusinessIds(List<Long> businessId,Integer type) {
        commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>().in(CommonFile::getCommonId, businessId)
                .eq(CommonFile::getType, type));
    }
}

 src/main/resources/application-dev.yml

@@ -62,7 +62,7 @@
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://localhost:3306/product-inventory-management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://localhost:3306/product-inventory-management-mxsc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: root
        password: 123456
      # ä»Žåº“数据源
@@ -156,6 +156,31 @@
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms
  # Quartz定时任务配置（新增部分）
  quartz:
    job-store-type: jdbc  # ä½¿ç”¨æ•°æ®åº“存储
    jdbc:
      initialize-schema: never  # é¦–次运行时自动创建表结构，成功后改为never
      schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql  # MySQL表结构脚本
    properties:
      org:
        quartz:
          scheduler:
            instanceName: RuoYiScheduler
            instanceId: AUTO
          jobStore:
            class: org.quartz.impl.jdbcjobstore.JobStoreTX
            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate  # MySQL适配
            tablePrefix: qrtz_  # è¡¨åå‰ç¼€ï¼Œä¸Žè„šæœ¬ä¸€è‡´
            isClustered: false  # å•èŠ‚点模式（集群需改为true）
            clusterCheckinInterval: 10000
            txIsolationLevelSerializable: true
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10  # çº¿ç¨‹æ± å¤§å°
            threadPriority: 5
            makeThreadsDaemons: true
          updateCheck: false  # å…³é—­ç‰ˆæœ¬æ£€æŸ¥

# token配置
token:
@@ -216,4 +241,18 @@

file:
  temp-dir: D:/ruoyi/temp/uploads   # ä¸´æ—¶ç›®å½•
  upload-dir: D:/ruoyi/prod/uploads # æ­£å¼ç›®å½•
  upload-dir: D:/ruoyi/prod/uploads # æ­£å¼ç›®å½•
#榆林市工业和信息化局数据推送
api:
  ip: http://111.20.184.155:8888 #推送ip地址
  appid: 48b97e28e0aad7963e96fc50b9e63908 #企业应用id
  secret: 0db7a9fa112427df622c4207b4707432 #企业应用秘钥
  entName: é–边县伟德实业有限公司 #企业名称
  socialCreditCode: 91610824MA703F1G4N #统一社会信用代码
  dayPowerConsumption: 50 #日均用电量
  outputValuesBase: 210  #单位产值基数（万元）
  electricityCost: 0.14 #月电费
  # ç™»å½•æŽ¨é€å¼€å…³
  loginPush: false
  # ç”µæ•°æ®æŽ¨é€å¼€å…³
  push: false

 src/main/resources/application-mxsc.yml

@@ -156,6 +156,31 @@
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms
  # Quartz定时任务配置（新增部分）
  quartz:
    job-store-type: jdbc  # ä½¿ç”¨æ•°æ®åº“存储
    jdbc:
      initialize-schema: never  # é¦–次运行时自动创建表结构，成功后改为never
      schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql  # MySQL表结构脚本
    properties:
      org:
        quartz:
          scheduler:
            instanceName: RuoYiScheduler
            instanceId: AUTO
          jobStore:
            class: org.quartz.impl.jdbcjobstore.JobStoreTX
            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate  # MySQL适配
            tablePrefix: qrtz_  # è¡¨åå‰ç¼€ï¼Œä¸Žè„šæœ¬ä¸€è‡´
            isClustered: false  # å•èŠ‚点模式（集群需改为true）
            clusterCheckinInterval: 10000
            txIsolationLevelSerializable: true
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10  # çº¿ç¨‹æ± å¤§å°
            threadPriority: 5
            makeThreadsDaemons: true
          updateCheck: false  # å…³é—­ç‰ˆæœ¬æ£€æŸ¥

# token配置
token:
@@ -216,4 +241,19 @@

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads

#榆林市工业和信息化局数据推送
api:
  ip: http://111.20.184.155:8888 #推送ip地址
  appid: 48b97e28e0aad7963e96fc50b9e63908 #企业应用id
  secret: 0db7a9fa112427df622c4207b4707432 #企业应用秘钥
  entName: é–边县伟德实业有限公司 #企业名称
  socialCreditCode: 91610824MA703F1G4N #统一社会信用代码
  dayPowerConsumption: 50 #日均用电量
  outputValuesBase: 210  #单位产值基数（万元）
  electricityCost: 0.14 #月电费
  # ç™»å½•æŽ¨é€å¼€å…³
  loginPush: false
  # ç”µæ•°æ®æŽ¨é€å¼€å…³
  push: false

 src/main/resources/application-qlmc.yml

@@ -156,6 +156,31 @@
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms
  # Quartz定时任务配置（新增部分）
  quartz:
    job-store-type: jdbc  # ä½¿ç”¨æ•°æ®åº“存储
    jdbc:
      initialize-schema: never  # é¦–次运行时自动创建表结构，成功后改为never
      schema: classpath:org/quartz/impl/jdbcjobstore/tables_mysql_innodb.sql  # MySQL表结构脚本
    properties:
      org:
        quartz:
          scheduler:
            instanceName: RuoYiScheduler
            instanceId: AUTO
          jobStore:
            class: org.quartz.impl.jdbcjobstore.JobStoreTX
            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate  # MySQL适配
            tablePrefix: qrtz_  # è¡¨åå‰ç¼€ï¼Œä¸Žè„šæœ¬ä¸€è‡´
            isClustered: false  # å•èŠ‚点模式（集群需改为true）
            clusterCheckinInterval: 10000
            txIsolationLevelSerializable: true
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10  # çº¿ç¨‹æ± å¤§å°
            threadPriority: 5
            makeThreadsDaemons: true
          updateCheck: false  # å…³é—­ç‰ˆæœ¬æ£€æŸ¥

# token配置
token:
@@ -216,4 +241,19 @@

file:
  temp-dir: /javaWork/product-inventory-management/file/temp/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads
  upload-dir: /javaWork/product-inventory-management/file/prod/uploads

#榆林市工业和信息化局数据推送
api:
  ip: http://111.20.184.155:8888 #推送ip地址
  appid: 48b97e28e0aad7963e96fc50b9e63908 #企业应用id
  secret: 0db7a9fa112427df622c4207b4707432 #企业应用秘钥
  entName: é–边县伟德实业有限公司 #企业名称
  socialCreditCode: 91610824MA703F1G4N #统一社会信用代码
  dayPowerConsumption: 50 #日均用电量
  outputValuesBase: 210  #单位产值基数（万元）
  electricityCost: 0.14 #月电费
  # ç™»å½•æŽ¨é€å¼€å…³
  loginPush: false
  # ç”µæ•°æ®æŽ¨é€å¼€å…³
  push: false

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
# Spring配置
spring:
  profiles:
    active: wdsy
    active: dev