Commit 56bdc98f authored by jaehyu's avatar jaehyu

added some more

parent 4a0ff768
...@@ -3,13 +3,19 @@ package com.skt.ehs.mbs.db.maria.dao; ...@@ -3,13 +3,19 @@ package com.skt.ehs.mbs.db.maria.dao;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import com.skt.ehs.mbs.fpbuilder._ble_indicator;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
* Created by user on 2016-12-01. * Created by user on 2016-12-01.
*/ */
public interface FPBLEBuildDAO { public interface FPBLEBuildDAO {
void updateScale(@Param("scale_pixel") double scale_pixel,@Param("map_id") int map_id); void updateScale(@Param("scale_pixel") double scale_pixel,@Param("map_id") int map_id);
public double selectScalePixel(HashMap<String, Integer> params); public double selectScalePixel(HashMap<String, Integer> params);
// List<_ble_indicator> selectAPinCoordiwDir(@Param("lower_rssi_dir")int lower_rssi_dir, @Param("upper_rssi_dir")int upper_rssi_dir, @Param("position_x1")int position_x1 , @Param("position_y1")int position_y1, @Param("position_x2")int position_x2, @Param("position_y2")int position_y2);
// below is for binding-test
List<_ble_indicator> selectAPinCoordiwDir(@Param("lower_rssi_dir")int lower_rssi_dir, @Param("upper_rssi_dir")int upper_rssi_dir);
} }
\ No newline at end of file
...@@ -16,19 +16,7 @@ public class BLEFPBuilder { ...@@ -16,19 +16,7 @@ public class BLEFPBuilder {
public static final int LENGTH_X = 8000; public static final int LENGTH_X = 8000;
public static final int WIDTH_Y = 4000; public static final int WIDTH_Y = 4000;
class _ble_indicator {
String m_ap_id;
Integer m_rssi;
_ble_indicator(String ap_id, Integer rssi) {
m_ap_id = ap_id;
m_rssi = rssi;
}
@Override
public String toString() {
return String.format("%s : %9d", m_ap_id, m_rssi);
}
}
Floor mFloor; Floor mFloor;
...@@ -98,15 +86,20 @@ public class BLEFPBuilder { ...@@ -98,15 +86,20 @@ public class BLEFPBuilder {
// Todo regarding to given rssi_dir & cell_coordi, select <tagid, seq, time> records // Todo regarding to given rssi_dir & cell_coordi, select <tagid, seq, time> records
// Todo select AP regarding to above <tagid, seq, time> records as per A record. // Todo select AP regarding to above <tagid, seq, time> records as per A record.
// below is for binding-test
int lower_rssi_dir = d1;
int upper_rssi_dir = d2;
ret = mapper.selectAPinCoordiwDir(lower_rssi_dir,upper_rssi_dir);
//ret = mapper.selectAPinCoordiwDir(d1,d2,x1,y1,x2, y2); //ret = mapper.selectAPinCoordiwDir(d1,d2,x1,y1,x2, y2);
} }
ret.forEach(System.out::println); ret.forEach(System.out::println);
return ret; return ret;
} }
public boolean build() { public boolean build() {
double scale_pixel = readMapScale(); double scale_pixel = readMapScale();
...@@ -138,9 +131,9 @@ public class BLEFPBuilder { ...@@ -138,9 +131,9 @@ public class BLEFPBuilder {
List<_ble_indicator> ble_list = get_aplist_in_coordinate_per_rssidir(rssi_dir, rssi_dir, coordinate_pixel_x1, coordinate_pixel_y1, coordinate_pixel_x2, coordinate_pixel_y2); List<_ble_indicator> ble_list = get_aplist_in_coordinate_per_rssidir(rssi_dir, rssi_dir, coordinate_pixel_x1, coordinate_pixel_y1, coordinate_pixel_x2, coordinate_pixel_y2);
// using collection.stream()
// using collection.stream() ,
// calculate rssi_min, rssi_max, rssi_avg, rssi_std_dev, count per ap_id // calculate rssi_min, rssi_max, rssi_avg, rssi_std_dev, count per ap_id
// calculate mag_angle - 해당 cell의 각 수집방향에 대하여 수집된 지자기방향의 평균값으로 대표
// then insert into fp_ble_data table // then insert into fp_ble_data table
// Loop here ..*********************************************************************/ // Loop here ..*********************************************************************/
...@@ -155,7 +148,6 @@ public class BLEFPBuilder { ...@@ -155,7 +148,6 @@ public class BLEFPBuilder {
bleFPBuilder.LoadCellID(); bleFPBuilder.LoadCellID();
bleFPBuilder.LoadCellLocation(); bleFPBuilder.LoadCellLocation();
if (!bleFPBuilder.LoadDBConnectionPool()) { if (!bleFPBuilder.LoadDBConnectionPool()) {
//exit //exit
} }
......
...@@ -10,7 +10,18 @@ ...@@ -10,7 +10,18 @@
select scale_pixel from map_image WHERE campus_id=#{campus_id} and BUILDING_ID = #{building_id} and floor_id=#{floor_id} select scale_pixel from map_image WHERE campus_id=#{campus_id} and BUILDING_ID = #{building_id} and floor_id=#{floor_id}
</select> </select>
<!--
Todo compose complex SQL here...
List<_ble_indicator> selectAPinCoordiwDir(@Param("rssi_dir1")int rssi_dir1, @Param("rssi_dir2")int rssi_dir2, @Param("position_x1")int position_x1 , @Param("position_y1")int position_y1, @Param("position_x2")int position_x2, @Param("position_y2")int position_y2);
<select id="selectAPinCoordiwDir" parameterType="map" resultType="_ble_indicator">
SELECT DISTINCT ap_id, rssi FROM raw_data_ap WHERE rssi_dir &gt; #{lower_rssi_dir} and rssi_dir &lt; #{upper_rssi_dir}
</select>
// below is for binding-test
List<_ble_indicator> selectAPinCoordiwDir(@Param("lower_rssi_dir")int lower_rssi_dir, @Param("upper_rssi_dir")int upper_rssi_dir);
-->
<select id="selectAPinCoordiwDir" parameterType="map" resultType="_ble_indicator">
SELECT DISTINCT ap_id, rssi FROM raw_data_ap WHERE rssi_dir &gt; #{lower_rssi_dir} and rssi_dir &lt; #{upper_rssi_dir}
</select>
</mapper> </mapper>
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<typeAlias alias="RawDataTag" type="com.skt.ehs.mbs.db.maria.vo.RawDataTag"/> <typeAlias alias="RawDataTag" type="com.skt.ehs.mbs.db.maria.vo.RawDataTag"/>
<typeAlias alias="RawDataAP" type="com.skt.ehs.mbs.db.maria.vo.RawDataAP"/> <typeAlias alias="RawDataAP" type="com.skt.ehs.mbs.db.maria.vo.RawDataAP"/>
<typeAlias alias="FPBLEBuildDAO" type="com.skt.ehs.mbs.db.maria.dao.FPBLEBuildDAO"/> <typeAlias alias="FPBLEBuildDAO" type="com.skt.ehs.mbs.db.maria.dao.FPBLEBuildDAO"/>
<typeAlias alias="_ble_indicator" type="com.skt.ehs.mbs.fpbuilder._ble_indicator"/>
</typeAliases> </typeAliases>
<environments default="development"> <environments default="development">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment