From 5ea7c8005a9164b59f15406debb5ecba4c650138 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Tue, 23 Jan 2024 11:53:39 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java | 2 +-
 src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java
index 1dd93634a..64f4579c4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/service/impl/ExteriorScaffoldingCurrentDataServiceImpl.java
@@ -295,7 +295,7 @@ public class ExteriorScaffoldingCurrentDataServiceImpl extends ServiceImpl<Exter
 
                         JSONObject valueObject = calcValue.getJSONObject(j);
                         Float dataTotal = valueObject.getFloat("value");
-                        exteriorScaffoldingCurrentData.setData(dataTotal + sensor.getFiducialValue());
+                        exteriorScaffoldingCurrentData.setData(dataTotal != null ? dataTotal : 0 + sensor.getFiducialValue());
                         exteriorScaffoldingCurrentData.setDataThis(valueObject.getFloat("variation"));
                         Float rateChange = valueObject.getFloat("rateChange");
                         exteriorScaffoldingCurrentData.setDataRate(rateChange);
diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
index a10b2b44d..59bb55984 100644
--- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
+++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
@@ -307,6 +307,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .antMatchers("/xmgl/weight/weighBookVehicleInfo/list").permitAll()
                     .antMatchers("/xmgl/weight/weighPic/add").permitAll()
                     .antMatchers("/upload/image").permitAll()
+                    .antMatchers("/xmgl/steelStructureCurrentData/exportData").permitAll()
                     .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
                     .anyRequest().authenticated()       // 剩下所有的验证都需要验证.
                     .and()