BUGFIX: design之后，未分割图片的保存问题

src/main/java/com/ai/da/service/DesignItemService.java

@@ -55,6 +55,8 @@ public interface DesignItemService extends IService<DesignItem> {
 
     Map<String, String> setPriorityAndUndividedLayer(JSONArray layers);
 
+    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

@@ -631,12 +631,23 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             JSONObject jsonObject = layers.getJSONObject(i);
             String priority = jsonObject.getString("priority");
             String category = jsonObject.getString("image_category").split("_")[0];
-//            if (!category.equals("body") && !categoryAndLayer.containsKey(category)) categoryAndLayer.put(category, jsonObject.getString("pattern_image_url"));
             if (!category.equals("body") && !priorityAndLayer.containsKey(priority)) priorityAndLayer.put(priority, jsonObject.getString("pattern_image_url"));
         }
         return priorityAndLayer;
     }
 
+    // 由于在design过程中没有priority 优先级的概念，并且在design时，不会出现上下两件使用相同服装类型的情况，所以这里依然保留这个方法。
+    @Override
+    public Map<String, String> setTypeAndUndividedLayer(JSONArray layers){
+        HashMap<String, String> typeAndLayer = new HashMap<>();
+        for (int i = 0; i < layers.size(); i++) {
+            JSONObject jsonObject = layers.getJSONObject(i);
+            String category = jsonObject.getString("image_category").split("_")[0];
+            if (!category.equals("body") && !typeAndLayer.containsKey(category)) typeAndLayer.put(category, jsonObject.getString("pattern_image_url"));
+        }
+        return typeAndLayer;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {

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

@@ -786,7 +786,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> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
+        Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
         for (DesignPythonItem detail : item.getItems()) {
             if (null == detail) {
                 continue;
@@ -797,12 +797,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             designItemDetail.setDesignItemId(designItemId);
             designItemDetail.setCollectionElementId(detail.getElementId());
             designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone));
-            log.info("detail.getType: {}", detail.getType());
             if (!detail.getType().equals("Body")){
-                log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority());
+                designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType()));
-                if (Objects.nonNull(designItemDetail.getPriority())){
-                    designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
-                }
             }
             if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                 designItemDetail.setPath(detail.getBody_path());
@@ -923,7 +919,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> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
+            Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
             for (DesignPythonItem detail : item.getItems()) {
                 if (null == detail) {
                     continue;
@@ -934,12 +930,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                 designItemDetail.setDesignItemId(designItemId);
                 designItemDetail.setCollectionElementId(detail.getElementId());
                 designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone));
-                log.info("detail.getType: {}", detail.getType());
                 if (!detail.getType().equals("Body")){
-                    log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority());
+                    designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType()));
-                    if (Objects.nonNull(designItemDetail.getPriority())){
-                        designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
-                    }
                 }
 
                 if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
@@ -1990,7 +1982,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> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
+                Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
                 for (DesignPythonItem detail : item.getItems()) {
                     if (null == detail) {
                         continue;
@@ -2001,12 +1993,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                     designItemDetail.setDesignItemId(designItemId);
                     designItemDetail.setCollectionElementId(detail.getElementId());
                     designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone));
-                    log.info("detail.getType: {}", detail.getType());
                     if (!detail.getType().equals("Body")){
-                        log.info("designItemDetail.getPriority(): {}", designItemDetail.getPriority());
+                        designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType()));
-                        if (Objects.nonNull(designItemDetail.getPriority())){
-                            designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
-                        }
                     }
                     if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                         designItemDetail.setPath(detail.getBody_path());