Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

# Conflicts:
#	jyzb-biz/src/main/resources/mapper/PriceSumSummaryMapper.xml

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -39,6 +39,8 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @Service
@@ -89,23 +91,41 @@ public class TjServiceImpl implements TjService {
         //先拿到符合条件的组织机构，再遍历组织机构组成数据
         //（下一层数据组织机构数据）
        List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
-       List<TjOrgEqsDto> allData=new ArrayList<>();
+//       List<TjOrgEqsDto> allData=new ArrayList<>();
 
-        List<CompletableFuture<TjOrgEqsDto>> futures = orgList.stream()
-                .map(orgId -> CompletableFuture.supplyAsync(() -> {
-                    return inventorySummaryMapper.GetInvSum(
+        Executor customExecutor = Executors.newFixedThreadPool(10); // 创建一个固定大小的线程池
+
+        // 定义一个批处理大小，即每次处理的最大 orgId 数量
+        int batchSize = 5;
+
+// 将 orgList 分组，每组包含 batchSize 个 orgId
+        List<List<String>> batches = new ArrayList<>();
+        for (int i = 0; i < orgList.size(); i += batchSize) {
+            int endIndex = Math.min(i + batchSize, orgList.size());
+            List<String> batch = orgList.subList(i, endIndex);
+            batches.add(batch);
+        }
+
+// 创建一个 CompletableFuture 的列表，每个 CompletableFuture 处理一个批次的 orgId
+        List<CompletableFuture<List<TjOrgEqsDto>>> futures = batches.stream()
+                .map(batch -> CompletableFuture.supplyAsync(() -> {
+                    List<TjOrgEqsDto> results = new ArrayList<>();
+                    for (String orgId : batch) {
+                        // 调用 GetInvSum 方法，处理当前批次的所有 orgId
+                        TjOrgEqsDto result = inventorySummaryMapper.GetInvSum(
                                 orgId,
                                 req.getTypeIdsList().isEmpty() ? null : req.getTypeIdsAsString(),
                                 req.getSizeNameList().isEmpty() ? null : req.getSizesAsString());
-                }))
+                        results.add(result);
+                    }
+                    return results;
+                }, customExecutor)) // 使用自定义的 Executor
                 .collect(Collectors.toList());
 
-        CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-
-        allOf.join(); // 等待所有 CompletableFuture 完成
-
-        allData = futures.stream()
+// 等待所有 CompletableFuture 完成，并收集结果
+        List<TjOrgEqsDto> allData = futures.stream()
                 .map(CompletableFuture::join)
+                .flatMap(List::stream)
                 .collect(Collectors.toList());
 
         if (req.getOrgId()!=1369509498032808905L)

jyzb-biz/src/main/java/com/junmp/jyzb/websocket/WarehouseWebSocketServer.java

@@ -76,6 +76,8 @@ public class WarehouseWebSocketServer implements WebSocketServerListener {
             String warehouseId = deviceData.getWarehouseId();
             deviceData.getOrgId();
             String redisExist= redisCache.get(warehouseId);
+            deviceData.getOrgId();
+
             if(redisExist!=null)//已有存在数据
             {
 

jyzb-biz/src/main/resources/mapper/PriceSumSummaryMapper.xml

@@ -221,19 +221,33 @@
     <select id="TjOrgPriceBySelf" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
 
         SELECT
-        t1.start_num,t1.start_price,t2.end_num,t2.end_price,t2.end_num - t1.start_num AS add_num,
+        start_num,
+        start_price,
+        end_num,
+        end_price,
+        destory_num,
+        destory_price
+        org_code,
         t2.end_price - t1.start_price AS add_price, t2.destory_num,t2.destory_price,t2.org_id,t2.org_code,t2.org_name,t2.d_name
+        org_id,
+        d_name
         FROM
+        pub_org
+        WHERE
+        org_id = #{orgId}
+        ) AS po
+        JOIN
         (
         SELECT
         COALESCE(SUM(COALESCE ( start_num, 0 )),0) AS start_num,
         COALESCE(SUM(COALESCE ( start_price, 0 )),0) AS start_price
         FROM
-        vie_price_sum_summary vpss
+        vie_price_sum_summary
         WHERE
         vpss.MONTH = 1 and vpss.year=2024
         AND org_id_int =  #{orgId}
         and vpss.create_time >= '2024-01-01 00:00:00' AND vpss.create_time &lt; '2025-01-01 00:00:00'
+        AND org_id_int = #{orgId}
         <if test="typeIdsList!=null and typeIdsList.size() > 0">
             and type_id in
             <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
@@ -246,8 +260,9 @@
                 size_name like CONCAT('%', #{item}, '%')
             </foreach>
         </if>
-        ) AS t1
+        ) AS t2 ON 1=1
         JOIN (
+        (
         SELECT
         COALESCE(sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ),0) AS end_num,
         COALESCE(sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ),0) AS end_price,