Commit 3a9a1824 authored by jaehyu's avatar jaehyu

just working version

parent 793daeb0
<component name="libraryTable">
<library name="Maven: log4j:log4j:1.2.17">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.slf4j:slf4j-api:1.7.21">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.slf4j:slf4j-log4j12:1.7.21">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Maven: org.slf4j:slf4j-log4j13:1.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j13/1.0.1/slf4j-log4j13-1.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j13/1.0.1/slf4j-log4j13-1.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j13/1.0.1/slf4j-log4j13-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
......@@ -39,36 +39,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
<version>1.7.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.21</version>
<scope>runtime</scope>
<version>1.7.7</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j13</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j13</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
</dependencies>
......
......@@ -14,15 +14,43 @@ import com.skt.ehs.mbs.conf.Configure;
public class DBManager {
public static final String COLUMN_NAME_CAMPUS_ID = "campus_id";
public static final String COLUMN_NAME_BUILDING_ID = "building_id";
public static final String COLUMN_NAME_FLOOR_ID = "floor_id";
public static final String COLUMN_NAME_TAG_ID = "tag_id";
public static List<RawDataTag> getRawDataTag (HashMap<String, Integer> params) throws Throwable {
public static void deleteRawDataAP (String sid) {
MariaConnectionManager mngr = MariaConnectionManager.getInstance();
SqlSession session = mngr.getSqlSessionFactory().openSession();
try {
RawDataAPDAO mapper = session.getMapper(RawDataAPDAO.class);
mapper.deleteRawDataAP(sid);
// added below codes for to prevent auto-rollback. which is what I see without a below statement now.
// jaehyu on 2016-11-23
session.commit();
} catch (Exception e) {
throw e;
}
finally {
session.close();
}
}
public static List<RawDataTag> getRawDataTag (int campus, int building, int floor) throws Throwable {
MariaConnectionManager mngr = MariaConnectionManager.getInstance();
SqlSession session = mngr.getSqlSessionFactory().openSession();
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);
List<RawDataTag> ret = null;
try {
RawDataTagDAO mapper = session.getMapper(RawDataTagDAO.class);
ret = mapper.selectRawDataTag(params);
ret = mapper.hSelectAll(params);
return ret;
} catch (Exception e) {
throw e;
......@@ -32,6 +60,11 @@ public class DBManager {
}
}
public static void storeRawDataAP(RawDataAP rawDataAP) throws Throwable {
MariaConnectionManager mngr = MariaConnectionManager.getInstance();
SqlSession session = mngr.getSqlSessionFactory().openSession();
......
......@@ -13,5 +13,5 @@ public interface RawDataAPDAO {
void insertRawDataAP(RawDataAP rawdata);
ArrayList<RawDataAP> getRawDataAP();
//void deleteRawDataAP(String c_cell_id);
void deleteRawDataAP(String tag_id);
}
......@@ -8,6 +8,6 @@ import java.util.List;
public interface RawDataTagDAO {
void insertRawDataTag(RawDataTag rawdata); // for StoreMagdataHandler()
List<RawDataTag> selectRawDataTag(HashMap<String, Integer> params); // for GetCollectedArea()
List<RawDataTag> hSelectAll(HashMap<String, Integer> params); // for GetCollectedArea()
//void deleteRawDataTag(String c_cell_id);
}
package com.skt.ehs.mbs.module.fpbuilder;
package com.skt.ehs.mbs.fpbuilder;
import com.skt.ehs.mbs.db.maria.DBManager;
import com.skt.ehs.mbs.db.maria.MariaConnectionManager;
import com.skt.ehs.mbs.db.maria.vo.RawDataTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.List;
/*
이 class 는 Java 8 의 stream API 와 lambda expression 을 사용함으로,
intellj 컴파일에 문제가 있으면 ,
......@@ -12,11 +18,31 @@ intellj 컴파일에 문제가 있으면 ,
by jaehyu 2016-11-28
*/
public class BLEFPBuilder {
final Logger logger = LoggerFactory.getLogger(BLEFPBuilder.class);
static Logger logger = LoggerFactory.getLogger(BLEFPBuilder.class);
static void processor() {
static boolean processor() {
System.out.println("Hello");
if (MariaConnectionManager.getInstance().makeConnectionPool() == false) {
logger.error("Fail to connect IntegrationDB. Can't start MBSServer.");
return false;
}
// package-only-list from raw_data_tag
List<RawDataTag> packageNameList = Collections.emptyList();
try {
packageNameList = DBManager.getRawDataTag(1,1,1);
} catch (Throwable throwable) {
throwable.printStackTrace();
}
System.out.println(packageNameList.size());
try {
DBManager.deleteRawDataAP("bbbb");
} catch (Throwable throwable) {
throwable.printStackTrace();
}
return true;
}
public static void main(String[] args) {
processor();
}
......
......@@ -10,4 +10,7 @@
INSERT INTO raw_data_ap (tag_id, collected_time, sequence_num, ap_id, rssi, floor_id, building_id, campus_id) values(#{tag_id},#{collected_time},#{sequence_num},#{ap_id},#{rssi},#{floor_id},#{building_id},#{campus_id})
</insert>
<delete id="deleteRawDataAP" parameterType="String" >
DELETE FROM raw_data_ap WHERE tag_id=#{tag_id}
</delete>
</mapper>
\ No newline at end of file
......@@ -12,7 +12,7 @@
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})
</insert>
<select id="selectRawDataTag" parameterType="map" resultType="RawDataTag">
<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}
</select>
......
......@@ -8,4 +8,4 @@ log4j.appender.STDOUT.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
log4j.appender.FileAppender=org.apache.log4j.RollingFileAppender
log4j.appender.FileAppender.File=MBS.log
log4j.appender.FileAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.FileAppender.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
\ No newline at end of file
log4j.appender.FileAppender.layout.ConversionPattern=%d %5p [%t] (%F:%L) - %m%n
\ No newline at end of file
......@@ -4,8 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<typeAliases>
<typeAlias alias="RawDataTag" type="com.skt.ehs.mbs.db.maria.vo.RawDataTag"/>
<typeAlias alias="RawDataAP" type="com.skt.ehs.mbs.db.maria.vo.RawDataAP"/>
......
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