Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-08 11:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add attributes to Wialon forwarder

Browse Source
This commit is contained in:
Kirill Loshmanov 2024-10-18 09:36:58 +07:00
parent 90a90d0a2b
commit ce71f380d7
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/traccar/MainModule.java
View File

@ -371,7 +371,7 @@ public class MainModule extends AbstractModule {
case "kafka" -> new PositionForwarderKafka(config, objectMapper);
case "mqtt" -> new PositionForwarderMqtt(config, objectMapper);
case "redis" -> new PositionForwarderRedis(config, objectMapper);
case "wialon" -> new PositionForwarderWialon(config, executorService, "1.0", objectMapper);
case "wialon" -> new PositionForwarderWialon(config, executorService, "1.0");
default -> new PositionForwarderUrl(config, client, objectMapper);
};
}

22
src/main/java/org/traccar/forward/PositionForwarderWialon.java
View File

@ -15,14 +15,11 @@
*/
package org.traccar.forward;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.traccar.config.Config;
import org.traccar.config.Keys;
import org.traccar.helper.Checksum;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Position;
import org.json.JSONObject;
import java.io.IOException;
import java.net.DatagramPacket;
@ -34,6 +31,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ExecutorService;
@ -44,11 +42,9 @@ public class PositionForwarderWialon implements PositionForwarder {
private final DatagramSocket socket;
private final InetAddress address;
private final int port;
private final ObjectMapper objectMapper;
public PositionForwarderWialon(Config config, ExecutorService executorService, String version, ObjectMapper objectMapper) {
public PositionForwarderWialon(Config config, ExecutorService executorService, String version) {
this.version = version;
this.objectMapper = objectMapper;
try {
URI url = new URI(config.getString(Keys.FORWARD_URL));
address = InetAddress.getByName(url.getHost());
@ -77,12 +73,7 @@ public class PositionForwarderWialon implements PositionForwarder {
Position position = positionData.getPosition();
String uniqueId = positionData.getDevice().getUniqueId();
String attributes = "NA";
try {
attributes = convertJsonToWialonParams(objectMapper.writeValueAsString(position.getAttributes()));
} catch (JsonProcessingException e) {
resultHandler.onResult(false, e);
}
String attributes = convertJsonToWialonParams(position.getAttributes());
String payload = String.format(
"%s;%02d%.5f;%s;%03d%.5f;%s;%d;%d;%d;NA;NA;NA;NA;;%s;%s",
@ -120,12 +111,11 @@ public class PositionForwarderWialon implements PositionForwarder {
}
}
public static String convertJsonToWialonParams(String jsonString) {
JSONObject jsonObject = new JSONObject(jsonString);
public static String convertJsonToWialonParams(Map<String, Object> attributes) {
StringBuilder result = new StringBuilder();
for (String key : jsonObject.keySet()) {
Object value = jsonObject.get(key);
for (String key : attributes.keySet()) {
Object value = attributes.get(key);
String type;
if (value instanceof Integer || value instanceof Long) {