From 8f0d45adf92d6e27d0ce85ea5f95d3868141b415 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 10 Jul 2024 13:53:52 +0800 Subject: [PATCH] =?UTF-8?q?design=20=E5=B0=86=E6=9C=AA=E5=88=86=E5=89=B2?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E5=B1=82=E6=B7=BB=E5=8A=A0=E5=88=B0design=5F?= =?UTF-8?q?item=5Fdetail=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/task/AliPayTask.java | 2 +- src/main/java/com/ai/da/common/task/PaypalTask.java | 2 +- src/main/java/com/ai/da/service/DesignItemService.java | 4 ++++ .../java/com/ai/da/service/impl/DesignItemServiceImpl.java | 3 ++- src/main/java/com/ai/da/service/impl/DesignServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ai/da/common/task/AliPayTask.java b/src/main/java/com/ai/da/common/task/AliPayTask.java index fa9a9b3a..670a417c 100644 --- a/src/main/java/com/ai/da/common/task/AliPayTask.java +++ b/src/main/java/com/ai/da/common/task/AliPayTask.java @@ -27,7 +27,7 @@ public class AliPayTask { // @Scheduled(cron = "0/30 * * * * ?") public void orderConfirm(){ - log.info("Alipay orderConfirm 被执行......"); +// log.info("Alipay orderConfirm 被执行......"); List orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.ALIPAY.getType()); diff --git a/src/main/java/com/ai/da/common/task/PaypalTask.java b/src/main/java/com/ai/da/common/task/PaypalTask.java index bc0e24dd..2c150123 100644 --- a/src/main/java/com/ai/da/common/task/PaypalTask.java +++ b/src/main/java/com/ai/da/common/task/PaypalTask.java @@ -26,7 +26,7 @@ public class PaypalTask { @Scheduled(cron = "0/30 * * * * ?") public void orderConfirm() throws SerializeException { - log.info("PayPal orderConfirm 被执行......"); +// log.info("PayPal orderConfirm 被执行......"); List orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.PAYPAL.getType()); diff --git a/src/main/java/com/ai/da/service/DesignItemService.java b/src/main/java/com/ai/da/service/DesignItemService.java index 26e87015..08d25d72 100644 --- a/src/main/java/com/ai/da/service/DesignItemService.java +++ b/src/main/java/com/ai/da/service/DesignItemService.java @@ -4,10 +4,12 @@ import com.ai.da.mapper.primary.entity.DesignItem; import com.ai.da.model.dto.DesignSingleDTO; import com.ai.da.model.dto.DesignSingleIncludeLayersDTO; import com.ai.da.model.vo.*; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.extension.service.IService; import java.io.IOException; import java.util.List; +import java.util.Map; /** * 服务类 @@ -51,6 +53,8 @@ public interface DesignItemService extends IService { DesignSingleVO designSingleIncludeLayers(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO); + Map setTypeAndUndividedLayer(JSONArray layers); + ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException; List selectDesignIdById(List designItemIdList); diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java index a0b5880b..edb83b7f 100644 --- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java @@ -568,7 +568,8 @@ public class DesignItemServiceImpl extends ServiceImpl setTypeAndUndividedLayer(JSONArray layers){ + @Override + public Map setTypeAndUndividedLayer(JSONArray layers){ HashMap categoryAndLayer = new HashMap<>(); for (int i = 0; i < layers.size(); i++) { JSONObject jsonObject = layers.getJSONObject(i); diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index 8481530a..60bfd069 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -607,6 +607,7 @@ public class DesignServiceImpl extends ServiceImpl impleme Map typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0], d -> Math.abs(d.getPriority()), (existing, replacement) -> replacement)); + Map typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers); for (DesignPythonItem detail : item.getItems()) { if (null == detail) { continue; @@ -617,6 +618,7 @@ public class DesignServiceImpl extends ServiceImpl impleme designItemDetail.setDesignItemId(designItemId); designItemDetail.setCollectionElementId(detail.getElementId()); designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone)); + designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType().toLowerCase())); if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) { designItemDetail.setPath(detail.getBody_path()); //BODY不关联businessId