From acd1fb0f344069ef5ef3d04c7a90420f6bf4c382 Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 27 Mar 2024 17:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=A2=E7=BB=93=E6=9E=84=E7=9A=84=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E7=B1=BB=E4=BC=BCbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml | 2 +- .../modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml | 2 +- .../mapper/xml/SteelStructureMonitorTypeMapper.xml | 2 +- src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml index 6bdd7f4c7..d7e5c6ba6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml @@ -32,7 +32,7 @@ IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.rate_alarm_number, 0) rate_alarm_number, - (case when alarm_state_type = 0 then 0 else 1 end) alarm_type + (case when b.alarm_state_type = 0 or b.alarm_state_type is null then 0 else 1 end) alarm_type from exterior_scaffolding_engineering_to_monitor_type demtr inner join exterior_scaffolding_monitor_type demt on demt.id = demtr.exterior_scaffolding_monitor_type_id LEFT JOIN diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml index 3491657c4..5034c60d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml @@ -31,7 +31,7 @@ IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.rate_alarm_number, 0) rate_alarm_number, - (case when alarm_state_type = 0 then 0 else 1 end) alarm_type + (case when b.alarm_state_type = 0 or b.alarm_state_type is null then 0 else 1 end) alarm_type from high_slope_engineering_to_monitor_type demtr inner join high_slope_monitor_type demt on demt.id = demtr.high_slope_monitor_type_id LEFT JOIN diff --git a/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml index ae4babe36..32d1d777f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml @@ -31,7 +31,7 @@ IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.rate_alarm_number, 0) rate_alarm_number, - (case when alarm_state_type = 0 then 0 else 1 end) alarm_type + (case when b.alarm_state_type = 0 or b.alarm_state_type is null then 0 else 1 end) alarm_type from steel_structure_engineering_to_monitor_type demtr inner join steel_structure_monitor_type demt on demt.id = demtr.steel_structure_monitor_type_id LEFT JOIN diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 27d0526aa..cefe7d6f4 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -338,6 +338,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/mechanicalEquipmentPositionData/jxzhgAddData").permitAll() .antMatchers("/xmgl/xzRegistry/add").permitAll() .antMatchers("/xmgl/safetyHatData/updateStatus").permitAll() + .antMatchers("/xmgl/frontierProtectionNoNetData/page").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()