BUGFIX: designSingle时，添加相同类型的服装导致未分割图层获取混乱

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

@@ -53,7 +53,7 @@ public interface DesignItemService extends IService<DesignItem> {
 
     DesignSingleVO designSingleIncludeLayers(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO);
 
-    Map<String, String> setTypeAndUndividedLayer(JSONArray layers);
+    Map<String, String> setPriorityAndUndividedLayer(JSONArray layers);
 
     ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException;
 

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

@@ -26,7 +26,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.collect.Lists;
-import com.mysql.cj.util.StringUtils;
 import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SerializationUtils;
@@ -326,7 +325,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
     private List<TDesignPythonOutfitDetail> saveDesignSingleItemDetailAndLayers(DesignPythonObjects pythonObjects
             , Long designId, Long designItemId, Long userId
             , JSONObject outfit, String timeZone, List<DesignSingleItemDTO> designSingleItemDTOList
-            , Map<String, String> categoryAndUndividedLayer) {
+            , Map<String, String> priorityAndUndividedLayer) {
 
         DesignItem designItem = new DesignItem();
 //        String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
@@ -357,7 +356,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 designItemDetail.setPriority(0);
             }
             designItemDetail.setIconPath(detail.getIcon());
-            designItemDetail.setUndividedLayer(categoryAndUndividedLayer.get(detail.getType().toLowerCase()));
+//            designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(detail.getType().toLowerCase()));
+            if (!detail.getType().equals("Body")) designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(detail.getPriority().toString()));
             // 印花存储在design_item_detail_print表中 这里还要存吗？
 //            DesignPythonItemPrint printObject = detail.getPrintToPython();
 //            designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
@@ -542,13 +542,13 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         }
 
         JSONArray layers = outfit.getJSONArray("layers");
-        Map<String, String> categoryAndUndividedLayer = setTypeAndUndividedLayer(layers);
+        Map<String, String> priorityAndUndividedLayer = setPriorityAndUndividedLayer(layers);
         if (!designSingleIncludeLayersDTO.getIsPreview()) {
             // 更新及保存图层信息
             tDesignPythonOutfitDetails = saveDesignSingleItemDetailAndLayers(objects, design.getId(), designSingleIncludeLayersDTO.getDesignItemId()
                     , userId, outfit, designSingleIncludeLayersDTO.getTimeZone()
                     , designSingleIncludeLayersDTO.getDesignSingleItemDTOList()
-                    , categoryAndUndividedLayer);
+                    , priorityAndUndividedLayer);
 
             saveCollectionElement(designSingleIncludeLayersDTO);
         } else {
@@ -576,7 +576,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),
                 detailsVO,
                 design.getSingleOverall(),
-                categoryAndUndividedLayer);
+                priorityAndUndividedLayer);
     }
 
     private void sketchBase64ToPath(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO){
@@ -625,14 +625,16 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
     }
 
     @Override
-    public Map<String, String> setTypeAndUndividedLayer(JSONArray layers){
-        HashMap<String, String> categoryAndLayer = new HashMap<>();
+    public Map<String, String> setPriorityAndUndividedLayer(JSONArray layers){
+        HashMap<String, String> priorityAndLayer = new HashMap<>();
         for (int i = 0; i < layers.size(); i++) {
             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") && !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 categoryAndLayer;
+        return priorityAndLayer;
     }
 
     @Override
@@ -726,7 +728,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                                                         List<DesignSingleItemDTO> designSingleItemDTOList,
                                                         List<DesignPythonOutfitVO> layersObject,
                                                         String singleOrOverall,
-                                                        Map<String, String> categoryAndUndividedLayer) {
+                                                        Map<String, String> priorityAndUndividedLayer) {
 
         DesignSingleVO designSingleVO = new DesignSingleVO();
         ArrayList<DesignItemClothesDetailVO> clothes = new ArrayList<>();
@@ -761,7 +763,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                             && (flag ? Boolean.TRUE : singleItem.getPriority().equals(layers.getPriority())))
             ).collect(Collectors.toList()));
             designItemClothesDetailVO.setGradient(singleItem.getGradient());
-            if (categoryAndUndividedLayer.containsKey(singleItem.getType().toLowerCase())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(categoryAndUndividedLayer.get(singleItem.getType().toLowerCase()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true));
+            if (priorityAndUndividedLayer.containsKey(singleItem.getPriority().toString())) designItemClothesDetailVO.setUndividedLayer(minioUtil.getPreSignedUrl(priorityAndUndividedLayer.get(singleItem.getPriority().toString()), CommonConstant.MINIO_IMAGE_EXPIRE_TIME, true));
             body.setLayersObject(layersObject.stream().filter(layers -> layers.getImageCategory().equals("body")).collect(Collectors.toList()));
 
             clothes.add(designItemClothesDetailVO);

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> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
+        Map<String, String> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
         for (DesignPythonItem detail : item.getItems()) {
             if (null == detail) {
                 continue;
@@ -797,7 +797,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 (!detail.getType().equals("Body")) designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
             if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                 designItemDetail.setPath(detail.getBody_path());
                 //BODY不关联businessId
@@ -917,7 +917,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);
+            Map<String, String> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
             for (DesignPythonItem detail : item.getItems()) {
                 if (null == detail) {
                     continue;
@@ -928,7 +928,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 (!detail.getType().equals("Body")) designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
                 if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                     designItemDetail.setPath(detail.getBody_path());
                     //BODY不关联businessId
@@ -1977,7 +1977,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);
+                Map<String, String> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers);
                 for (DesignPythonItem detail : item.getItems()) {
                     if (null == detail) {
                         continue;
@@ -1988,7 +1988,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 (!detail.getType().equals("Body")) designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()));
                     if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                         designItemDetail.setPath(detail.getBody_path());
                         //BODY不关联businessId