|
|
@@ -988,13 +988,14 @@ void sit_list_v::init_site(const std::string &ids /*= ""*/)
|
|
|
,x,y, pdoa_offset, pdoa_direction, isSpecial, down_stream_idx \
|
|
|
FROM dat_reader_v, dat_map where \
|
|
|
dat_reader_v.map_id=dat_map.map_id and state=0";*/
|
|
|
- std::string sql = "SELECT r.reader_id, r.reader_type_id, r.map_id, r.area_id, r.device_type_id, r.dimension, m.scale, r.need_power_alarm, r.x, r.y, \
|
|
|
- r.pdoa_offset, r.pdoa_direction, r.isSpecial, r.down_stream_idx, \
|
|
|
- rc.plus_dist, rc.plus_card_id, rc.plus_occur_time, rc.minus_dist, rc.minus_card_id, rc.minus_occur_time \
|
|
|
- FROM dat_reader_v AS r \
|
|
|
- LEFT JOIN dat_map AS m ON r.map_id=m.map_id \
|
|
|
- LEFT JOIN his_reader_coverage AS rc ON r.reader_id = rc.reader_id \
|
|
|
- WHERE r.state=0;";
|
|
|
+ std::string sql = "SELECT r.reader_id, r_base.reader_type_id, r_base.map_id, r_base.area_id, r_base.device_type_id, r_base.dimension, m.scale, r.need_power_alarm, r.x, r.y, \
|
|
|
+ r.pdoa_offset, r_base.pdoa_direction, r_base.isSpecial, r_base.down_stream_idx, \
|
|
|
+ rc.plus_dist, rc.plus_card_id, rc.plus_occur_time, rc.minus_dist, rc.minus_card_id, rc.minus_occur_time \
|
|
|
+ FROM dat_reader_v AS r \
|
|
|
+ LEFT JOIN dat_reader AS r_base ON r.reader_id = r_base.reader_id \
|
|
|
+ LEFT JOIN dat_map AS m ON r_base.map_id = m.map_id \
|
|
|
+ LEFT JOIN his_reader_coverage AS rc ON r.reader_id = rc.reader_id \
|
|
|
+ WHERE r.state = 0; ";
|
|
|
|
|
|
if (ids.empty())
|
|
|
{
|
