diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java index 42eebb58..04cd3b90 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java @@ -22,7 +22,7 @@ import java.util.List; public class GZYForwarder extends Forwarder{ private final Logger logger = LoggerFactory.getLogger(GZYForwarder.class); - static final String FORWARDER_NAME = "贵州交勘院"; + static final String FORWARDER_NAME = "贵州交勘院UDP"; @Value("${gzy.server.host}") private String host; @@ -56,11 +56,9 @@ public class GZYForwarder extends Forwarder{ int sendNum = 0; if(records.size() == 0) return 0; - GZYData gzyData = new GZYData(); - gzyData.setIdentityName(projectId); - - for(GnssCalcData locationRecord: records) { + GZYData gzyData = new GZYData(); + gzyData.setIdentityName(locationRecord.getDeviceid()); GZYData.Data tranData = new GZYData.Data(); tranData.setCollectTime(locationRecord.getCreatetime().format(formatter)); double n = NumberUtils.scale(locationRecord.getRposn(), 2); @@ -70,13 +68,13 @@ public class GZYForwarder extends Forwarder{ tranData.setY(e); tranData.setZ(d); gzyData.addData(tranData); + String json = GsonUtil.toJson(gzyData); + String msg = "JGKJ" + json + "#!"; + logger.info("forward to GZY"); + logger.info(msg); + udpClient.sendMessage(msg); sendNum++; } - String json = GsonUtil.toJson(gzyData); - String msg = "JGKJ" + json + "#!"; - logger.info("forward to GZY"); - logger.info(msg); - udpClient.sendMessage(msg); return sendNum; }