初始化刷新Redis约束关系

src/main/java/cn/com/uitech/authorization/controller/IntegrateController.java

@@ -25,10 +25,7 @@ package cn.com.uitech.authorization.controller;
         import org.springframework.web.client.RestTemplate;
 
         import javax.annotation.Resource;
-        import java.util.ArrayList;
-        import java.util.HashMap;
-        import java.util.List;
-        import java.util.Map;
+        import java.util.*;
 
 @RestController
 @RequestMapping("/integrate")
@@ -71,51 +68,48 @@ public class IntegrateController {
     public Object initializationData(@RequestBody SelectorEntity selectorEntity) {
         String redis = redisHelper.get(RedisKey.getVariantTableKey(selectorEntity.getSystem(), selectorEntity.getProductClassCode(), selectorEntity.getSuperBomCode()));
         if (ObjectUtils.isEmpty(redis)) {
-            List<SuperTableInfoDto> superTableInfos = superTableInfoMapper.findBySuperBomCode(selectorEntity.getSuperBomCode());
-            List<RedisEntity> redisEntities = new ArrayList<>();
-            superTableInfos.forEach(superTableInfo->{
-                RedisEntity redisEntity = new RedisEntity();
-                redisEntity.setTableName(superTableInfo.getTableName());
-                redisEntity.setTableId(superTableInfo.getTableId());
-                Map<String, Object> map = new HashMap<>();
-                List<SuperTableInfoItemDto> data = superTableInfo.getData();
-                List<String> featureComponentNames = new ArrayList<>();
+            // table信息
+            List<Map<String, String>> superTableInfos = superTableInfoMapper.findBySuperBomCode(selectorEntity.getSuperBomCode());
+            // 拿table信息取所有的组
+            List<Map<String, Object>> resultList = new ArrayList<>();
+            superTableInfos.forEach(item -> {
+                Map<String, Object> resultMap = new HashMap<>();
+                Map<String, Object> data = new HashMap<>();
+                String tablenumber = item.get("tablenumber");
+                resultMap.put("tableName", item.get("tablename"));
+                resultMap.put("tableId", tablenumber);
+                // 根据tableNumber 查询所有的groupNumber
+//            constraintCharacteristicName
+                Set<String> characteristicnames = new HashSet<>();
                 List<Map<String, Object>> constraintCharacteristicValues = new ArrayList<>();
-                data.forEach(item -> {
+                List<String> groupNumbers = superTableInfoMapper.findGroupNumber(tablenumber);
+                groupNumbers.forEach(groupNumber -> {
                     Map<String, Object> constraintCharacteristicValue = new HashMap<>();
+                    List<Map<String, String>> constraintCharacteristicNames = superTableInfoMapper.findCName(tablenumber, groupNumber);
                     List<Map<String, Object>> characteristicValues = new ArrayList<>();
-                    List<SuperTableInfo> infos = item.getSuperTableInfos();
-                    infos.forEach(info -> {
+                    constraintCharacteristicNames.forEach(constraintCharacteristicName -> {
                         Map<String, Object> characteristicValue = new HashMap<>();
-                        List<String> values = new ArrayList<>();
-                        List<SuperTableItemInfo> itemInfos = info.getData();
-                        itemInfos.forEach(itemInfo -> {
-                            constraintCharacteristicValue.put("groupNumber", item.getGroupNumber());
-                            String characteristicCode = itemInfo.getCharacteristicCode();
-                            String cName = integrateService.getNameByCode(characteristicCode,selectorEntity.getIsShow(), item.getGroupNumber());
-                            if (!StringUtils.isEmpty(cName)) {
-                                characteristicValue.put("characteristicName", cName);
-                                String characteristicValueCode = itemInfo.getCharacteristicValueCode();
-                                if (!StringUtils.isEmpty(characteristicValueCode)) {
-                                    String vName = integrateService.getVNameByCode(characteristicValueCode,characteristicCode);
-                                    values.add(vName);
-                                }
-                                featureComponentNames.add(cName);
-                            }
-                        });
+                        String characteristicname = constraintCharacteristicName.get("characteristicname");
+                        characteristicnames.add(characteristicname);
+                        String characteristiccode = constraintCharacteristicName.get("characteristiccode");
+                        // 拿code和groupnumber 查Vname
+                        List<String> values = superTableInfoMapper.findVName(tablenumber, characteristiccode, groupNumber);
                         characteristicValue.put("values", values);
+                        characteristicValue.put("characteristicName", characteristicname);
                         characteristicValues.add(characteristicValue);
+                        constraintCharacteristicValue.put("characteristicValues", characteristicValues);
+
                     });
+                    constraintCharacteristicValue.put("groupNumber", groupNumber);
                     constraintCharacteristicValues.add(constraintCharacteristicValue);
+                    data.put("constraintCharacteristicName", characteristicnames);
+                    data.put("constraintCharacteristicValues", constraintCharacteristicValues);
                 });
-                map.put("constraintCharacteristicValues", constraintCharacteristicValues);
-                map.put("constraintCharacteristicName", featureComponentNames);
-                redisEntity.setData(map);
-                redisEntities.add(redisEntity);
+                resultMap.put("data", data);
+                resultList.add(resultMap);
             });
-            redisHelper.set(RedisKey.getVariantTableKey(selectorEntity.getSystem(), selectorEntity.getProductClassCode(), selectorEntity.getSuperBomCode()), JSONObject.toJSONString(redisEntities), 86400);
+            redisHelper.set(RedisKey.getVariantTableKey(selectorEntity.getSystem(), selectorEntity.getProductClassCode(), selectorEntity.getSuperBomCode()), JSONObject.toJSONString(resultList), 86400);
         }
-
         ConfigurableBom configurableBom = integrateService.getOdInfo(selectorEntity);
         // 查询用户对应的角色以及能够查询得所有C\V 组合之后调用initialization接口
         // 返回得参数交互数据库查询对应的code返回

src/main/java/cn/com/uitech/authorization/mapper/SuperTableInfoMapper.java

@@ -5,6 +5,7 @@ import cn.com.uitech.authorization.pojo.dto.SuperTableInfoDto;
 import cn.com.uitech.authorization.pojo.dto.SuperTableInfoLog;
 import cn.com.uitech.authorization.pojo.entity.SuperTableInfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -21,5 +22,11 @@ public interface SuperTableInfoMapper extends IBaseMapper<SuperTableInfo>{
 
     void deleteBom(SuperTableInfo getOne);
 
-    List<SuperTableInfoDto> findBySuperBomCode(String superBomCode);
+    List<Map<String,String>> findBySuperBomCode(String superBomCode);
+
+    List<String> findGroupNumber(@Param("tablenumber") String tablenumber);
+
+    List<Map<String,String>> findCName(@Param("tablenumber") String tablenumber, @Param("groupNumber") String groupNumber);
+
+    List<String> findVName(@Param("tablenumber") String tablenumber, @Param("characteristiccode") String characteristiccode, @Param("groupNumber") String groupNumber);
 }

src/main/java/cn/com/uitech/authorization/pojo/dto/SuperTableInfoItemDto.java

@@ -17,5 +17,5 @@ import java.util.List;
 public class SuperTableInfoItemDto {
     private String tableId;
     private String groupNumber;
-    private List<SuperTableInfo> superTableInfos;
+    private List<SuperTableInfo> constraintCharacteristicValues;
 }

src/main/java/cn/com/uitech/authorization/pojo/entity/SuperTableItemInfo.java

@@ -5,6 +5,7 @@ import lombok.experimental.Accessors;
 
 import javax.persistence.Column;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 import java.sql.Timestamp;
 
@@ -41,12 +42,18 @@ public class SuperTableItemInfo implements Serializable {
     @Column(name = "characteristic_code")
     private String characteristicCode;
 
+    @Transient
+    private String characteristicName;
+
     /**
     * characteristic_value_code
     */
     @Column(name = "characteristic_value_code")
     private String characteristicValueCode;
 
+    @Transient
+    private String characteristicValueName;
+
     /**
     * create_time
     */

src/main/resources/mapper/SuperTableInfoMapper.xml

@@ -50,25 +50,24 @@
         <result property="superBomCode" column="super_bom_code"/>
         <collection property="data" ofType="cn.com.uitech.authorization.pojo.dto.SuperTableInfoItemDto">
             <result property="groupNumber" column="group_number"/>
-            <collection property="superTableInfos" ofType="cn.com.uitech.authorization.pojo.entity.SuperTableInfo">
-                <result property="superBomCode" column="super_bom_code"/>
-                <result property="tableName" column="table_name"/>
-                <result property="tableNumber" column="table_number"/>
-                <collection property="data"
-                            ofType="cn.com.uitech.authorization.pojo.entity.SuperTableItemInfo">
-                    <result property="characteristicValueCode" column="characteristic_value_code"/>
-                    <result property="characteristicCode" column="characteristic_code"/>
-                </collection>
+            <collection property="constraintCharacteristicValues"
+                        ofType="cn.com.uitech.authorization.pojo.entity.SuperTableItemInfo">
+                <result property="characteristicValueName" column="characteristic_value_name"/>
+                <result property="characteristicName" column="characteristic_name"/>
             </collection>
         </collection>
     </resultMap>
 
-    <select id="findBySuperBomCode" resultMap="baseResultMap">
-        select * from super_table_info a
-        left join super_table_item_info b on a.table_number = b.table_number
-        left join super_characteristic_info c on b.characteristic_code = c.characteristic_code
-        left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code
-        where a.super_bom_code = #{superBomCode}
-        order by b.characteristic_code
+    <select id="findBySuperBomCode" resultType="map">
+        select distinct table_name tablename,table_number tablenumber from super_table_info a where a.super_bom_code = #{superBomCode}
+    </select>
+    <select id="findGroupNumber" resultType="java.lang.String">
+        select distinct group_number groupnumber from super_table_item_info where table_number = #{tablenumber}
+    </select>
+    <select id="findCName" resultType="map">
+        select distinct c.characteristic_code characteristiccode,c.characteristic_name characteristicname from super_table_item_info b left join super_characteristic_info c on b.characteristic_code = c.characteristic_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber}
+    </select>
+    <select id="findVName" resultType="java.lang.String">
+        select distinct d.characteristic_value_name from super_table_item_info b left join super_characteristic_value_info d on b.characteristic_value_code = d.characteristic_value_code where b.table_number  =#{tablenumber} and b.group_number = #{groupNumber} and b.characteristic_code = #{characteristiccode}
     </select>
 </mapper>