(DBManager) generic method 구현 . running test 필요

src/main/java/com/skt/ehs/mbs/db/maria/DBManager.java

 package com.skt.ehs.mbs.db.maria;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,6 +20,9 @@ public class DBManager {
     public static final String COLUMN_NAME_FLOOR_ID = "floor_id";
     public static final String COLUMN_NAME_TAG_ID = "tag_id";
 
+    public static final String COMMAND_OPTION_GETPACKAGE = "getPackage";
+    public static final String COMMAND_OPTION_GETRAWDATATAG = "getRawDataTag";
+
     public static void deleteRawDataAP (String sid) {
         MariaConnectionManager mngr = MariaConnectionManager.getInstance();
         SqlSession session = mngr.getSqlSessionFactory().openSession();
@@ -36,28 +40,38 @@ public class DBManager {
         }
     }
 
-    public static List<RawDataTag> getRawDataTag (int campus, int building, int floor) throws Throwable {
+    public static <E> List<E> getRawDataTag (String cmd, int campus, int building, int floor) throws Throwable {
         MariaConnectionManager mngr = MariaConnectionManager.getInstance();
         SqlSession session = mngr.getSqlSessionFactory().openSession();
+        RawDataTagDAO mapper = session.getMapper(RawDataTagDAO.class);
 
-        HashMap<String, Integer> params = new HashMap<>();
-        params.put(COLUMN_NAME_CAMPUS_ID,campus);
-        params.put(COLUMN_NAME_BUILDING_ID,building);
-        params.put(COLUMN_NAME_FLOOR_ID,floor);
+        HashMap<String, Integer> querry_params = new HashMap<>();
+        querry_params.put(COLUMN_NAME_CAMPUS_ID,campus);
+        querry_params.put(COLUMN_NAME_BUILDING_ID,building);
+        querry_params.put(COLUMN_NAME_FLOOR_ID,floor);
 
-        List<RawDataTag> ret = null;
+        List<E> ret = Collections.emptyList();
 
         try {
-            RawDataTagDAO mapper = session.getMapper(RawDataTagDAO.class);
+            switch (cmd) {
+                case COMMAND_OPTION_GETPACKAGE:
+                    // return type 을 List<String> 으로.....
+                    break;
+
+                case COMMAND_OPTION_GETRAWDATATAG:
+                    ret = (List<E>) mapper.hSelectAll(querry_params);
+                    break;
+            }
 
-            ret = mapper.hSelectAll(params);
             return ret;
+
         } catch (Exception e) {
             throw e;
         }
         finally {
             session.close();
         }
+
     }
 
 

src/main/java/com/skt/ehs/mbs/fpbuilder/BLEFPBuilder.java

@@ -27,18 +27,20 @@ public class BLEFPBuilder {
             return false;
         }
         // package-only-list from raw_data_tag
-        List<RawDataTag> packageNameList = Collections.emptyList();
+        List<RawDataTag> rawdata = Collections.emptyList();
+        List<RawDataTag> packNameList = Collections.emptyList();
         try {
-            packageNameList = DBManager.getRawDataTag(1,1,1);
-        } catch (Throwable throwable) {
-            throwable.printStackTrace();
-        }
-        System.out.println(packageNameList.size());
-        try {
-            DBManager.deleteRawDataAP("bbbb");
+            rawdata = DBManager.getRawDataTag(DBManager.COMMAND_OPTION_GETRAWDATATAG,1,1,1);
+           // packNameList = DBManager.getRawDataTag(DBManager.COMMAND_OPTION_GETPACKAGE,1,1,1);
         } catch (Throwable throwable) {
             throwable.printStackTrace();
         }
+        System.out.println(rawdata.size());
+        //try {
+        //    DBManager.deleteRawDataAP("bbbb");
+        //} catch (Throwable throwable) {
+        //    throwable.printStackTrace();
+        //}
 
         return true;
     }

src/main/resources/db/maria/mapper/RawDataTagMapper.xml

@@ -9,12 +9,12 @@
 
     <insert id="insertRawDataTag" parameterType="RawDataTag" >
         INSERT INTO raw_data_tag (tag_id, collected_time, sequence_num, sub_seq_num, package_collect_key, revision_collect, position_x, position_y,
-        mag_bh, mag_bv, reverse_col, north_dir, floor_id, building_id, campus_id, c_cell_id) values (#{tag_id},#{collected_time},#{sequence_num},#{sub_seq_num},#{package_collect_key},#{revision_collect},#{position_x},#{position_y},#{mag_bh},#{mag_bv},#{reverse_col},#{north_dir},#{floor_id},#{building_id},#{campus_id},#{c_cell_id})
+        mag_bh, mag_bv, rssi_dir, north_dir, floor_id, building_id, campus_id, c_cell_id) values (#{tag_id},#{collected_time},#{sequence_num},#{sub_seq_num},#{package_collect_key},#{revision_collect},#{position_x},#{position_y},#{mag_bh},#{mag_bv},#{rssi_dir},#{north_dir},#{floor_id},#{building_id},#{campus_id},#{c_cell_id})
     </insert>
 
     <select id="hSelectAll" parameterType="map" resultType="RawDataTag">
         SELECT tag_id, collected_time, sequence_num, sub_seq_num, package_collect_key, revision_collect, position_x, position_y,
-        mag_bh, mag_bv, reverse_col, north_dir, floor_id, building_id, campus_id, c_cell_id FROM raw_data_tag WHERE campus_id=#{campus_id} and BUILDING_ID = #{building_id} and floor_id=#{floor_id}
+        mag_bh, mag_bv, rssi_dir, north_dir, floor_id, building_id, campus_id, c_cell_id FROM raw_data_tag WHERE campus_id=#{campus_id} and BUILDING_ID = #{building_id} and floor_id=#{floor_id}
     </select>
 
 </mapper>
\ No newline at end of file