Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e1ebe0be 由 zshaohui
选项

抛送到中控,小车主题修改

1 个父辈 0968732a
内嵌 并排
正在显示 2 个修改的文件 包含 17 行增加 和 11 行删除
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/config/KafkaConfig.java
...@@ -6,16 +6,22 @@ public class KafkaConfig { ...@@ -6,16 +6,22 @@ public class KafkaConfig {
*/ */
public static final String MACHINESTATUS_TOPIC = "MachineStatus"; public static final String MACHINESTATUS_TOPIC = "MachineStatus";
public static final String Agv_MachineStatus = "Agv-MachineStatus";
/** /**
* 心跳主题 * 心跳主题
*/ */
public static final String HEARTBEAT_TOPIC = "Heartbeat"; public static final String HEARTBEAT_TOPIC = "Heartbeat";
public static final String Agv_Heartbeat = "Agv-Heartbeat";
/** /**
* MachineParameter * MachineParameter
*/ */
public static final String MACHINEPARAMETER_TOPIC = "MachineParameter"; public static final String MACHINEPARAMETER_TOPIC = "MachineParameter";
public static final String Agv_MachineParameter = "Agv-MachineParameter";
public static final String SMARTWH_TOPIC = "SmartWH"; public static final String SMARTWH_TOPIC = "SmartWH";
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/service/KafkaService.java
...@@ -276,10 +276,10 @@ public class KafkaService { ...@@ -276,10 +276,10 @@ public class KafkaService {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"); String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
heartbeat.setOccurrenceTime(dateStr); heartbeat.setOccurrenceTime(dateStr);
heartbeat.setMachineID(agvMachineId); heartbeat.setMachineID(agvMachineId);
heartbeat.setTopicType(KafkaConfig.HEARTBEAT_TOPIC); heartbeat.setTopicType(KafkaConfig.Agv_Heartbeat);
String statusStr = JSON.toJSONString(heartbeat); String statusStr = JSON.toJSONString(heartbeat);
log.info("原成品仓抛送AGV小车心跳信息:" + KafkaConfig.HEARTBEAT_TOPIC + "内容为:" + statusStr); log.info("原成品仓抛送AGV小车心跳信息:" + KafkaConfig.Agv_Heartbeat + "内容为:" + statusStr);
ProducerRecord record = new ProducerRecord(KafkaConfig.HEARTBEAT_TOPIC,agvMachineId,statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_Heartbeat,agvMachineId,statusStr);
kafkaTemplate.send(record); kafkaTemplate.send(record);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.HEARTBEAT_TOPIC, statusStr); //ListenableFuture future = kafkaTemplate.send(KafkaConfig.HEARTBEAT_TOPIC, statusStr);
...@@ -325,14 +325,14 @@ public class KafkaService { ...@@ -325,14 +325,14 @@ public class KafkaService {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"); String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
machineStatus.setOccurrenceTime(dateStr); machineStatus.setOccurrenceTime(dateStr);
machineStatus.setMachineID(agvMachineId); machineStatus.setMachineID(agvMachineId);
machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC); machineStatus.setTopicType(KafkaConfig.Agv_MachineStatus);
machineStatus.setCurrentStatus(currentStatus); machineStatus.setCurrentStatus(currentStatus);
machineStatus.setErrorCode(equipMsg.getErrorCode()); machineStatus.setErrorCode(equipMsg.getErrorCode());
machineStatus.setErrorMsg(equipMsg.getMsg()); machineStatus.setErrorMsg(equipMsg.getMsg());
machineStatus.setClientIP(""); machineStatus.setClientIP("");
String statusStr = JSON.toJSONString(machineStatus); String statusStr = JSON.toJSONString(machineStatus);
log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr); log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.Agv_MachineStatus + "内容为:" + statusStr);
ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineStatus,agvMachineId,statusStr);
ListenableFuture future = kafkaTemplate.send(record); ListenableFuture future = kafkaTemplate.send(record);
log.info(agvMachineId+"抛送Agv状态返回结果为:" + JSON.toJSONString(future)); log.info(agvMachineId+"抛送Agv状态返回结果为:" + JSON.toJSONString(future));
} }
...@@ -341,14 +341,14 @@ public class KafkaService { ...@@ -341,14 +341,14 @@ public class KafkaService {
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"); String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
machineStatus.setOccurrenceTime(dateStr); machineStatus.setOccurrenceTime(dateStr);
machineStatus.setMachineID(agvMachineId); machineStatus.setMachineID(agvMachineId);
machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC); machineStatus.setTopicType(KafkaConfig.Agv_MachineStatus);
machineStatus.setCurrentStatus(currentStatus); machineStatus.setCurrentStatus(currentStatus);
machineStatus.setErrorCode(""); machineStatus.setErrorCode("");
machineStatus.setErrorMsg(""); machineStatus.setErrorMsg("");
machineStatus.setClientIP(""); machineStatus.setClientIP("");
String statusStr = JSON.toJSONString(machineStatus); String statusStr = JSON.toJSONString(machineStatus);
log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr); log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.Agv_MachineStatus + "内容为:" + statusStr);
ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineStatus,agvMachineId,statusStr);
ListenableFuture future = kafkaTemplate.send(record); ListenableFuture future = kafkaTemplate.send(record);
log.info(agvMachineId+"抛送设备状态返回结果为:" + JSON.toJSONString(future)); log.info(agvMachineId+"抛送设备状态返回结果为:" + JSON.toJSONString(future));
} }
...@@ -382,8 +382,8 @@ public class KafkaService { ...@@ -382,8 +382,8 @@ public class KafkaService {
dataList.add(new MachineParameterData("loc", loc)); dataList.add(new MachineParameterData("loc", loc));
machineParameter.setData(dataList); machineParameter.setData(dataList);
String machineParameterStr = JSON.toJSONString(machineParameter); String machineParameterStr = JSON.toJSONString(machineParameter);
log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr); log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.Agv_MachineParameter + "内容为:" + machineParameterStr);
ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINEPARAMETER_TOPIC,agvMachineId,machineParameterStr); ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineParameter,agvMachineId,machineParameterStr);
ListenableFuture future = kafkaTemplate.send(record); ListenableFuture future = kafkaTemplate.send(record);
log.info("推送小车电量和位置信息,MachineParameter返回结果为:" + JSON.toJSONString(future)); log.info("推送小车电量和位置信息,MachineParameter返回结果为:" + JSON.toJSONString(future));
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!