Skip to content

Commit

Permalink
#1 - add prelim entity/api
Browse files Browse the repository at this point in the history
  • Loading branch information
@obriensystems
obriensystems committed May 6, 2024
1 parent 67b284f commit 40faf8f
Show file tree
Hide file tree
Showing 7 changed files with 743 additions and 11 deletions.
246 changes: 235 additions & 11 deletions biometric-nbi/src/main/java/dev/obrienlabs/biometric/nbi/controller/ApiController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.springframework.web.bind.annotation.ResponseBody;

import dev.obrienlabs.biometric.nbi.model.Api;
import dev.obrienlabs.biometric.nbi.model.Record;
import dev.obrienlabs.biometric.nbi.service.ApplicationServiceLocal;

// change to RestController
Expand All @@ -54,30 +55,253 @@ public class ApiController {
ApplicationServiceLocal applicationService;

private final AtomicLong counter = new AtomicLong();
private static final CharSequence PASS = "PASS";
private static final CharSequence PASS = "PASS2";

@RequestMapping(method=RequestMethod.GET)
public @ResponseBody Api process(@RequestParam(
value="action", required=true, defaultValue="undefined") String action,
@RequestMapping(method=RequestMethod.GET)
public @ResponseBody Api process(
@RequestParam(value="action", required=true, defaultValue="u2") String action2,
@RequestParam(value="lg", required=true, defaultValue="0") String lg,
@RequestParam(value="lt", required=true, defaultValue="0") String lt,
@RequestParam(value="ac", required=true, defaultValue="0") String ac,
@RequestParam(value="al", required=true, defaultValue="0") String al,
@RequestParam(value="ts", required=true, defaultValue="0") String ts,
@RequestParam(value="p", required=true, defaultValue="0") String p,
@RequestParam(value="te", required=true, defaultValue="0") String te,
@RequestParam(value="be", required=true, defaultValue="0") String be,
@RequestParam(value="s", required=true, defaultValue="0") String s,
@RequestParam(value="pr", required=true, defaultValue="0") String pr,
@RequestParam(value="hr1", required=true, defaultValue="0") String hr1,
@RequestParam(value="hr2", required=true, defaultValue="0") String hr2,
@RequestParam(value="hrd1", required=true, defaultValue="0") String hrd1,
@RequestParam(value="hrd2", required=true, defaultValue="0") String hrd2,
@RequestParam(value="grx", required=true, defaultValue="0") String grx,
@RequestParam(value="gry", required=true, defaultValue="0") String gry,
@RequestParam(value="grz", required=true, defaultValue="0") String grz,
@RequestParam(value="arx", required=true, defaultValue="0") String arx,
@RequestParam(value="ary", required=true, defaultValue="0") String ary,
@RequestParam(value="arz", required=true, defaultValue="0") String arz,
@RequestParam(value="gsx", required=true, defaultValue="0") String gsx,
@RequestParam(value="gsy", required=true, defaultValue="0") String gsy,
@RequestParam(value="gsz", required=true, defaultValue="0") String gsz,
@RequestParam(value="li", required=true, defaultValue="0") String li,
@RequestParam(value="lax", required=true, defaultValue="0") String lax,
@RequestParam(value="lay", required=true, defaultValue="0") String lay,
@RequestParam(value="laz", required=true, defaultValue="0") String laz,
@RequestParam(value="px", required=true, defaultValue="0") String px,
@RequestParam(value="hu", required=true, defaultValue="0") String hu,
@RequestParam(value="rvx", required=true, defaultValue="0") String rvx,
@RequestParam(value="rvy", required=true, defaultValue="0") String rvy,
@RequestParam(value="rvz", required=true, defaultValue="0") String rvz,
@RequestParam(value="mfx", required=true, defaultValue="0") String mfx,
@RequestParam(value="mfy", required=true, defaultValue="0") String mfy,
@RequestParam(value="mfz", required=true, defaultValue="0") String mfz,
@RequestParam(value="up", required=true, defaultValue="0") String up,
@RequestParam(value="u", required=true, defaultValue="0") String user,
HttpServletRequest request) {
String message = PASS.toString();
message = message + " remoteAddr: " +
request.getRemoteAddr() + " localAddr: " +
request.getLocalAddr() + " remoteHost: " +
request.getRemoteHost() + " serverName: " +
request.getServerName();
request.getServerName() + " " + processGpsPrivate(request);
// + " requestedSessionId: " +
//request.getRequestedSessionId() + " X-FORWARDED-FOR: " +
//request.getHeader("X-FORWARDED-FOR"));
Api api = new Api(counter.incrementAndGet(), message);

LOG.info(message);
LOG.info(api.toString());
System.out.println(api);
// return
// data: 126: OK:f21czytg7206:Record(null,20240505,18,1662449,null,null,45.343881,-75.94045,292,104.69228,1714950768577,1714950768598,null)
return api;
}


private Record processGpsPrivate(HttpServletRequest request) {

String user = request.getParameter("u");

StringBuffer xmlBuffer = new StringBuffer();
xmlBuffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");


String lg = request.getParameter("lg");
String lt = request.getParameter("lt");
String ac = request.getParameter("ac");
String al = request.getParameter("al");
String ts = request.getParameter("ts");
String pressure = request.getParameter("p");
String temp = request.getParameter("te");
String bearing = request.getParameter("be");
String speed = request.getParameter("s");
String provider = request.getParameter("pr");
String heartRate1 = request.getParameter("hr1");
String heartRate2 = request.getParameter("hr2");
String heartRateDevice1 = request.getParameter("hrd1");
String heartRateDevice2 = request.getParameter("hrd2");

String gravityX = request.getParameter("grx");
String gravityY = request.getParameter("gry");
String gravityZ = request.getParameter("grz");
String accelerometerX = request.getParameter("arx");
String accelerometerY = request.getParameter("ary");
String accelerometerZ = request.getParameter("arz");
String gyroscopeX = request.getParameter("gsx");
String gyroscopeY = request.getParameter("gsy");
String gyroscopeZ = request.getParameter("gsz");
String light = request.getParameter("li");
String linearAccelerationX = request.getParameter("lax");
String linearAccelerationY = request.getParameter("lay");
String linearAccelerationZ = request.getParameter("laz");
String proximity = request.getParameter("px");
String humidity = request.getParameter("hu");
String rotationVectorX = request.getParameter("rvx");
String rotationVectorY = request.getParameter("rvy");
String rotationVectorZ = request.getParameter("rvz");

String magFieldX = request.getParameter("mfx");
String magFieldY = request.getParameter("mfy");
String magFieldZ = request.getParameter("mfz");

String sendSeq = request.getParameter("up");

Record aRecord = new Record();
if (null != ts && !ts.isEmpty()) {
aRecord.setTsStart(new Long(ts));
}
aRecord.setTsStop(System.currentTimeMillis());
if (null != lt && !lt.isEmpty()) {
aRecord.setLattitude(new Double(lt));
}
if (null != lg && !lg.isEmpty()) {
aRecord.setLongitude(new Double(lg));
}

aRecord.setUserId(new Long(user));
if (null != ac && !ac.isEmpty()) {
aRecord.setAccuracy(new Double(ac));
}
if (null != al && !al.isEmpty()) {
aRecord.setAltitude(new Double(al));
}
if (null != pressure && !pressure.isEmpty()) {
aRecord.setPressure(new Double(pressure));
}
if (null != temp && !temp.isEmpty()) {
aRecord.setTemp(new Double(temp));
}
if (null != bearing && !bearing.isEmpty()) {
aRecord.setBearing(new Integer(bearing));
}
if (null != speed && !speed.isEmpty()) {
aRecord.setSpeed(new Double(speed));
}
if (null != provider && !provider.isEmpty()) {
aRecord.setProvider(provider);
}
if (null != heartRate1 && !heartRate1.isEmpty()) {
aRecord.setHeartRate1(new Integer(heartRate1));
}
if (null != heartRate2 && !heartRate2.isEmpty()) {
aRecord.setHeartRate2(new Integer(heartRate2));
}
if (null != heartRateDevice1 && !heartRateDevice1.isEmpty()) {
aRecord.setHeartRateDevice1(heartRateDevice1);
}
if (null != heartRateDevice2 && !heartRateDevice2.isEmpty()) {
aRecord.setHeartRateDevice2(heartRateDevice2);
}

if (null != gravityX && !gravityX.isEmpty()) {
aRecord.setGravityX(gravityX);
}
if (null != gravityY && !gravityY.isEmpty()) {
aRecord.setGravityY(gravityY);
}
if (null != gravityZ && !gravityZ.isEmpty()) {
aRecord.setGravityZ(gravityZ);
}
if (null != accelerometerX && !accelerometerX.isEmpty()) {
aRecord.setAccelerometerX(accelerometerX);
}
if (null != accelerometerY && !accelerometerY.isEmpty()) {
aRecord.setAccelerometerY(accelerometerY);
}
if (null != accelerometerZ && !accelerometerZ.isEmpty()) {
aRecord.setAccelerometerZ(accelerometerZ);
}
if (null != gyroscopeX && !gyroscopeX.isEmpty()) {
aRecord.setGyroscopeX(gyroscopeX);
}
if (null != gyroscopeY && !gyroscopeY.isEmpty()) {
aRecord.setGyroscopeY(gyroscopeY);
}
if (null != gyroscopeZ && !gyroscopeZ.isEmpty()) {
aRecord.setGyroscopeZ(gyroscopeZ);
}
if (null != light && !light.isEmpty()) {
aRecord.setLight(light);
}
if (null != linearAccelerationX && !linearAccelerationX.isEmpty()) {
aRecord.setLinearAccelerationX(linearAccelerationX);
}
if (null != linearAccelerationY && !linearAccelerationY.isEmpty()) {
aRecord.setLinearAccelerationY(linearAccelerationY);
}
if (null != linearAccelerationZ && !linearAccelerationZ.isEmpty()) {
aRecord.setLinearAccelerationZ(linearAccelerationZ);
}
if (null != proximity && !proximity.isEmpty()) {
aRecord.setProximity(proximity);
}
if (null != humidity && !humidity.isEmpty()) {
aRecord.setHumidity(humidity);
}
if (null != rotationVectorX && !rotationVectorX.isEmpty()) {
aRecord.setRotationVectorX(rotationVectorX);
}
if (null != rotationVectorY && !rotationVectorY.isEmpty()) {
aRecord.setRotationVectorY(rotationVectorY);
}
if (null != rotationVectorZ && !rotationVectorZ.isEmpty()) {
aRecord.setRotationVectorZ(rotationVectorZ);
}
if (null != magFieldX && !magFieldX.isEmpty()) {
aRecord.setTeslaX(magFieldX);
}
if (null != magFieldY && !magFieldY.isEmpty()) {
aRecord.setTeslaY(magFieldY);
}
if (null != magFieldZ && !magFieldZ.isEmpty()) {
aRecord.setTeslaZ(magFieldZ);
}
if (null != sendSeq && !sendSeq.isEmpty()) {
aRecord.setSendSeq(new Long(sendSeq));
}

aRecord.setRecvSeq(counter.get());//nextReadingSequenceId.addAndGet(1));

//String geohash = service.geohash(new Double(lt), new Double(lg));
//System.out.println(geohash);
//aRecord.setGeohash(geohash);
//String status = service.persist(aRecord);
//out.println(status + ":" + geohash + ":" + aRecord);// xmlBuffer.toString());

//normalize(aRecord);
//}
return aRecord;

}

@GetMapping("/health")
@RequestMapping("/health")
public String getHealth() {
return applicationService.health().toString();
}
@GetMapping("/getGps")
@RequestMapping("/getGps")
public String getGps() {
return applicationService.getGps().toString();
}

@GetMapping("/health")
@RequestMapping("/health")
public String getHealth() {
return applicationService.health().toString();
}
}
5 changes: 5 additions & 0 deletions biometric-nbi/src/main/java/dev/obrienlabs/biometric/nbi/model/Api.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,9 @@ public long getId() {
public String getContent() {
return content;
}

@Override
public String toString() {
return this.id + "," + this.content;
}
}
10 changes: 10 additions & 0 deletions biometric-nbi/src/main/java/dev/obrienlabs/biometric/nbi/model/DataObject.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package dev.obrienlabs.biometric.nbi.model;

public class DataObject {

private Long version;

public Long getVersion() {
return version;
}
}
13 changes: 13 additions & 0 deletions biometric-nbi/src/main/java/dev/obrienlabs/biometric/nbi/model/IdentifiableDataObject.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package dev.obrienlabs.biometric.nbi.model;

public class IdentifiableDataObject extends DataObject {

private Long id;

public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}
Loading

0 comments on commit 40faf8f

Please sign in to comment.