frosch95/GeoFroggerFX
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added attributes to database

Browse Source
This commit is contained in:
Andreas Billmann
2015-03-24 21:17:53 +01:00
parent 84a1aa5a9f
commit 85b744d247
3 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/de/geofroggerfx/dao/jdbc/JdbcCacheDAO.java
View File

@@ -26,12 +26,14 @@
package de.geofroggerfx.dao.jdbc;
import de.geofroggerfx.dao.CacheDAO;
import de.geofroggerfx.model.Attribute;
import de.geofroggerfx.model.Cache;
import de.geofroggerfx.model.CacheListEntry;
import de.geofroggerfx.model.Waypoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Repository;
import org.w3c.dom.Attr;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -54,7 +56,7 @@ public class JdbcCacheDAO implements CacheDAO {
private static final Logger LOGGER = Logger.getLogger("JdbcCacheDAO");
private static final String CACHE_TABLE = "cache";
private static final String WAYPOINT_TABLE = "waypoint";
private static final String ATTRIBUTE_TABLE = "attribute";
private String[] columnListCache = new String[] {
"id",
@@ -88,6 +90,9 @@ public class JdbcCacheDAO implements CacheDAO {
"symbol",
"type"};
private String[] columnListAttribute = new String[] {
"id",
"cache_id"};
private JdbcTemplate jdbcTemplate;
@@ -100,6 +105,7 @@ public class JdbcCacheDAO implements CacheDAO {
public void save(List<Cache> listOfCaches) {
deleteExistingCaches(listOfCaches);
batchInsertCaches(listOfCaches);
batchInsertAttributes(listOfCaches);
batchInsertWaypoints(listOfCaches);
}
@@ -136,6 +142,8 @@ public class JdbcCacheDAO implements CacheDAO {
Waypoint waypoint = getWaypointForCacheId(cache.getId());
cache.setMainWayPoint(waypoint);
waypoint.setCache(cache);
List<Attribute> attributes = getAttributesForCacheId(cache.getId());
cache.getAttributes().setAll(attributes);
return cache;
});
}
@@ -218,6 +226,33 @@ public class JdbcCacheDAO implements CacheDAO {
LOGGER.info("try to save "+listOfCaches.size()+" waypoints -> done in "+(endInsert-startInsert)+" ms");
}
private void batchInsertAttributes(List<Cache> listOfCaches) {
long startInsert = System.currentTimeMillis();
List<Object[]> batch = listOfCaches.
parallelStream().
flatMap(cache -> cache.getAttributes().stream().map(attribute -> valuesFromAttribute(cache, attribute))).
collect(Collectors.toList());
LOGGER.info("try to save "+batch.size()+" attributes");
try {
String insertSQL = generateInsertSQL(ATTRIBUTE_TABLE, columnListAttribute);
int[] updateCounts = jdbcTemplate.batchUpdate(
insertSQL,
batch);
int updatedRows = 0;
for (int count:updateCounts) {
updatedRows += count;
}
LOGGER.info("batch inserted "+updatedRows+" attributes");
} catch (Throwable e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
long endInsert = System.currentTimeMillis();
LOGGER.info("try to save "+batch.size()+" attributes -> done in "+(endInsert-startInsert)+" ms");
}
private Waypoint getWaypointForCacheId(long cacheId) {
return this.jdbcTemplate.queryForObject(
generateSelectSQL(WAYPOINT_TABLE, columnListWaypoint) + " WHERE cache_id=?",
@@ -228,6 +263,17 @@ public class JdbcCacheDAO implements CacheDAO {
}
private List<Attribute> getAttributesForCacheId(long cacheId) {
return this.jdbcTemplate.query(
generateSelectSQL(ATTRIBUTE_TABLE, columnListAttribute) + " WHERE cache_id=?",
new Object[]{cacheId},
(rs, rowNum) -> {
return getAttributeFromResultSet(rs);
});
}
private Cache getCacheFromResultSet(ResultSet rs) throws SQLException {
Cache cache = new Cache();
@@ -288,6 +334,12 @@ public class JdbcCacheDAO implements CacheDAO {
return waypoint;
}
private Attribute getAttributeFromResultSet(ResultSet rs) throws SQLException {
Attribute attribute = Attribute.getAttributeById(rs.getInt("id"));
return attribute;
}
private Object[] valuesFromWaypoint(Cache cache) {
return new Object[]{
cache.getMainWayPoint().getName(),
@@ -301,18 +353,13 @@ public class JdbcCacheDAO implements CacheDAO {
cache.getMainWayPoint().getSymbol(),
null
};
/*
"name",
"cache_id",
"latitude",
"longitude",
"time",
"description",
"url",
"urlName",
"symbol",
"type"
*/
}
private Object[] valuesFromAttribute(Cache cache, Attribute attribute) {
return new Object[]{
attribute.getId(),
cache.getId()
};
}

14
src/main/java/de/geofroggerfx/model/Attribute.java
View File

@@ -298,8 +298,6 @@ public enum Attribute {
GEOTOUR_FALSE(-67);
private final static List<Long> attributes = new ArrayList<>();
private int id;
private Attribute(int id) {
@@ -322,16 +320,16 @@ public enum Attribute {
idToCompare = -idToCompare;
}
return getAttributeById(idToCompare);
}
public static Attribute getAttributeById(int id) {
for (Attribute t : Attribute.values()) {
if (t.getId() == idToCompare) {
if (t.getId() == id) {
return t;
}
}
if (!attributes.contains(id)) {
attributes.add(id);
throw new IllegalArgumentException("unknown attribute id:" + id);
}
throw new IllegalArgumentException("unknown attribute id:" + id + " inc:" + inc);
}
}

8
src/main/resources/de/geofroggerfx/dao/jdbc/updates/2.sql Normal file
View File

@@ -0,0 +1,8 @@
CREATE TABLE attribute (
id INT,
cache_id INT,
PRIMARY KEY (id, cache_id),
FOREIGN KEY(cache_id) REFERENCES cache(id) ON DELETE CASCADE
);
INSERT INTO version(version) values(2);