From fa3908c77a4ac8832e03323e6247ec1d77248719 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 12 Jan 2024 15:19:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/REvaluationDataServiceImpl.java      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
index 8b7de36ef..e3ef320b1 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -138,16 +138,15 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
                 item.setMonitorBusRate(value);
                 item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
             }).collect(Collectors.toList());
-            log.info(JSON.toJSONString(l1));
-//            //组装数据
-//            SendParam sp = new SendParam();
-//            sp.setStats(l1);
-//            sp.setStatisticalDate(param.getTime());
-//            //上送数据
-//            Map<String, String> send = GwSendUtil.send(sp, GWSendEnum.EVALUATION);
-//            //获取返回结果
-//            List<String> l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList());
-//            returnInformation(i,l,send);
+            //组装数据
+            SendParam sp = new SendParam();
+            sp.setStats(l1);
+            sp.setStatisticalDate(param.getTime());
+            //上送数据
+            Map<String, String> send = GwSendUtil.send(sp, GWSendEnum.EVALUATION);
+            //获取返回结果
+            List<String> l = pendingIds.get(i).stream().map(PqEvaluationCreateDTO::getId).collect(Collectors.toList());
+            returnInformation(i,l,send);
         }
         return "上送成功:成功数据" + list.size() + "条";
     }