属性管理

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

@@ -228,8 +228,7 @@ public class AttributesController {
     @GetMapping("/queryAttrInfo")
     @ResponseBody
     public R queryAttrInfo(@RequestParam("itemId") String 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.stream().filter(p -> p.getParamName() != null)
 //                .filter(p -> p.getParamValue() != null)
@@ -250,37 +249,43 @@ public class AttributesController {
 //
 //        });
 //        List<AttributesEntity> attributesList = new ArrayList<>();
-        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());
-                if (StringUtils.isNotBlank(param.getAttrDescId())) {
-                    AttributesDescEntity desc = attributesDescService.queryObject(param.getAttrDescId());
-                    param.setAttrDescId(desc.getAttrDescId());
-                    if (StringUtils.isBlank(desc.getAttrDesc())) {
-                        param.setParamValue(desc.getAttrValue());
-                    } else {
-                        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);
+//        List<TbCfItemParamEntity> list = new ArrayList<>();
+//        paramList.forEach(param -> {
+//            if (StringUtils.isNotBlank(param.getAttrId())) {
+//                AttributesEntity attr = attributesService.queryObject(param.getAttrId());
+//                param.setAttrId(attr.getId());
+//                param.setParamName(attr.getAttrName());
+//                if (StringUtils.isNotBlank(param.getAttrDescId())) {
+//                    AttributesDescEntity desc = attributesDescService.queryObject(param.getAttrDescId());
+//                    param.setAttrDescId(desc.getAttrDescId());
+//                    if (StringUtils.isBlank(desc.getAttrDesc())) {
+//                        param.setParamValue(desc.getAttrValue());
+//                    } else {
+//                        param.setParamValue(desc.getAttrValue() + "(" + desc.getAttrDesc() + ")");
+//                    }
+//                }
+//
+//            }
+//            list.add(param);
+//
+//        });
 
+        //===================================================================================================
+        List<TbCfItemParamEntity> paramList = itemParamService.queryParamByItemId(itemId);
+        List<String> names = paramList.stream().map(TbCfItemParamEntity::getParamName).collect(Collectors.toList());
+        List<AttributesEntity> allAttributes = attributesService.queryList(null);
+        List<String> list = allAttributes.stream().map(AttributesEntity::getAttrName).collect(Collectors.toList());
+
+        List<String> collect = list.stream().filter(attr -> !names.contains(attr)).collect(Collectors.toList());
+        collect.forEach(c -> {
+            AttributesEntity attributes = attributesService.queryByAttrName(c);
+            TbCfItemParamEntity param = new TbCfItemParamEntity();
+            param.setParamName(attributes.getAttrName());
+            param.setAttrId(attributes.getId());
+            paramList.add(param);
         });
 
-
         return R.ok().put("list", paramList);
     }
 

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

@@ -15,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public interface TbCfItemParamDao extends BaseDao<TbCfItemParamEntity> {
 
-    CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId);
+    List<TbCfItemParamEntity> queryParamByItemId(String itemId);
 
     int deleteByItemId(String itemId);
 

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

@@ -71,7 +71,7 @@ public interface TbCfItemParamService {
      */
     int deleteBatch(String[] ids);
 
-    CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId);
+    List<TbCfItemParamEntity> queryParamByItemId(String itemId);
 
     List<String> queryItemByParam(Map<String, Object> params);
 }

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

@@ -64,7 +64,7 @@ public class TbCfItemParamServiceImpl implements TbCfItemParamService {
     }
 
 
-    public CopyOnWriteArrayList<TbCfItemParamEntity> queryParamByItemId(String itemId) {
+    public List<TbCfItemParamEntity> queryParamByItemId(String itemId) {
         return tbCfItemParamDao.queryParamByItemId(itemId);
     }