From e58cce62018ffdd31d4945401d2179ac8e909809 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 22 Jan 2024 09:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96=E5=8D=B8?=
 =?UTF-8?q?=E6=96=99=E5=B9=B3=E5=8F=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhgd/xmgl/security/WebSecurityConfig.java     | 1 +
 .../zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
index 24c2c3539..693dae210 100644
--- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
+++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
@@ -299,6 +299,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/workerInfo/selectPersonTypeAndEduStatistics").permitAll()
                     .antMatchers("/xmgl/taskProgressRt/queryById").permitAll()
                     .antMatchers("/xmgl/frontierProtectionNoNetData/alaDeviceSubscribe").permitAll()
+                    .antMatchers("/xmgl/highSlopeCurrentData/exportData").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()
diff --git a/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java b/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
index b96101560..5b0f60ec0 100644
--- a/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/DischargingPlatformCurrentDataTask.java
@@ -85,7 +85,7 @@ public class DischargingPlatformCurrentDataTask {
         map.put("pageNum", "1");
         map.put("startTime", DateUtil.formatDateTime(DateUtil.offsetMinute(now, -5)));
         map.put("endTime", DateUtil.formatDateTime(now));
-        JSONObject realTimeData = xiwonUtil.postForm("/unload/listRealUnloadData", project.getXiwonAppId(), project.getXiwonAppSecret(), map, JSONObject.class, (() -> {
+        JSONObject realTimeData = xiwonUtil.postForm("/unloading/realTimeData", project.getXiwonAppId(), project.getXiwonAppSecret(), map, JSONObject.class, (() -> {
             map.put("deviceSn", devSn);
             return map;
         }));
@@ -96,7 +96,10 @@ public class DischargingPlatformCurrentDataTask {
             JSONArray dataArray = realTimeData.getJSONArray("data");
             if (CollUtil.isNotEmpty(dataArray)) {
                 DischargingPlatformDev platformDev = dischargingPlatformDevMapper.selectOne(new LambdaQueryWrapper<DischargingPlatformDev>()
-                        .eq(DischargingPlatformDev::getDevSn, dev));
+                        .eq(DischargingPlatformDev::getDevSn, devSn));
+                if (platformDev == null) {
+                    return;
+                }
                 // 解析请求到的参数，保存到我们的数据库
                 for (Object o : dataArray) {
                     DischargingPlatformCurrentDataDto dto = BeanUtil.toBean(o, DischargingPlatformCurrentDataDto.class);