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

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/config/KafkaConfig.java

@@ -6,16 +6,22 @@ public class KafkaConfig {
      */
     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 Agv_Heartbeat = "Agv-Heartbeat";
+
 
     /**
      * MachineParameter
      */
     public static final String MACHINEPARAMETER_TOPIC = "MachineParameter";
 
+    public static final String Agv_MachineParameter = "Agv-MachineParameter";
+
     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 {
                         String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
                         heartbeat.setOccurrenceTime(dateStr);
                         heartbeat.setMachineID(agvMachineId);
-                        heartbeat.setTopicType(KafkaConfig.HEARTBEAT_TOPIC);
+                        heartbeat.setTopicType(KafkaConfig.Agv_Heartbeat);
                         String statusStr = JSON.toJSONString(heartbeat);
-                        log.info("原成品仓抛送AGV小车心跳信息:" + KafkaConfig.HEARTBEAT_TOPIC + "内容为:" + statusStr);
-                        ProducerRecord record = new ProducerRecord(KafkaConfig.HEARTBEAT_TOPIC,agvMachineId,statusStr);
+                        log.info("原成品仓抛送AGV小车心跳信息:" + KafkaConfig.Agv_Heartbeat + "内容为:" + statusStr);
+                        ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_Heartbeat,agvMachineId,statusStr);
                         kafkaTemplate.send(record);
 
                         //ListenableFuture future = kafkaTemplate.send(KafkaConfig.HEARTBEAT_TOPIC, statusStr);
@@ -325,14 +325,14 @@ public class KafkaService {
                     String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
                     machineStatus.setOccurrenceTime(dateStr);
                     machineStatus.setMachineID(agvMachineId);
-                    machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC);
+                    machineStatus.setTopicType(KafkaConfig.Agv_MachineStatus);
                     machineStatus.setCurrentStatus(currentStatus);
                     machineStatus.setErrorCode(equipMsg.getErrorCode());
                     machineStatus.setErrorMsg(equipMsg.getMsg());
                     machineStatus.setClientIP("");
                     String statusStr = JSON.toJSONString(machineStatus);
-                    log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr);
-                    ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr);
+                    log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.Agv_MachineStatus + "内容为:" + statusStr);
+                    ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineStatus,agvMachineId,statusStr);
                     ListenableFuture future = kafkaTemplate.send(record);
                     log.info(agvMachineId+"抛送Agv状态返回结果为:" + JSON.toJSONString(future));
                 }
@@ -341,14 +341,14 @@ public class KafkaService {
                 String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
                 machineStatus.setOccurrenceTime(dateStr);
                 machineStatus.setMachineID(agvMachineId);
-                machineStatus.setTopicType(KafkaConfig.MACHINESTATUS_TOPIC);
+                machineStatus.setTopicType(KafkaConfig.Agv_MachineStatus);
                 machineStatus.setCurrentStatus(currentStatus);
                 machineStatus.setErrorCode("");
                 machineStatus.setErrorMsg("");
                 machineStatus.setClientIP("");
                 String statusStr = JSON.toJSONString(machineStatus);
-                log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr);
-                ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr);
+                log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.Agv_MachineStatus + "内容为:" + statusStr);
+                ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineStatus,agvMachineId,statusStr);
                 ListenableFuture future = kafkaTemplate.send(record);
                 log.info(agvMachineId+"抛送设备状态返回结果为:" + JSON.toJSONString(future));
             }
@@ -382,8 +382,8 @@ public class KafkaService {
                 dataList.add(new MachineParameterData("loc", loc));
                 machineParameter.setData(dataList);
                 String machineParameterStr = JSON.toJSONString(machineParameter);
-                log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
-                ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINEPARAMETER_TOPIC,agvMachineId,machineParameterStr);
+                log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.Agv_MachineParameter + "内容为:" + machineParameterStr);
+                ProducerRecord record = new ProducerRecord(KafkaConfig.Agv_MachineParameter,agvMachineId,machineParameterStr);
                 ListenableFuture future = kafkaTemplate.send(record);
                 log.info("推送小车电量和位置信息,MachineParameter返回结果为:" + JSON.toJSONString(future));
             }