Merge branch 'feature/kbits-to-bytes-in-webservice' of /home/git/repositories/minicom/datasid

webservice/DataSID.java

@@ -469,11 +469,11 @@ public class DataSID {
     }
 
     private PreparedStatement createNetUsageStatement(Connection con, java.sql.Date contactDate,
-            BigInteger idpoint, Object macaddr, String collect_date, String collect_time, long down_kbits,
-            BigInteger down_packages, long up_kbits, BigInteger up_packages) throws SQLException {
+            BigInteger idpoint, Object macaddr, String collect_date, String collect_time, long down_bytes,
+            BigInteger down_packages, long up_bytes, BigInteger up_packages) throws SQLException {
         final String query = "INSERT INTO net_usage " +
             "(contact_date, id_point, macaddr, collect_date, collect_time, " +
-            "down_kbits, down_packages, up_kbits, up_packages, ip, city_code) VALUES " +
+            "down_bytes, down_packages, up_bytes, up_packages, ip, city_code) VALUES " +
             "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
 
         PreparedStatement st = con.prepareStatement(query);
@@ -488,11 +488,11 @@ public class DataSID {
 
         st.setTime(5, java.sql.Time.valueOf(collect_time));
 
-        st.setLong(6, down_kbits);
+        st.setLong(6, down_bytes);
 
         st.setInt(7, down_packages.intValue());
 
-        st.setLong(8, up_kbits);
+        st.setLong(8, up_bytes);
 
         st.setInt(9, up_packages.intValue());