属性管理

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

 package com.platform.controller;
 
+import com.platform.annotation.IgnoreAuth;
 import com.platform.entity.AttributesEntity;
+import com.platform.entity.TbCfItemParamEntity;
 import com.platform.service.AttributesService;
+import com.platform.service.TbCfItemParamService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
 import com.platform.utils.R;
@@ -11,11 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -34,6 +33,8 @@ import java.util.stream.Stream;
 public class AttributesController {
     @Autowired
     private AttributesService attributesService;
+    @Autowired
+    private TbCfItemParamService itemParamService;
 
     /**
      * 查看列表
@@ -115,6 +116,7 @@ public class AttributesController {
 
     @RequestMapping("/queryAttrNames")
     @ResponseBody
+    @IgnoreAuth
     public R queryAttrNames(@RequestParam Map<String, Object> params) {
         LinkedList<AttributesVo> attrNameList = new LinkedList<>();
         List<AttributesEntity> list = attributesService.queryList(params);
@@ -129,6 +131,7 @@ public class AttributesController {
 
     @RequestMapping("/queryAttrDescs")
     @ResponseBody
+    @IgnoreAuth
     public R queryAttrDescs(@RequestParam("id") String id,
                             @RequestParam(value = "attrDesc", required = false) String attrDesc) {
         if (StringUtils.isBlank(id)) {
@@ -152,4 +155,33 @@ public class AttributesController {
         return R.ok().put("list", list);
     }
 
+    /**
+     * 新版商品属性（整合旧版）
+     *
+     * @param itemId
+     * @return
+     */
+    @IgnoreAuth
+    @GetMapping("/queryAttrInfo")
+    @ResponseBody
+    public R queryAttrInfo(@RequestParam("itemId") String itemId) {
+        List<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();
+                param.setParamName(attr.getAttrName());
+                paramList.add(param);
+            }
+
+        });
+
+        return R.ok().put("list", paramList);
+    }
+
+
 }