feat(eims): 优化保养计划导入功能

baoshiwei

2025-05-29 5fac1dbc81262639bb7bfac11e2d7b56795f6d44

feat(eims): 优化保养计划导入功能

- 支持多文件导入，提高工作效率
-重构导入逻辑，提升代码可读性和维护性
- 优化错误处理和提示信息，增强用户体验- 调整导入接口参数，适应多文件上传

 eims-ui/apps/web-antd/src/views/eims/maint-plan/maint-plan-import-modal.vue

@@ -26,15 +26,21 @@
async function handleSubmit() {
  try {
    modalApi.modalLoading(true);
    if (fileList.value.length !== 1) {
    if (fileList.value.length === 0) {
      handleCancel();
      return;
    }
    const data = {
      file: fileList.value[0]!.originFileObj as Blob,
      updateSupport: unref(checked),
    };
    const { code, msg } = await maintPlanImportData(data);

    // 构建包含多个文件的请求数据，支持多文件上传
    const formData = new FormData();
    fileList.value.forEach((file) => {
      const blob = file.originFileObj as Blob;
      formData.append('files', blob); // 将多个文件以数组形式添加到表单数据中
    });
    formData.append('updateSupport', unref(checked).toString()); // 添加 updateSupport 参数

    // 调用接口上传多文件
    const { code, msg } = await maintPlanImportData(formData);
    let modal = Modal.success;
    if (code === 200) {
      emit('reload');
@@ -76,7 +82,7 @@
    <UploadDragger
      v-model:file-list="fileList"
      :before-upload="() => false"
      :max-count="1"
      :multiple="true"
      :show-upload-list="true"
      accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
    >

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/controller/EimsMaintPlanController.java

@@ -120,13 +120,13 @@
    @Log(title = "保养计划", businessType = BusinessType.IMPORT)
    @SaCheckPermission("eims:maintPlan:import")
    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
        //ExcelResult<MaintCheckItemVo> result = ExcelUtil.importExcel(file.getInputStream(), MaintCheckItemVo.class, new MaintCheckItemImportListener(updateSupport));


    public R<Void> importData(@RequestPart("files") List<MultipartFile> files, boolean updateSupport) throws Exception {
        StringBuilder successMsg = new StringBuilder();
        for (MultipartFile file : files) {
        String res = eimsMaintPlanService.importData(file, updateSupport);

        return R.ok(res);
            successMsg.append(res).append(";");
        }
        return R.ok(successMsg.toString());
    }

    /**

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintPlanServiceImpl.java

@@ -204,18 +204,15 @@
    }


    public String importData(MultipartFile is, boolean updateSupport) throws IOException {
    public String importData(MultipartFile is, boolean updateSupport) {
        try {
    int successNum = 0;
    int failureNum = 0;
    StringBuilder successMsg = new StringBuilder();
    StringBuilder failureMsg = new StringBuilder();


        // 保养项目列表
        MaintCheckItemImportListener checkItemImportListener = new MaintCheckItemImportListener(updateSupport);
        EasyExcel.read(is.getInputStream(), MaintCheckItemVo.class, checkItemImportListener).headRowNumber(4).sheet().doRead();
        List<MaintCheckItemVo> successList = checkItemImportListener.getSuccessList();


        // 读取固定资产编号
        EasyExcelCellListener readListener = new EasyExcelCellListener(3, 1);
@@ -226,9 +223,11 @@
                return colonIndex != -1 ? value.substring(colonIndex + 1) : value;
            })
            .map(String::trim)
            .orElseThrow(() -> new ServiceException("导入失败，无法读取固定资产编号"));
                .orElse("");


            if (assetNo.isEmpty()) {
                return is.getOriginalFilename() + " 导入失败，无法读取固定资产编号";
            }

        // 读取保养计划年份
        EasyExcelCellListener readYearListener = new EasyExcelCellListener(2, 3);
@@ -240,7 +239,9 @@
        QueryWrapper<EimsEqu> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("asset_no", assetNo);
        EimsEquVo eimsEquVo = equMapper.selectVoOne(queryWrapper);
        if (eimsEquVo == null) throw new ServiceException("导入失败，设备未找到请在设备台帐中添加");
            if (eimsEquVo == null) {
                return is.getOriginalFilename() + " 设备未找到，请先在设备台帐中添加";
            }

        // 月份字段处理优化
        String[] monthFields = {"january","february","march","april","may","june",
@@ -255,18 +256,19 @@
            maintPlanBo.setStatus("0");
            maintPlanBo.setMaintType("1");
            maintPlanBo.setMaintRule("0");

            // 添加period校验
            String period = itemVo.getPeriod();
            if (StringUtils.isBlank(period)) {
                failureNum++;
                failureMsg.append(failureNum).append("、周期字段为空<br>");
                continue;
            }

            try {
                if (period.length() > 1) {
                    maintPlanBo.setMaintCycle(Long.parseLong(period.substring(0, period.length() - 1)));
                    String substring = period.substring(period.length() - 1);
                        String num = period.replaceAll("[^\\d]", "");
                        maintPlanBo.setMaintCycle(Long.parseLong(num));
                        String substring = period.replace(num, "");
                    // 转换周期单位，M转换为3，D转换为1，Y转换为5，W转换为2，Q转换为4
                    switch (substring) {
                        case "M":
@@ -284,6 +286,21 @@
                        case "Q":
                            substring = "4";
                            break;
                            case "个月":
                                substring = "3";
                                break;
                            case "天":
                                substring = "1";
                                break;
                            case "年":
                                substring = "5";
                                break;
                            case "周":
                                substring = "2";
                                break;
                            case "季度":
                                substring = "4";
                                break;
                        default:
                    }
                    maintPlanBo.setMaintCycleUnit(substring);
@@ -293,11 +310,11 @@
                }
            } catch (NumberFormatException e) {
                failureNum++;
                failureMsg.append(failureNum).append("、无效的周期格式:").append(period).append("<br>");
                continue;
            }

            // 月份判断优化
                boolean monthFound = false;
            for (int i = 0; i < monthFields.length; i++) {
                try {
                    String monthValue = (String) MaintCheckItemVo.class
@@ -307,14 +324,18 @@
                    if (StringUtils.isNotBlank(monthValue)) {
                        String month = String.format("%02d", i+1); // 保证两位月份
                        maintPlanBo.setMaintFirstTime(DateUtils.parseDate(year + "-" + month + "-01"));
                            monthFound = true;
                        break;
                    }
                } catch (Exception e) {
                    // 反射异常处理
                    failureNum++;
                    failureMsg.append(failureNum).append("、月份字段访问异常<br>");
                        // 反射异常处理，继续下一个月份
                    continue;
                }
                }

                if (!monthFound) {
                    failureNum++;
                    continue;
            }

            if (maintPlanBo.getMaintFirstTime() != null) {
@@ -336,23 +357,19 @@

            if (!insertByBo(maintPlanBo)) {
                failureNum++;
                failureMsg.append(failureNum).append("、设备：").append(eimsEquVo.getEquName()).append("，导入失败<br>");
            } else {
                successNum++;
                successMsg.append("<br/>").append(successNum).append("、设备：").append(eimsEquVo.getEquName()).append("，导入成功");
            }
        }

    if (failureNum > 0) {
        failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
        return failureMsg.toString();
    } else {
        successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
        return successMsg.toString();
            return is.getOriginalFilename() + " 导入成功：" + successNum + "条，导入失败：" + failureNum + "条";
        } catch (Exception e) {
            return is.getOriginalFilename() + " 导入异常：" + e.getMessage();
    }
}



private Date calcNextTime(Date firstTime, int intervalMonths, int initialOffset) {
    if (intervalMonths <= 0) {
        throw new IllegalArgumentException("Interval months must be positive");