diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/Context.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 33 | ||||
| -rw-r--r-- | src/org/traccar/database/ResultSetConverter.java | 80 | ||||
| -rw-r--r-- | src/org/traccar/http/MainServlet.java | 30 | ||||
| -rw-r--r-- | src/org/traccar/http/WebServer.java | 21 |
5 files changed, 138 insertions, 28 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index f05a191aa..c34ceb3a7 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -95,7 +95,7 @@ public class Context { } if (Boolean.valueOf(properties.getProperty("http.enable"))) { - webServer = new WebServer(properties, dataManager); + webServer = new WebServer(); } serverManager = new ServerManager(); diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 1c6579bf4..172fbf763 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -26,6 +26,7 @@ import javax.sql.DataSource; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.json.JSONArray; import org.traccar.helper.DriverDelegate; import org.traccar.helper.Log; import org.traccar.model.Device; @@ -254,17 +255,19 @@ public class DataManager { "id INT PRIMARY KEY AUTO_INCREMENT," + "name VARCHAR(1024) NOT NULL," + "unique_id VARCHAR(1024) NOT NULL UNIQUE," + - "position_id INT NOT NULL," + - "data_id INT NOT NULL);" + + "position_id INT," + + "data_id INT);" + "CREATE TABLE user_device (" + "user_id INT NOT NULL," + "device_id INT NOT NULL," + - "read BOOLEAN NOT NULL," + - "write BOOLEAN NOT NULL," + + "read BOOLEAN DEFAULT true NOT NULL," + + "write BOOLEAN DEFAULT true NOT NULL," + "FOREIGN KEY (user_id) REFERENCES user(id)," + "FOREIGN KEY (device_id) REFERENCES device(id));" + + "CREATE INDEX user_device_user_id ON user_device(user_id);" + + "CREATE TABLE position (" + "id INT PRIMARY KEY AUTO_INCREMENT," + "device_id INT NOT NULL," + @@ -321,7 +324,8 @@ public class DataManager { Connection connection = dataSource.getConnection(); try { PreparedStatement statement = connection.prepareStatement( - "SELECT id FROM user WHERE name = ? AND password = CAST(HASH('SHA256', STRINGTOUTF8(?), 1000) AS VARCHAR);"); + "SELECT id FROM user WHERE name = ? AND " + + "password = CAST(HASH('SHA256', STRINGTOUTF8(?), 1000) AS VARCHAR);"); try { statement.setString(1, name); statement.setString(2, password); @@ -357,5 +361,24 @@ public class DataManager { connection.close(); } } + + public JSONArray getDevices(long userId) throws SQLException { + + Connection connection = dataSource.getConnection(); + try { + PreparedStatement statement = connection.prepareStatement( + "SELECT * FROM device WHERE id IN (" + + "SELECT device_id FROM user_device WHERE user_id = ?);"); + try { + statement.setLong(1, userId); + + return ResultSetConverter.convert(statement.executeQuery()); + } finally { + statement.close(); + } + } finally { + connection.close(); + } + } } diff --git a/src/org/traccar/database/ResultSetConverter.java b/src/org/traccar/database/ResultSetConverter.java new file mode 100644 index 000000000..32289f756 --- /dev/null +++ b/src/org/traccar/database/ResultSetConverter.java @@ -0,0 +1,80 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.database; + +import org.json.JSONArray; +import org.json.JSONObject; + +import java.sql.SQLException; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; + +public class ResultSetConverter { + + public static JSONArray convert(ResultSet rs) throws SQLException { + + JSONArray json = new JSONArray(); + ResultSetMetaData rsmd = rs.getMetaData(); + + while (rs.next()) { + + int numColumns = rsmd.getColumnCount(); + JSONObject obj = new JSONObject(); + + for (int i = 1; i <= numColumns; i++) { + + String columnName = rsmd.getColumnName(i).toLowerCase(); + + switch (rsmd.getColumnType(i)) { + case java.sql.Types.BIGINT: + obj.put(columnName, rs.getInt(columnName)); + break; + case java.sql.Types.BOOLEAN: + obj.put(columnName, rs.getBoolean(columnName)); + break; + case java.sql.Types.DOUBLE: + obj.put(columnName, rs.getDouble(columnName)); + break; + case java.sql.Types.FLOAT: + obj.put(columnName, rs.getFloat(columnName)); + break; + case java.sql.Types.INTEGER: + obj.put(columnName, rs.getInt(columnName)); + break; + case java.sql.Types.NVARCHAR: + obj.put(columnName, rs.getNString(columnName)); + break; + case java.sql.Types.VARCHAR: + obj.put(columnName, rs.getString(columnName)); + break; + case java.sql.Types.DATE: + obj.put(columnName, rs.getDate(columnName)); + break; + case java.sql.Types.TIMESTAMP: + obj.put(columnName, rs.getTimestamp(columnName)); + break; + default: + obj.put(columnName, rs.getObject(columnName)); + break; + } + } + + json.put(obj); + } + + return json; + } +} diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java index c924898e2..e569b4892 100644 --- a/src/org/traccar/http/MainServlet.java +++ b/src/org/traccar/http/MainServlet.java @@ -23,19 +23,14 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.traccar.database.DataManager; +import org.json.JSONObject; +import org.traccar.Context; import org.traccar.helper.Log; public class MainServlet extends HttpServlet { private static final String USER_ID = "userId"; - private final DataManager dataManager; - - public MainServlet(DataManager dataManager) { - this.dataManager = dataManager; - } - @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { @@ -43,6 +38,8 @@ public class MainServlet extends HttpServlet { if (command.equals("/async")) { async(req.startAsync()); + } else if (command.startsWith("/device")) { + device(req, resp); } else if (command.equals("/login")) { login(req, resp); } else if (command.equals("/logout")) { @@ -72,11 +69,28 @@ public class MainServlet extends HttpServlet { } }); } + + private void device(HttpServletRequest req, HttpServletResponse resp) throws IOException { + + long userId = 1;//(Long) req.getSession().getAttribute(USER_ID); + + JSONObject result = new JSONObject(); + + try { + result.put("success", true); + result.put("data", Context.getDataManager().getDevices(userId)); + } catch(SQLException error) { + result.put("success", false); + result.put("error", error.getMessage()); + } + + resp.getWriter().println(result.toString()); + } private void login(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { try { req.getSession().setAttribute(USER_ID, - dataManager.login(req.getParameter("name"), req.getParameter("password"))); + Context.getDataManager().login(req.getParameter("name"), req.getParameter("password"))); resp.getWriter().println("{ success: true }"); } catch (SQLException e) { throw new ServletException(e); diff --git a/src/org/traccar/http/WebServer.java b/src/org/traccar/http/WebServer.java index e90ddfe9b..64dfdfbed 100644 --- a/src/org/traccar/http/WebServer.java +++ b/src/org/traccar/http/WebServer.java @@ -15,27 +15,18 @@ */ package org.traccar.http; -import java.io.IOException; -import java.io.PrintWriter; import java.net.InetSocketAddress; import java.util.Properties; -import javax.naming.Context; import javax.naming.InitialContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.sql.DataSource; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.webapp.WebAppContext; -import org.traccar.database.DataManager; +import org.traccar.Context; import org.traccar.helper.Log; /** @@ -45,7 +36,9 @@ public class WebServer { private Server server; - public WebServer(Properties properties, DataManager dataManager) { + public WebServer() { + Properties properties = Context.getProps(); + String address = properties.getProperty("http.address"); Integer port = Integer.valueOf(properties.getProperty("http.port", "8082")); if (address == null) { @@ -58,7 +51,7 @@ public class WebServer { ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.SESSIONS); servletHandler.setContextPath("/api"); - servletHandler.addServlet(new ServletHolder(new MainServlet(dataManager)), "/*"); + servletHandler.addServlet(new ServletHolder(new MainServlet()), "/*"); ResourceHandler resourceHandler = new ResourceHandler(); resourceHandler.setResourceBase(properties.getProperty("http.path")); @@ -72,8 +65,8 @@ public class WebServer { } else { try { - Context context = new InitialContext(); - context.bind("java:/DefaultDS", dataManager.getDataSource()); + javax.naming.Context context = new InitialContext(); + context.bind("java:/DefaultDS", Context.getDataManager().getDataSource()); } catch (Exception error) { Log.warning(error); } |