From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java
index f1edfa2..939cd2b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomHeaderServiceImpl.java
@@ -1,8 +1,8 @@
 package com.aps.core.service.impl;
 
 import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
 import com.aps.common.core.utils.DateUtils;
+import com.aps.core.domain.ApsBom;
 import com.aps.core.domain.ApsBomHeader;
 import com.aps.core.mapper.ApsBomHeaderMapper;
 import com.aps.core.service.IApsBomHeaderService;
@@ -10,7 +10,11 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * BOM Header 鏁版嵁绠$悊Service涓氬姟灞傚鐞�
@@ -108,28 +112,27 @@
     @Override
     public boolean setBomDataToRedis(String orgCode) {
         try {
-            List<JSONObject> bomRedisData = apsBomHeaderMapper.selectBomRedisData(orgCode);
-            String nowMainItemCode = "";
-            JSONArray bomLine = new JSONArray();
-            for (int i=0,size=bomRedisData.size();i<size;i++) {
-                JSONObject jsonObject = bomRedisData.get(i);
-                if("".equals(nowMainItemCode)){
-                    nowMainItemCode = jsonObject.getString("mainitemcode");
-                }
-                if(!nowMainItemCode.equals(jsonObject.getString("mainitemcode"))){
-                    redisTemplate.opsForValue().set("BOM:BOM_"+orgCode+"_"+nowMainItemCode, bomLine);
-                    bomLine = new JSONArray();
-                }
-                bomLine.add(jsonObject);
-                nowMainItemCode = jsonObject.getString("mainitemcode");
-                if(i==size-1){
-                    redisTemplate.opsForValue().set("BOM:BOM_"+orgCode+"_"+nowMainItemCode, bomLine);
-                }
+            Set<String> keys = redisTemplate.keys("BOM:BOM_*");
+            if (keys != null && !keys.isEmpty()) {
+                redisTemplate.delete(keys);
             }
+            List<ApsBom> bomRedisData = apsBomHeaderMapper.selectBomRedisData(orgCode);
+            Map<String, List<ApsBom>> groupedByMainItemCode = bomRedisData.stream().collect(Collectors.groupingBy(ApsBom::getMainItemCode));
+            Map<String, Object> bulkData = new HashMap<>();
+            for (Map.Entry<String, List<ApsBom>> entry : groupedByMainItemCode.entrySet()) {
+                String mainItemCode = entry.getKey();
+                JSONArray jsonArray = JSONArray.from(entry.getValue());
+                bulkData.put("BOM:BOM_" + orgCode + "_" + mainItemCode, jsonArray);
+            }
+            redisTemplate.opsForValue().multiSet(bulkData);
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
         return true;
     }
+    @Override
+    public Integer getBomKeys(String orgCode){
+        return redisTemplate.keys("BOM:BOM_"+orgCode+"*").size();
+    }
 }

--
Gitblit v1.9.3