From 206f365ff3d26aab280326eccd5a3c9ed8a715e8 Mon Sep 17 00:00:00 2001 From: xupei <1779019091@qq.com> Date: Mon, 18 Sep 2023 14:44:30 +0800 Subject: [PATCH] =?UTF-8?q?design=20Single=E6=8E=A5=E5=8F=A3=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 10 +++++----- .../com/ai/da/python/vo/DesignPythonItemPrint.java | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index efd56bb5..cb8ac052 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -1354,8 +1354,8 @@ public class PythonService { private DesignPythonItemPrint resolveDesignSinglePrint(DesignSinglePrintDTO printObject, String clothesPath) { - if (Objects.isNull(printObject)) { - return null; + if (Objects.isNull(printObject.getPath()) || CollectionUtil.isEmpty(printObject.getPrints())) { + return new DesignPythonItemPrint(new ArrayList<>(),false); } DesignPythonItemPrint print = CopyUtil.copyObject(printObject, DesignPythonItemPrint.class); if(StringUtils.isEmpty(printObject.getPath())){ @@ -1519,8 +1519,8 @@ public class PythonService { } public JSONObject designNew(DesignPythonObjects designPythonObjects) { - //限流校验 - AccessLimitUtils.validate("design",5); + // todo 限流校验 +// AccessLimitUtils.validate("design",5); OkHttpClient client = new OkHttpClient().newBuilder() .connectTimeout(30, TimeUnit.SECONDS) .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒) @@ -1556,7 +1556,7 @@ public class PythonService { log.error("PythonService##design异常###{}", ExceptionUtil.getThrowableList(ioException)); } //去除限流 - AccessLimitUtils.validateOut("design"); +// AccessLimitUtils.validateOut("design"); if (Objects.isNull(response)) { log.error("PythonService##design异常###{}", "response or body is empty!"); throw new BusinessException("system error!"); diff --git a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java index 6e0e5941..642c29eb 100644 --- a/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java +++ b/src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java @@ -60,4 +60,9 @@ public class DesignPythonItemPrint { public DesignPythonItemPrint(String path) { this.path = path; } + + public DesignPythonItemPrint(List print_path_list, Boolean ifSingle) { + this.print_path_list = print_path_list; + IfSingle = ifSingle; + } }