From 0b1ffd8254e02cc805151fe442e70b339c072f0b Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 11 Mar 2026 13:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Acad=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=8B=86=E5=8D=95=E5=A4=B1=E8=B4=A5=E5=90=8E=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=9B=BE=E7=BA=B8=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=8B=86=E5=8D=95=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=97=B6=E5=88=A0=E9=99=A4=E5=9B=BE=E7=BA=B8=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebCadOrderImportServiceImpl.java | 23 ----------------- .../consumer/WebCadOrderImportConsumer.java | 6 +---- .../WebCadOrderImportAsyncFactory.java | 25 +------------------ 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java index 870b86804..b8de1794b 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/WebCadOrderImportServiceImpl.java @@ -22,7 +22,6 @@ import com.cf.imes.module.executor.enums.OrderImportStatusEnum; import com.cf.imes.module.executor.enums.OrderImportTaskStatusEnum; import com.cf.imes.module.executor.enums.OrderImportTypeEnum; import com.cf.imes.module.executor.enums.OrderStatusEnum; -import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.plan.controller.admin.orderimport.webcad.vo.WebCadDataReqVO; import com.cf.imes.module.plan.dal.dataobject.order.OrderDO; import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTaskDO; @@ -121,9 +120,6 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService { @Resource private RabbitTemplate rabbitTemplate; - @Resource - private FileApi fileApi; - private static final String REDIS_UNIQUEKEY = "webcad"; @Resource @@ -202,15 +198,11 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService { } } } catch (ServiceException se) { - // 删除cad图纸数据 - removeCadFileWhenException(cadViewFileId); // 移除临时文件 removeCacheFileWhenException(sync, taskId); throw se; } catch (Exception e) { - // 删除cad图纸数据 - removeCadFileWhenException(cadViewFileId); // 移除临时文件 removeCacheFileWhenException(sync, taskId); @@ -349,19 +341,4 @@ public class WebCadOrderImportServiceImpl implements WebCadOrderImportService { } } } - - /** - * 删除cad图纸文件数据 - * - * @param cadViewFileId - */ - private void removeCadFileWhenException(Long cadViewFileId) { - try { - if (ObjectUtil.isNotNull(cadViewFileId)) { - fileApi.deleteFileById(cadViewFileId); - } - } catch (IORuntimeException e) { - log.error("删除cad图纸数据文件失败: {}", cadViewFileId, e); - } - } } diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/WebCadOrderImportConsumer.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/WebCadOrderImportConsumer.java index aa22d0a3f..0ad5ff8ca 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/WebCadOrderImportConsumer.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/consumer/WebCadOrderImportConsumer.java @@ -10,7 +10,6 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.redis.config.ChenfengCacheProperties; import com.cf.imes.framework.redis.constants.RedisKeyConstants; import com.cf.imes.framework.redis.util.RedisLockUtil; -import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTaskDO; import com.cf.imes.module.plan.dal.mysql.goods.GoodsMapper; import com.cf.imes.module.plan.dal.mysql.order.OrderMapper; @@ -103,9 +102,6 @@ public class WebCadOrderImportConsumer { @Resource private ChenfengCacheProperties chenfengCacheProperties; - @Resource - private FileApi fileApi; - @RabbitListener(queues = "#{@orderImportWebCadQueueName}") @DS("imes_prod") @Transactional(rollbackFor = Exception.class) @@ -151,7 +147,7 @@ public class WebCadOrderImportConsumer { WebCadOrderImportAsyncFactory webCadOrderImportAsyncFactory = new WebCadOrderImportAsyncFactory(organId, orderMapper, snowFlakeGenerator, orderBodyMapper, plateMapper, idWorker, orderImportTaskMapper, orderInputProcessor, goodsMapper, rawGoodsMapper, customPlateNoGenerateService, systemConfigApi, orderImportTaskDO.getCreator(), - cadImportPlateNumThreshold, jdbcTemplate, fileApi); + cadImportPlateNumThreshold, jdbcTemplate); webCadOrderImportAsyncFactory.analyzeTempData(taskId, webCadImportProperties.getTempFilePath()); log.info("====================【webcad异步拆单处理临时数据结束】===================="); diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index 3e7663b88..690241c57 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -1,7 +1,6 @@ package com.cf.imes.module.plan.service.orderImport.factory; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.NumberUtil; @@ -133,8 +132,6 @@ public class WebCadOrderImportAsyncFactory { private JdbcTemplate jdbcTemplate; - private FileApi fileApi; - private Long organId; // 批次id @@ -226,8 +223,7 @@ public class WebCadOrderImportAsyncFactory { SystemConfigApi systemConfigApi, String operatorName, int cadImportPlateNumThreshold, - JdbcTemplate jdbcTemplate, - FileApi fileApi) { + JdbcTemplate jdbcTemplate) { this.organId = organId; this.orderMapper = orderMapper; this.snowFlakeGenerator = snowFlakeGenerator; @@ -246,7 +242,6 @@ public class WebCadOrderImportAsyncFactory { sealEdgeConfigList = new ArrayList<>(); this.cadImportPlateNumThreshold = cadImportPlateNumThreshold; this.jdbcTemplate = jdbcTemplate; - this.fileApi = fileApi; } public void analyzeTempData(Long taskId, String webcadJsonCachePath) throws FileNotFoundException { @@ -261,9 +256,6 @@ public class WebCadOrderImportAsyncFactory { performPostProcessing(taskId); } catch (Exception e) { - // 删除cad图纸数据 - removeCadFileWhenException(cadViewFileId); - handleProcessingException(e); throw e; } finally { @@ -2494,19 +2486,4 @@ public class WebCadOrderImportAsyncFactory { } } } - - /** - * 删除cad图纸文件数据 - * - * @param cadViewFileId - */ - private void removeCadFileWhenException(Long cadViewFileId) { - try { - if (ObjectUtil.isNotNull(cadViewFileId)) { - fileApi.deleteFileById(cadViewFileId); - } - } catch (IORuntimeException e) { - log.error("删除cad图纸数据文件失败: {}", cadViewFileId, e); - } - } }