From f02dfead57b267f60e9265c0220a555bd8aba1d1 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 13 Nov 2024 17:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E5=B9=B6=E5=85=85=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/service/TempService.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
index 3c563185e..568f9a629 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java
@@ -587,29 +587,34 @@ public class TempService {
      */
     public Map<String, List<String>> checkCombinedChargingOrder(List<String> orderCodeList) throws BaseAdaPayException {
         Map<String, List<String>> resultMap = Maps.newHashMap();
-        Set<String> combinedChargingOrderList = Sets.newHashSet();
-        Set<String> notCombinedChargingOrderList = Sets.newHashSet();
+        List<String> combinedChargingOrderList = Lists.newArrayList();
+        List<String> notCombinedChargingOrderList = Lists.newArrayList();
+        List<String> noDataOrderList = Lists.newArrayList();
         for (String orderCode : orderCodeList) {
             // 查询orderMonitorData
             OrderMonitorData orderMonitorData = orderMonitorDataService.selectByOrderCode(orderCode);
             if (orderMonitorData == null) {
                 logger.info("订单:{}不存在", orderCode);
+                noDataOrderList.add(orderCode);
                 continue;
             }
             JSONArray jsonArray = JSONArray.parseArray(orderMonitorData.getMonitorData());
+            List<BigDecimal> orderOutputCurrentList = Lists.newArrayList();
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = jsonArray.getJSONObject(i);
                 String outputCurrent = jsonObject.getString("outputCurrent");
-                if (new BigDecimal(outputCurrent).compareTo(new BigDecimal(250)) > 0) {
-                    logger.info("订单:{}，第{}条数据，输出电流:{}，大于250，为并充订单", orderCode, i, outputCurrent);
-                    combinedChargingOrderList.add(orderCode);
-                    break;
-                }
+                orderOutputCurrentList.add(new BigDecimal(outputCurrent));
+            }
+            // 如果orderOutputCurrentList中任意一值大于250，判定为并充订单
+            if (orderOutputCurrentList.stream().anyMatch(current -> current.compareTo(new BigDecimal("250")) > 0)) {
+                combinedChargingOrderList.add(orderCode);
+            } else {
                 notCombinedChargingOrderList.add(orderCode);
             }
         }
-        resultMap.put("combinedChargingOrderList", Lists.newArrayList(combinedChargingOrderList));
-        resultMap.put("notCombinedChargingOrderList", Lists.newArrayList(notCombinedChargingOrderList));
+        resultMap.put("combinedChargingOrderList", combinedChargingOrderList);
+        resultMap.put("notCombinedChargingOrderList", notCombinedChargingOrderList);
+        resultMap.put("noDataOrderList", noDataOrderList);
         return resultMap;
     }
 }