属性管理

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

@@ -150,8 +150,40 @@ public class AttributesController {
             AttributesVo attrNames = new AttributesVo();
             attrNames.setId(attr.getId());
             attrNames.setAttrName(attr.getAttrName());
-            List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(attr.getId());
+//            List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(attr.getId());
+//
+//            List<AttributesDescVo> attributesVos = new ArrayList<>();
+//            descs.forEach(desc -> {
+//                AttributesDescVo descVo = new AttributesDescVo();
+//                String attrValue = desc.getAttrValue();
+//                String attrDesc = desc.getAttrDesc();
+//                descVo.setAttrDescId(desc.getAttrDescId());
+//                descVo.setAttrValue(attrValue + "(" + attrDesc + ")");
+//                attributesVos.add(descVo);
+//            });
+//
+//            attrNames.setDescList(attributesVos);
+            attrNameList.add(attrNames);
 
+        });
+        return R.ok().put("list", attrNameList);
+    }
+
+    /**
+     * 属性值
+     *
+     * @param id 属性Id
+     * @return url（../attributes/queryAttrDescs?id=2）
+     */
+    @RequestMapping("/queryAttrDescs")
+    @ResponseBody
+    @IgnoreAuth
+    public R queryAttrDescs(@RequestParam("id") String id) {
+        if (StringUtils.isBlank(id)) {
+            return R.error("id不能为空！");
+        }
+
+        List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(id);
         List<AttributesDescVo> attributesVos = new ArrayList<>();
         descs.forEach(desc -> {
             AttributesDescVo descVo = new AttributesDescVo();
@@ -162,38 +194,9 @@ public class AttributesController {
             attributesVos.add(descVo);
         });
 
-            attrNames.setDescList(attributesVos);
-            attrNameList.add(attrNames);
-
-        });
-        return R.ok().put("list", attrNameList);
+        return R.ok().put("list", attributesVos);
     }
 
-//    /**
-//     * 属性值
-//     *
-//     * @param id 属性Id
-//     * @return url（../attributes/queryAttrDescs?id=2）
-//     */
-//    @RequestMapping("/queryAttrDescs")
-//    @ResponseBody
-//    @IgnoreAuth
-//    public R queryAttrDescs(@RequestParam("id") String id) {
-//        if (StringUtils.isBlank(id)) {
-//            return R.error("id不能为空！");
-//        }
-//        List<String> attrDescList = new ArrayList<>();
-//        List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(id);
-//
-//        descs.forEach(desc -> {
-//            String attrValue = desc.getAttrValue();
-//            String attrDesc = desc.getAttrDesc();
-//            attrDescList.add(attrValue + "(" + attrDesc + ")");
-//        });
-//
-//        return R.ok().put("list", attrDescList);
-//    }
-
     /**
      * 新版商品属性（整合旧版数据）
      * 商品属性回显

platform-admin/src/main/java/com/platform/vo/AttributesVo.java

@@ -14,5 +14,5 @@ import java.util.List;
 public class AttributesVo {
     private String id;
     private String attrName;
-    private List<AttributesDescVo> descList;
+//    private List<AttributesDescVo> descList;
 }

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

@@ -36,7 +36,7 @@
 			`create_time`,
 			`update_time`
 		from attributes_desc
-		where attr_id = #{id}
+		where attr_desc_id = #{id}
 	</select>
 
 	<select id="queryList" resultType="com.platform.entity.AttributesDescEntity">