master
parent
e72e1c10a9
commit
46510a51f8
|
|
@ -0,0 +1,22 @@
|
||||||
|
package com.njzscloud.dispose.dev;
|
||||||
|
|
||||||
|
import com.njzscloud.common.core.mitt.MittEvent;
|
||||||
|
import com.njzscloud.common.core.tuple.Tuple2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author lqz
|
||||||
|
*/
|
||||||
|
public class DevMittEvent {
|
||||||
|
/**
|
||||||
|
* 车辆触发识别
|
||||||
|
*/
|
||||||
|
public static MittEvent<Tuple2<DiscoverTruckMsg, WbsHandle>> DISCOVER_TRUCK = () -> {
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 过磅数据回复
|
||||||
|
*/
|
||||||
|
public static MittEvent<Tuple2<ObtainTruckDataResultMsg, WbsHandle>> OBTAIN_TRUCK_DATA_REPLY = () -> {
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -5,12 +5,12 @@ import com.njzscloud.common.mqtt.support.MqttListener;
|
||||||
import com.njzscloud.common.mqtt.support.MqttMsg;
|
import com.njzscloud.common.mqtt.support.MqttMsg;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import static com.njzscloud.dispose.event.SysMittEvent.DISCOVER_TRUCK;
|
import static com.njzscloud.dispose.dev.DevMittEvent.DISCOVER_TRUCK;
|
||||||
import static com.njzscloud.dispose.event.SysMittEvent.OBTAIN_TRUCK_DATA_REPLY;
|
import static com.njzscloud.dispose.dev.DevMittEvent.OBTAIN_TRUCK_DATA_REPLY;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class Wbs {
|
public class Wbs {
|
||||||
@MqttListener(topic = "discover_truck")
|
@MqttListener(topic = "wbs/discover_truck")
|
||||||
public void discoverTruck(MqttMsg msg) {
|
public void discoverTruck(MqttMsg msg) {
|
||||||
DiscoverTruckMsg discoverTruckMsg = msg.getMsg(DiscoverTruckMsg.class);
|
DiscoverTruckMsg discoverTruckMsg = msg.getMsg(DiscoverTruckMsg.class);
|
||||||
WbsHandle wbsHandle = new WbsHandle(discoverTruckMsg.getId(),
|
WbsHandle wbsHandle = new WbsHandle(discoverTruckMsg.getId(),
|
||||||
|
|
@ -21,7 +21,7 @@ public class Wbs {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@MqttListener(topic = "obtain_truck_data/reply")
|
@MqttListener(topic = "wbs/obtain_truck_data/reply")
|
||||||
public void obtainTruckDataReply(MqttMsg msg) {
|
public void obtainTruckDataReply(MqttMsg msg) {
|
||||||
ObtainTruckDataResultMsg obtainTruckDataResultMsg = msg.getMsg(ObtainTruckDataResultMsg.class);
|
ObtainTruckDataResultMsg obtainTruckDataResultMsg = msg.getMsg(ObtainTruckDataResultMsg.class);
|
||||||
WbsHandle wbsHandle = new WbsHandle(obtainTruckDataResultMsg.getId(),
|
WbsHandle wbsHandle = new WbsHandle(obtainTruckDataResultMsg.getId(),
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.njzscloud.dispose.dev;
|
package com.njzscloud.dispose.dev;
|
||||||
|
|
||||||
|
import cn.hutool.core.lang.Assert;
|
||||||
import cn.hutool.core.map.MapUtil;
|
import cn.hutool.core.map.MapUtil;
|
||||||
import com.njzscloud.common.mqtt.util.Mqtt;
|
import com.njzscloud.common.mqtt.util.Mqtt;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
|
@ -33,7 +34,8 @@ public class WbsHandle {
|
||||||
if (times < 1) {
|
if (times < 1) {
|
||||||
times = 1;
|
times = 1;
|
||||||
}
|
}
|
||||||
Mqtt.publish(sn + "/play_voice", MapUtil.builder()
|
Assert.notBlank(content, "语音内容不能为空");
|
||||||
|
Mqtt.publish(sn + "/wbs/play_voice", MapUtil.builder()
|
||||||
.put("id", id)
|
.put("id", id)
|
||||||
.put("groupSn", groupSn)
|
.put("groupSn", groupSn)
|
||||||
.put("barrierSn", barrierSn)
|
.put("barrierSn", barrierSn)
|
||||||
|
|
@ -57,7 +59,7 @@ public class WbsHandle {
|
||||||
* @param orderId 订单ID
|
* @param orderId 订单ID
|
||||||
*/
|
*/
|
||||||
public void obtainTruckData(Long orderId) {
|
public void obtainTruckData(Long orderId) {
|
||||||
Mqtt.publish(sn + "/obtain_truck_data", MapUtil.builder()
|
Mqtt.publish(sn + "/wbs/obtain_truck_data", MapUtil.builder()
|
||||||
.put("id", id)
|
.put("id", id)
|
||||||
.put("orderId", orderId.toString())
|
.put("orderId", orderId.toString())
|
||||||
.put("groupSn", groupSn)
|
.put("groupSn", groupSn)
|
||||||
|
|
@ -69,7 +71,7 @@ public class WbsHandle {
|
||||||
* 打开道闸
|
* 打开道闸
|
||||||
*/
|
*/
|
||||||
public void open() {
|
public void open() {
|
||||||
Mqtt.publish(sn + "/open", MapUtil.builder()
|
Mqtt.publish(sn + "/wbs/open", MapUtil.builder()
|
||||||
.put("id", id)
|
.put("id", id)
|
||||||
.put("groupSn", groupSn)
|
.put("groupSn", groupSn)
|
||||||
.put("barrierSn", barrierSn)
|
.put("barrierSn", barrierSn)
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,6 @@
|
||||||
package com.njzscloud.dispose.event;
|
package com.njzscloud.dispose.event;
|
||||||
|
|
||||||
import com.njzscloud.common.core.mitt.MittEvent;
|
import com.njzscloud.common.core.mitt.MittEvent;
|
||||||
import com.njzscloud.common.core.tuple.Tuple2;
|
|
||||||
import com.njzscloud.dispose.dev.DiscoverTruckMsg;
|
|
||||||
import com.njzscloud.dispose.dev.ObtainTruckDataResultMsg;
|
|
||||||
import com.njzscloud.dispose.dev.WbsHandle;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -20,17 +16,4 @@ public class SysMittEvent {
|
||||||
|
|
||||||
public static MittEvent<Long> SALES_ORDER = () -> {
|
public static MittEvent<Long> SALES_ORDER = () -> {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* 车辆触发识别
|
|
||||||
*/
|
|
||||||
public static MittEvent<Tuple2<DiscoverTruckMsg, WbsHandle>> DISCOVER_TRUCK = () -> {
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 过磅数据回复
|
|
||||||
*/
|
|
||||||
public static MittEvent<Tuple2<ObtainTruckDataResultMsg, WbsHandle>> OBTAIN_TRUCK_DATA_REPLY = () -> {
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue