属性管理

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

@@ -180,23 +180,37 @@ public class AttributesController {
     @RequestMapping("/queryAttrDescs")
     @ResponseBody
     @IgnoreAuth
-    public R queryAttrDescs(@RequestParam("id") String id) {
-        if (StringUtils.isBlank(id)) {
-            return R.error("id不能为空！");
+    public R queryAttrDescs(@RequestParam(value = "id", required = false) String id,
+                            @RequestParam(value = "name", required = false) String name) {
+
+
+        if (StringUtils.isBlank(id) && StringUtils.isBlank(name))
+            return R.error("参数不能为空！");
+
+        if (StringUtils.isNotBlank(name)) {
+            AttributesEntity attributes = attributesService.queryByAttrName(name);
+            id = attributes.getId();
         }
 
+        Map<String, Object> map = new LinkedHashMap<>();
         List<AttributesDescEntity> descs = attributesDescService.queryByAttrId(id);
         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);
-        });
+        if (descs.size() > 0 && descs != null) {
+            map.put("attrId", id);
+            descs.forEach(desc -> {
+                AttributesDescVo descVo = new AttributesDescVo();
+                String attrValue = desc.getAttrValue();
+                String attrDesc = desc.getAttrDesc();
+//                descVo.setAttrId(desc.getAttrId());
+                descVo.setAttrDescId(desc.getAttrDescId());
+                descVo.setAttrValue(attrValue + "(" + attrDesc + ")");
+                attributesVos.add(descVo);
+            });
+        }
+
         List<AttributesDescVo> list = attributesVos.stream().sorted(Comparator.comparing(AttributesDescVo::getAttrValue)).collect(Collectors.toList());
-        return R.ok().put("list", list);
+        map.put("descs", list);
+        return R.ok().put("list", map);
     }
 
     /**

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

@@ -12,6 +12,7 @@ import java.util.List;
  */
 @Data
 public class AttributesDescVo {
+//    private String attrId;
     private String attrDescId;
     private String attrValue;