Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fpbuilder_ble
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jaehyu
fpbuilder_ble
Commits
3a9a1824
Commit
3a9a1824
authored
Nov 29, 2016
by
jaehyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
just working version
parent
793daeb0
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
79 additions
and
85 deletions
+79
-85
.idea/libraries/Maven__log4j_log4j_1_2_17.xml
.idea/libraries/Maven__log4j_log4j_1_2_17.xml
+0
-13
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
+0
-13
.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml
.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml
+0
-13
.idea/libraries/Maven__org_slf4j_slf4j_log4j13_1_0_1.xml
.idea/libraries/Maven__org_slf4j_slf4j_log4j13_1_0_1.xml
+0
-13
pom.xml
pom.xml
+8
-22
src/main/java/com/skt/ehs/mbs/db/maria/DBManager.java
src/main/java/com/skt/ehs/mbs/db/maria/DBManager.java
+35
-2
src/main/java/com/skt/ehs/mbs/db/maria/dao/RawDataAPDAO.java
src/main/java/com/skt/ehs/mbs/db/maria/dao/RawDataAPDAO.java
+1
-1
src/main/java/com/skt/ehs/mbs/db/maria/dao/RawDataTagDAO.java
...main/java/com/skt/ehs/mbs/db/maria/dao/RawDataTagDAO.java
+1
-1
src/main/java/com/skt/ehs/mbs/fpbuilder/BLEFPBuilder.java
src/main/java/com/skt/ehs/mbs/fpbuilder/BLEFPBuilder.java
+29
-3
src/main/resources/db/maria/mapper/RawDataAPMapper.xml
src/main/resources/db/maria/mapper/RawDataAPMapper.xml
+3
-0
src/main/resources/db/maria/mapper/RawDataTagMapper.xml
src/main/resources/db/maria/mapper/RawDataTagMapper.xml
+1
-1
src/main/resources/log4j.properties
src/main/resources/log4j.properties
+1
-1
src/main/resources/mybatis-config.xml
src/main/resources/mybatis-config.xml
+0
-2
No files found.
.idea/libraries/Maven__log4j_log4j_1_2_17.xml
deleted
100644 → 0
View file @
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
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml
deleted
100644 → 0
View file @
793daeb0
<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
.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_21.xml
deleted
100644 → 0
View file @
793daeb0
<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
.idea/libraries/Maven__org_slf4j_slf4j_log4j13_1_0_1.xml
deleted
100644 → 0
View file @
793daeb0
<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
pom.xml
View file @
3a9a1824
...
...
@@ -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>
...
...
src/main/java/com/skt/ehs/mbs/db/maria/DBManager.java
View file @
3a9a1824
...
...
@@ -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
();
...
...
src/main/java/com/skt/ehs/mbs/db/maria/dao/RawDataAPDAO.java
View file @
3a9a1824
...
...
@@ -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
);
}
src/main/java/com/skt/ehs/mbs/db/maria/dao/RawDataTagDAO.java
View file @
3a9a1824
...
...
@@ -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);
}
src/main/java/com/skt/ehs/mbs/fpbuilder/BLEFPBuilder.java
View file @
3a9a1824
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
();
}
...
...
src/main/resources/db
.maria.
mapper/RawDataAPMapper.xml
→
src/main/resources/db
/maria/
mapper/RawDataAPMapper.xml
View file @
3a9a1824
...
...
@@ -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
src/main/resources/db
.maria.
mapper/RawDataTagMapper.xml
→
src/main/resources/db
/maria/
mapper/RawDataTagMapper.xml
View file @
3a9a1824
...
...
@@ -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>
...
...
src/main/resources/log4j.properties
View file @
3a9a1824
...
...
@@ -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
src/main/resources/mybatis-config.xml
View file @
3a9a1824
...
...
@@ -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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment