Browse Source

设备经纬度

develop
lau572 4 months ago
parent
commit
3bda6b6b4b
  1. 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
  2. 2
      zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@ -127,7 +127,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/profile/**" "/profile/**"
).permitAll() ).permitAll()
// .antMatchers("/swagger-ui.html").anonymous() // .antMatchers("/swagger-ui.html").anonymous()
// .antMatchers("/swagger-resources/**").anonymous() .antMatchers("/swagger-resources/**").anonymous()
.antMatchers("/webjars/**").anonymous() .antMatchers("/webjars/**").anonymous()
.antMatchers("/*/api-docs").anonymous() .antMatchers("/*/api-docs").anonymous()
.antMatchers("/druid/**").anonymous() .antMatchers("/druid/**").anonymous()

2
zc-business/src/main/resources/mapper/business/DcDeviceMapper.xml

@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type, t1.create_time,t1.update_time,t1.facilities_type,t1.device_ip,t1.stake_mark_range,t1.network_segment,t1.device_img,t1.child_type,
t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer t1.facilities_type,t2.longitude,t2.latitude,t3.manufacturer
from dc_device t1 from dc_device t1
left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction
left join dc_product t3 on t3.id = t1.product_id left join dc_product t3 on t3.id = t1.product_id
<where> <where>
<if test="id != null and id != ''">and t1.id = #{id}</if> <if test="id != null and id != ''">and t1.id = #{id}</if>

Loading…
Cancel
Save