c4181/cadupdate-received
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Postgres version #1

Merged
c4181 merged 17 commits from postgres-version into main 2025-11-19 17:38:10 +00:00
Conversation 15 Commits 17 Files changed 14 +23 -5
4 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9df4f9edf4 - Show all commits

12
src/main/java/com/c4181/camel/CamelConfiguration.java
View file

@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import java.awt.geom.Point2D;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -34,6 +35,7 @@ public class CamelConfiguration extends RouteBuilder {
}))
.removeHeader("*")
.split(body())
.wireTap("direct:processedCalls")
.process(exchange -> {
JsoCall jsoCall = exchange.getIn().getBody(JsoCall.class);
Map<String, Object> sqlCall = new HashMap<>();
@ -53,5 +55,15 @@ public class CamelConfiguration extends RouteBuilder {
exchange.getIn().setBody(sqlCall);
})
.to(appProperties.jsoCadUpdateRouteOut());
from("direct:processedCalls")
.filter(exchange -> exchange.getIn().getBody(JsoCall.class).getPoint() != null)
.process(exchange -> {
JsoCall jsoCall = exchange.getIn().getBody(JsoCall.class);
if (Point2D.distance(jsoCall.getPoint().getLat(), appProperties.myLat(), jsoCall.getPoint().getLng(), appProperties.myLong()) >= 2.0) {
exchange.setRouteStop(true);
}
})
.to(appProperties.telegramRoute());
}
}

2
src/main/java/com/c4181/model/JsoCallDecoder.java
View file

@ -36,7 +36,7 @@ public class JsoCallDecoder {
String trimmedCall = call.trim();
JsoCall jsoCall = new JsoCall();
jsoCall.setIncidentNumber(trimmedCall.substring(0, 12));
jsoCall.setDispatchedTime(parseTimeWithoutYear(trimmedCall.substring(14, 25)));
jsoCall.setDispatchedTime(parseTimeWithoutYear(trimmedCall.substring(14, 24).trim()));
jsoCall.setAddress(trimmedCall.substring(27, 69).trim());
jsoCall.setSignal(trimmedCall.substring(69, 77).trim());
jsoCall.setCallDescription(trimmedCall.substring(77).trim());

3
src/main/java/com/c4181/properties/AppProperties.java
View file

@ -7,5 +7,8 @@ public interface AppProperties {
String jsoCadUpdateRouteIn();
String jsoCadUpdateRouteOut();
String telegramRoute();
String googleApiKey();
double myLat();
double myLong();
}

11
src/main/resources/application.properties
View file

@ -1,11 +1,14 @@
app.jso-cad-update-route-in=rabbitmq:${app.rabbitemq.ip}/jso.cad.updates.to.postgres?queue=jso.cad.update.received&declare=false&vhost=jso&username=${RABBITMQ_USER}&password=${RABBITMQ_PASSWORD}&autoDelete=false
app.jso-cad-update-route-in=rabbitmq:${RABBITMQ_IP}/jso.cad.updates.to.postgres?queue=jso.cad.update.received&declare=false&vhost=jso&username=${RABBITMQ_USER}&password=${RABBITMQ_PASSWORD}&autoDelete=false
app.jso-cad-update-route-out=sql:INSERT INTO calls(incident_number, dispatched_time, address, signal, call_description, point) VALUES (:#incident_number, :#dispatched_time, :#address, :#signal, :#call_description, point(:#x, :#y))
app.google-api-key=${GOOGLE_API_KEY}
app.rabbitmq.ip=192.168.1.117
app.postgres.ip=192.168.1.17
app.my-lat=30.3025061
app.my-long=-81.6436614
RABBITMQ_IP=192.168.1.117
POSTGRES_IP=192.168.1.17
quarkus.datasource.db-kind=postgresql
quarkus.datasource.username=${POSTGRES_USER}
quarkus.datasource.password=${POSTGRES_PASSWORD}
quarkus.datasource.jdbc.url=jdbc:postgresql://${app.postgres.ip}:5432/jsoCad
quarkus.datasource.jdbc.url=jdbc:postgresql://${POSTGRES_IP}:5432/jsoCad