aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/DataManager.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:15:01 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:15:01 +1200
commitba9551ce3e4a3aade38d5f3b2ac7dee9d022a466 (patch)
tree6a07bddf4e23a6733fc891a5bea0660c9a7af282 /src/org/traccar/database/DataManager.java
parent3083db3929e27933d3ab5eab9fa0c1e221e94eec (diff)
downloadtrackermap-server-ba9551ce3e4a3aade38d5f3b2ac7dee9d022a466.tar.gz
trackermap-server-ba9551ce3e4a3aade38d5f3b2ac7dee9d022a466.tar.bz2
trackermap-server-ba9551ce3e4a3aade38d5f3b2ac7dee9d022a466.zip
Implement permissions manager
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
-rw-r--r--src/org/traccar/database/DataManager.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index d53ec7838..f60fd4cb3 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -364,23 +364,23 @@ public class DataManager {
connection.close();
}
}
-
- public List<Long> getDeviceList(long userId) throws SQLException {
+
+ public Collection<Map.Entry<Long, Long>> getPermissions() throws SQLException {
Connection connection = dataSource.getConnection();
try {
PreparedStatement statement = connection.prepareStatement(
- "SELECT id FROM device WHERE id IN (" +
- "SELECT device_id FROM user_device WHERE user_id = ?);");
+ "SELECT user_id, device_id FROM user_device;");
try {
- statement.setLong(1, userId);
-
- ResultSet resultSet = statement.executeQuery();
+ statement.execute();
+ ResultSet resultSet = statement.getResultSet();
- List<Long> result = new LinkedList<Long>();
+ List<Map.Entry<Long, Long>> result = new LinkedList<Map.Entry<Long, Long>>();
while (resultSet.next()) {
- result.add(resultSet.getLong(1));
+ result.add(new AbstractMap.SimpleEntry<Long, Long>(
+ resultSet.getLong(1), resultSet.getLong(2)));
}
+
return result;
} finally {
statement.close();
@@ -389,7 +389,7 @@ public class DataManager {
connection.close();
}
}
-
+
public JsonArray getDevices(long userId) throws SQLException {
Connection connection = dataSource.getConnection();