From 564896a8f5608f48f15f9c0891e73d84a21d48fb Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Sat, 22 Jun 2024 09:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=201=E3=80=81=E5=A2=9E=E5=8A=A0type=E4=B8=8B=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=89=93=E5=8C=85=E5=88=B0=E5=A4=96=E9=83=A8?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E9=80=9A=E8=BF=87"=E5=8C=85?= =?UTF-8?q?=E8=B7=AF=E5=BE=84/type"=E8=BF=9B=E8=A1=8C=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8D=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/build/assembly.xml | 2 +- .../module/executor/service/order/OrderService.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/build/assembly.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/build/assembly.xml index 0e9563e49..6357861d2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/build/assembly.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/build/assembly.xml @@ -20,7 +20,7 @@ ${basedir}/src/main/resources/type - execFile + type diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java index 50aaf4492..229585640 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java @@ -3,21 +3,17 @@ package com.cf.imes.module.executor.service.order; import javax.servlet.http.HttpServletResponse; import javax.validation.*; -import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.executor.controller.admin.order.vo.order.*; import com.cf.imes.module.executor.controller.admin.order.vo.product.OrderBodyRespVO; import com.cf.imes.module.executor.controller.admin.orderParts.vo.OrderPartsRespVO; -import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.order.OrderDO; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO; -import com.cf.imes.module.executor.dal.dataobject.orderModuleExtra.OrderModuleExtraDO; -import com.cf.imes.module.executor.dal.dataobject.plate.PlateDO; import org.springframework.boot.system.ApplicationHome; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; +import java.io.File; import java.util.Collection; import java.util.List; import java.util.Map; @@ -157,8 +153,8 @@ public interface OrderService { ApplicationHome applicationHome = new ApplicationHome(this.getClass()); // 保存目录位置根据项目需求可随意更改 - return applicationHome.getDir().getParentFile() - .getParentFile().getAbsolutePath() + "\\src\\main\\resources\\type"; + return applicationHome.getDir().getAbsolutePath() + File.separator + "type"; + } } \ No newline at end of file