admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

钢结构的三个类似bug修复

Browse Source
This commit is contained in:
guo 2024-03-27 17:03:03 +08:00
parent 969eb08c07
commit acd1fb0f34
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/exteriorscaffolding/mapper/xml/ExteriorScaffoldingMonitorTypeMapper.xml
View File

@ -32,7 +32,7 @@
IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_alarm_number, 0) super_alarm_number,
IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.super_control_number, 0) super_control_number,
IFNULL(c.rate_alarm_number, 0) rate_alarm_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 from exterior_scaffolding_engineering_to_monitor_type demtr
inner join exterior_scaffolding_monitor_type demt on demt.id = demtr.exterior_scaffolding_monitor_type_id inner join exterior_scaffolding_monitor_type demt on demt.id = demtr.exterior_scaffolding_monitor_type_id
LEFT JOIN LEFT JOIN

2
src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
View File

@ -31,7 +31,7 @@
IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_alarm_number, 0) super_alarm_number,
IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.super_control_number, 0) super_control_number,
IFNULL(c.rate_alarm_number, 0) rate_alarm_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 from high_slope_engineering_to_monitor_type demtr
inner join high_slope_monitor_type demt on demt.id = demtr.high_slope_monitor_type_id inner join high_slope_monitor_type demt on demt.id = demtr.high_slope_monitor_type_id
LEFT JOIN LEFT JOIN

2
src/main/java/com/zhgd/xmgl/modules/steelstructure/mapper/xml/SteelStructureMonitorTypeMapper.xml
View File

@ -31,7 +31,7 @@
IFNULL(c.super_alarm_number, 0) super_alarm_number, IFNULL(c.super_alarm_number, 0) super_alarm_number,
IFNULL(c.super_control_number, 0) super_control_number, IFNULL(c.super_control_number, 0) super_control_number,
IFNULL(c.rate_alarm_number, 0) rate_alarm_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 from steel_structure_engineering_to_monitor_type demtr
inner join steel_structure_monitor_type demt on demt.id = demtr.steel_structure_monitor_type_id inner join steel_structure_monitor_type demt on demt.id = demtr.steel_structure_monitor_type_id
LEFT JOIN LEFT JOIN

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -338,6 +338,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/mechanicalEquipmentPositionData/jxzhgAddData").permitAll() .antMatchers("/xmgl/mechanicalEquipmentPositionData/jxzhgAddData").permitAll()
.antMatchers("/xmgl/xzRegistry/add").permitAll() .antMatchers("/xmgl/xzRegistry/add").permitAll()
.antMatchers("/xmgl/safetyHatData/updateStatus").permitAll() .antMatchers("/xmgl/safetyHatData/updateStatus").permitAll()
.antMatchers("/xmgl/frontierProtectionNoNetData/page").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证. .anyRequest().authenticated() // 剩下所有的验证都需要验证.
.and() .and()