design 将未分割的图层添加到design_item_detail表中

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<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.ALIPAY.getType());
 

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<OrderInfo> orderInfoList = orderInfoService.getNoPayOrderByDuration(5, PayTypeEnum.PAYPAL.getType());
 

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<DesignItem> {
 
     DesignSingleVO designSingleIncludeLayers(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO);
 
+    Map<String, String> setTypeAndUndividedLayer(JSONArray layers);
+
     ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException;
 
     List<DesignItem> selectDesignIdById(List<Long> designItemIdList);

src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

@@ -568,7 +568,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         });
     }
 
-    private Map<String, String> setTypeAndUndividedLayer(JSONArray layers){
+    @Override
+    public Map<String, String> setTypeAndUndividedLayer(JSONArray layers){
         HashMap<String, String> categoryAndLayer = new HashMap<>();
         for (int i = 0; i < layers.size(); i++) {
             JSONObject jsonObject = layers.getJSONObject(i);

src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

@@ -607,6 +607,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             Map<String, Integer> typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0],
                                                                                         d -> Math.abs(d.getPriority()),
                                                                                         (existing, replacement) -> replacement));
+            Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
             for (DesignPythonItem detail : item.getItems()) {
                 if (null == detail) {
                     continue;
@@ -617,6 +618,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> 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