规格前台回显，单规格查询

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/Rule.java

@@ -42,7 +42,7 @@ public class Rule extends BaseEntity
     public static Rule saveBuilder(RuleAttrReq req, Supplier<String> username){
         return Rule.builder()
                 .name(req.getName())
-                .states(req.getStates())
+                .states(req.getStates()==null? null: req.getStates())
                 .createBy(username.get())
                 .createTime(new Date())
                 .build();

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/RuleAttr.java

@@ -42,6 +42,8 @@ public class RuleAttr extends BaseEntity {
      */
     @Excel(name = "规格属性")
     private String attrName;
+
+
     private String attrValue;
 
 

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrAddModel.java

@@ -9,8 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
 
 /**
  * @ClassName RuleAttrAddModel
@@ -27,10 +26,20 @@ public class RuleAttrAddModel extends BaseEntity {
     private String attrName;
     private List<String> valueList;
 
-    public static RuleAttrAddModel saveBuilder(RuleAttr ruleAttr) {
+    public static List<RuleAttrAddModel> saveBuilder(List<RuleAttr> rules) {
-        return RuleAttrAddModel.builder()
+        HashMap<String, List<String>> stringListHashMap = new HashMap<>();
-                .attrName(ruleAttr.getAttrName())
+        for (RuleAttr rule : rules) {
-                .valueList(Arrays.stream(ruleAttr.getAttrValue().split(",")).toList())
+            if (stringListHashMap.containsKey(rule.getAttrName())){
-                .build();
+                stringListHashMap.get(rule.getAttrName()).add(rule.getAttrValue());
+            }else {
+                ArrayList<String> strings = new ArrayList<>();
+                strings.add(rule.getAttrValue());
+                stringListHashMap.put(rule.getAttrName(),strings);
+            }
+        }
+        return stringListHashMap.keySet().stream()
+                .map(key -> new RuleAttrAddModel
+                        (key, stringListHashMap.get(key)))
+                .toList();
     }
 }

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/RuleAttrFindId.java

@@ -0,0 +1,26 @@
+package com.muyu.product.domain.model;
+
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @ClassName RuleAttrFindId
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/3/9/0009 16:46
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleAttrFindId extends BaseEntity {
+    private Long id;
+    private String ruleName;
+    private String ruleValue;
+
+
+
+}

muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/RuleAttrResp.java

@@ -2,6 +2,7 @@ package com.muyu.product.domain.resp;
 
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.product.domain.Rule;
+import com.muyu.product.domain.RuleAttr;
 import com.muyu.product.domain.model.RuleAttrAddModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -25,13 +26,15 @@ public class RuleAttrResp extends BaseEntity {
     private Long id;
     private String name;
     private String states;
-    private List<RuleAttrAddModel> ruleAttrAddModels;
+    private List<RuleAttrAddModel> ruleAttrList;
+
+
 
     public static RuleAttrResp saveBuilder(Rule rule, Function<Long,List<RuleAttrAddModel>> ruleAttrs){
         return RuleAttrResp.builder()
                 .id(rule.getId())
                 .name(rule.getName())
-                .ruleAttrAddModels(ruleAttrs.apply(rule.getId()))
+                .ruleAttrList(ruleAttrs==null? null : ruleAttrs.apply(rule.getId()))
                 .states(rule.getStates())
                 .build();
     }

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleController.java

@@ -89,6 +89,7 @@ public class RuleController extends BaseController
     @GetMapping(value = "/{id}")
     public Result getInfo(@PathVariable("id") Long id)
     {
+
         return success(ruleService.selectRuleById(id));
     }
 

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/IRuleService.java

@@ -22,7 +22,7 @@ public interface IRuleService extends IService<Rule>
      * @param id 规格主键
      * @return 规格
      */
-    Rule selectRuleById(Long id);
+    RuleAttrResp selectRuleById(Long id);
 
     /**
      * 查询规格列表

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/RuleServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * 规格Service业务层处理
@@ -43,8 +44,17 @@ public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements IR
      * @return 规格
      */
     @Override
-    public Rule selectRuleById(Long id) {
+    public RuleAttrResp selectRuleById(Long id) {
-        return ruleMapper.selectRuleById(id);
+        Rule byId = this.getById(id);
+        return RuleAttrResp.saveBuilder(byId, new Function<Long, List<RuleAttrAddModel>>() {
+            @Override
+            public List<RuleAttrAddModel> apply(Long id) {
+                LambdaQueryWrapper<RuleAttr> wrapper = new LambdaQueryWrapper<>();
+                List<RuleAttr> list = ruleAttrService.list(wrapper.eq(RuleAttr::getRuleId, id));
+                return RuleAttrAddModel.saveBuilder(list);
+            }
+        });
+//        return RuleAttrResp.saveBuilder(ruleMapper.selectRuleById(id), null);
     }
 
     /**
@@ -121,23 +131,14 @@ public class RuleServiceImpl extends ServiceImpl<RuleMapper, Rule> implements IR
 
     @Override
     public List<RuleAttrResp> selectRuleAttrList(RuleAttrReq ruleAttrReq) {
-
         //规格集合
         List<Rule> rules = this.selectRuleList(Rule.saveBuilder(ruleAttrReq, SecurityUtils::getUsername));
-        //规格主键集合
+        return rules.stream().map(rule ->
-        List<Long> ruleIdList = rules.stream().map(Rule::getId).toList();
+                RuleAttrResp.saveBuilder(rule, id -> {
-
+                    LambdaQueryWrapper<RuleAttr> wrapper = new LambdaQueryWrapper<>();
-        //创建响应值容器
+                    List<RuleAttr> list = ruleAttrService.list(wrapper.eq(RuleAttr::getRuleId, rule.getId()));
-        List<RuleAttrResp> ruleAttrResps = new ArrayList<>();
+                    return RuleAttrAddModel.saveBuilder(list);
-        //根据编号转换响应对象
+                })
-
-        ruleAttrResps = rules.stream().map(rule ->
-            RuleAttrResp.saveBuilder(rule, id -> {
-                        LambdaQueryWrapper<RuleAttr> wrapper = new LambdaQueryWrapper<>();
-                        List<RuleAttr> list = ruleAttrService.list(wrapper.eq(RuleAttr::getRuleId, rule.getId()));
-                        return list.stream().map(RuleAttrAddModel::saveBuilder).toList();
-                    })
         ).toList();
-        return ruleAttrResps;
     }
 }

muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/RuleMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectRuleVo">
-        select id, name, remark, create_by, create_time, update_by, update_time from rule
+        select id, name,states, remark, create_by, create_time, update_by, update_time from rule
     </sql>
 
     <select id="selectRuleList" parameterType="com.muyu.product.domain.Rule" resultMap="RuleResult">