属性管理

platform-admin/src/main/java/com/platform/controller/AttributesController.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -209,19 +210,46 @@ public class AttributesController {
     @GetMapping("/queryAttrInfo")
     @ResponseBody
     public R queryAttrInfo(@RequestParam("itemId") String itemId) {
-        List<TbCfItemParamEntity> paramList = itemParamService.queryParamByItemId(itemId);
+        CopyOnWriteArrayList<TbCfItemParamEntity> paramList = itemParamService.queryParamByItemId(itemId);
 //        List<String> names = paramList.stream().map(TbCfItemParamEntity::getParamName).collect(Collectors.toList());
-        Map<String, String> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        paramList.forEach(param -> map.put(param.getParamName(), param.getParamValue()));
-        List<AttributesEntity> attributes = attributesService.queryList(null);
-        attributes.forEach(attr -> {
-
-            if (!map.containsKey(attr.getAttrName())) {
-                TbCfItemParamEntity param = new TbCfItemParamEntity();
+//        Map<String, String> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+//        paramList.stream().filter(p -> p.getParamName() != null)
+//                .filter(p -> p.getParamValue() != null)
+//                .forEach(param -> map.put(param.getParamName(), param.getParamValue()));
+//        List<AttributesEntity> attributes = attributesService.queryList(null);
+//        attributes.forEach(attr -> {
+//
+//            if (!map.containsKey(attr.getAttrName())) {
+//                TbCfItemParamEntity param = new TbCfItemParamEntity();
+//                param.setParamName(attr.getAttrName());
+//                paramList.add(param);
+//            }
+//
+//        });
+        List<TbCfItemParamEntity> list = new ArrayList<>();
+        paramList.forEach(param -> {
+            if (StringUtils.isNotBlank(param.getAttrId())) {
+//                TbCfItemParamEntity param1 = new TbCfItemParamEntity();
+                AttributesEntity attr = attributesService.queryObject(param.getAttrId());
+                param.setAttrId(attr.getId());
                 param.setParamName(attr.getAttrName());
-                paramList.add(param);
+                if (StringUtils.isNotBlank(param.getAttrDescId())) {
+                    AttributesDescEntity desc = attributesDescService.queryObject(param.getAttrDescId());
+                    param.setAttrDescId(desc.getAttrDescId());
+                    param.setParamValue(desc.getAttrValue() + "(" + desc.getAttrDesc() + ")");
+                }
+//                paramList.add(param1);
+//                paramList.remove(param);
+            } /*else {
+                String name = param.getParamName();
+                AttributesEntity attr = attributesService.queryByAttrName(name);
+                if (attr != null) {
+                    param.setAttrId(attr.getId());
                 }
 
+            }*/
+            list.add(param);
+
         });
 
         return R.ok().put("list", paramList);

platform-admin/src/main/java/com/platform/dao/AttributesDao.java

@@ -16,4 +16,6 @@ public interface AttributesDao extends BaseDao<AttributesEntity> {
 
    List<AttributesExtends> queryAttributesList(Map<String, Object> map);
 
+   AttributesEntity queryByAttrName(String name);
+
 }

platform-admin/src/main/java/com/platform/dao/TbCfItemParamDao.java

@@ -3,6 +3,7 @@ package com.platform.dao;
 import com.platform.entity.TbCfItemParamEntity;
 
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 
 /**
@@ -13,7 +14,7 @@ import java.util.List;
  */
 public interface TbCfItemParamDao extends BaseDao<TbCfItemParamEntity> {
 
-    List<TbCfItemParamEntity> queryParamByItemId(String itemId);
+    CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId);
 
     int deleteByItemId(String itemId);
 

platform-admin/src/main/java/com/platform/service/AttributesService.java

@@ -71,4 +71,6 @@ public interface AttributesService {
     int deleteBatch(String[] ids);
 
     List<AttributesExtends> queryAttributesList(Map<String, Object> map);
+
+    AttributesEntity queryByAttrName(String name);
 }

platform-admin/src/main/java/com/platform/service/TbCfItemParamService.java

@@ -5,6 +5,7 @@ import com.platform.entity.TbCfStationItemEntity;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 商品参数Service接口
@@ -70,7 +71,7 @@ public interface TbCfItemParamService {
      */
     int deleteBatch(String[] ids);
 
-    List<TbCfItemParamEntity> queryParamByItemId(String itemId);
+    CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId);
 
     List<TbCfStationItemEntity> queryItemByParam(String param);
 }

platform-admin/src/main/java/com/platform/service/impl/AttributesServiceImpl.java

@@ -105,4 +105,9 @@ public class AttributesServiceImpl implements AttributesService {
     public List<AttributesExtends> queryAttributesList(Map<String, Object> map) {
         return attributesDao.queryAttributesList(map);
     }
+
+    @Override
+    public AttributesEntity queryByAttrName(String name) {
+        return attributesDao.queryByAttrName(name);
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfItemParamServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 商品参数Service实现类
@@ -63,7 +64,7 @@ public class TbCfItemParamServiceImpl implements TbCfItemParamService {
     }
 
 
-    public List<TbCfItemParamEntity> queryParamByItemId(String itemId) {
+    public CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId) {
         return tbCfItemParamDao.queryParamByItemId(itemId);
     }
 

platform-admin/src/main/resources/com/platform/dao/AttributesDao.xml

@@ -29,6 +29,19 @@
 		where id = #{id}
 	</select>
 
+    <select id="queryByAttrName" resultType="com.platform.entity.AttributesEntity">
+		select
+			`id`,
+			`attr_name`,
+			`status`,
+			`sort`,
+			`is_need`,
+			`create_time`,
+			`update_time`
+		from attributes
+		where attr_name = #{name} limit 1
+	</select>
+
     <select id="queryList" resultType="com.platform.entity.AttributesEntity">
         select
         `id`,