Skip to content
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
ModuleInflux/src/main/java/org/josast/influxdb/AbstractInflux.java
View file @ 96cad615
......@@ -9,30 +9,26 @@ import org.influxdb.dto.Point;
import org.influxdb.dto.Pong;
public abstract class AbstractInflux {
public String databasename = null;
public InfluxDB influxDB=null;
public void conect (String databaseURL, String userName,String password )
{
influxDB = InfluxDBFactory.connect( databaseURL, userName, password);
Pong response = influxDB.ping();
if (response.getVersion().equalsIgnoreCase("unknown")) {
System.out.println("Error pinging server.");
} else
{
} else {
System.out.println(response.getVersion());
}
}
public void createDataBase(String database)
{
if (influxDB.databaseExists(database)==false)
{
if (influxDB.databaseExists(database)==false) {
System.out.println("new database");
influxDB.createDatabase(database);
}
......@@ -42,7 +38,7 @@ public abstract class AbstractInflux {
public void storeSid(int sid, String source, long time)
{
BatchPoints batchPoints = BatchPoints
BatchPoints batchPoints = BatchPoints
.database(databasename)
.build();
Point point0 = Point.measurement("sid")
......@@ -50,11 +46,10 @@ public abstract class AbstractInflux {
.addField("value", sid )
.addField("Source", source )
.addField("timFrame",time)
.build();
.build();
batchPoints.point(point0);
influxDB.write(batchPoints);
influxDB.write(batchPoints);
}
}
ModuleInflux/src/main/java/org/josast/influxdb/InfluxdbUVSQsat.java
View file @ 96cad615
......@@ -132,13 +132,13 @@ public class InfluxdbUVSQsat {
public void store(String data, String source) {
int sid = 0;
byte[] tlm = null;
long time = 0;
UiFrame uiFrame = null;
long timef = 0;
try {
byte[] tlm = hexStringToByteArray(data);
tlm = hexStringToByteArray(data);
Uvsqsat frame = new Uvsqsat(new ByteBufferKaitaiStream(tlm));
uiFrame = (UiFrame) frame.ax25Frame().payload();
......@@ -241,7 +241,8 @@ public class InfluxdbUVSQsat {
break;
default:
System.err.println("SID not found " + sid);
System.err.println("ASCII " + new String(tlm));
idbtrxvutxHkImp.storeSid(sid, source, time);
}
}
......
ModuleInflux/src/test/java/org/josast/influxdb/influxdbUVSQsatTest.java
View file @ 96cad615
......@@ -13,9 +13,12 @@ public class influxdbUVSQsatTest extends TestCase {
}
public void testStore() {
String data = "9882a89a9ea6e09882a89a9ea66303f00801c00000d820031900000002386d9c840000000f02fe0002ac11000069fc0000001a000000030000000a0000694700503c60613a04124b002869869b1f7a360813b04024b00186886800084a0853085a088208830887054202310000080103cd1e230160005a1e2400080001006b0000800007101e2313f608011e1d00b1004e13fb002400060012ffff000013fa00a300150d4f01b4002e0d51005700091a05410180010001000058bb000001fe00a0000600000013000000050005000400060006000500006b8800006b1b00006c2300006bf600006c1900006be31bcd";
// String data = "9882a89a9ea6e09882a89a9ea66303f00801c00000d820031900000002386d9c840000000f02fe0002ac11000069fc0000001a000000030000000a0000694700503c60613a04124b002869869b1f7a360813b04024b00186886800084a0853085a088208830887054202310000080103cd1e230160005a1e2400080001006b0000800007101e2313f608011e1d00b1004e13fb002400060012ffff000013fa00a300150d4f01b4002e0d51005700091a05410180010001000058bb000001fe00a0000600000013000000050005000400060006000500006b8800006b1b00006c2300006bf600006c1900006be31bcd";
// String data = "9882a89a9ea6e09882a89a9ea66303f00801c000001120050300000002387643c4000000090bb6d1";
// String data = "9882a89a9ea6e09882a89a9ea66303f00801c00000d820031900000002387578110000000f04fe0002ac000001b9d80000002600000005000000200001936000302c65312b03d2450029c79c980a68a6531290402440029c79c8ffffffffffffffffffffffffffffff02bc000007fa03781fa0014a004a1fa6feccffb30063000080000b3b1fa0141b07fa1f9d009d004e141d002b00060016fffeffffff470002ffff0d6001b2002c0d62004c00081a054101800100000007f8710000021200a40006000000130000000500050005000600050005ffffc19effffa5d0ffffbc26ffffbd8bffffb607ffffb037b582";
//"observer\":\"G7WIQ-IO92js\",\"timestamp\":\"2021-01-30T21:30:39Z\",\"version\":\"2.0.2\",\"observation_id\":null},{\"norad_cat_id\":99749,\"transmitter\":\"\",\"app_source\":\"sids\",\"schema\":\"\",\"decoded\":\"\",\"frame\":\"9882a89a9ea6e09882a89a9ea66303f00801c00000d820031900000002387577f30000000f04fe0002ac000001b9d20000002600000005000000200001936000402d65312b03e2450029c29c48bf62165312a03c2430019c29c4ffffffffffffffffffffffffffffff02ba000007fb03721fa10116004d1fa6fec5ffb30063000080000b351fa1141d07fb1f9d00a3004f141d002800060016ffff0000ff48000200000d6001a7002d0d62006400081a054101800100000007f8540000021200a4000600000013001c000500050005000500050003ffffc320ffffa7cbffffbe66ffffbebcffffb8a0ffffb1aa0152\",\"observer\":\"G7WIQ-IO92js\",\"timestamp\":\"2021-01-30T21:30:09Z\",\"version\":\"2.0.2\",\"observation_id\":null},{\"norad_cat_id\":99749,\"transmitter\":\"\",\"app_source\":\"sids\",\"schema\":\"\",\"decoded\":\"\",\"frame\":\"9882a89a9ea6e09882a89a9ea66303f00801c00000d820031900000002387577f30000000f04fe0002ac000001b9d20000002600000005000000200001936000402d65312b03e2450029c29c48bf62165312a03c2430019c29c4ffffffffffffffffffffffffffffff02ba000007fb03721fa10116004d1fa6fec5ffb30063000080000b351fa1141d07fb1f9d00a3004f141d002800060016ffff0000ff48000200000d6001a7002d0d62006400081a054101800100000007f8540000021200a4000600000013001c000500050005000500050003ffffc320ffffa7cbffffbe66ffffbebcffffb8a0ffffb1aa0152";
String data = "9882a89a9ea6e09882a89a9ea66303f00801c0000036200c0c000000023876443600000002000300030001004c1a00040238764418000000000300030001200900000204387644360000004a91";
InfluxdbUVSQsatDB influxdbUVSQsatInstance = InfluxdbUVSQsatDB.getInstance();
//influxdbUVSQsatInstance.connect("http://127.0.0.1:8086", "test", "test");
influxdbUVSQsatInstance.store(data, "Xtof");
......
WebAmsatMVP/src/main/java/org/josast/AmsatServer/AmsatDatabaseAPI.java
View file @ 96cad615
......@@ -107,6 +107,7 @@ public class AmsatDatabaseAPI {
App.addEntrySatData(source, frame, fromISO8601UTC(timestamp));
break;
// UVSQsat
case 99749:
case 99760:
case 99999:
InfluxdbUVSQsatDB appDb = InfluxdbUVSQsatDB.getInstance();
......