diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java b/src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
index c0fe3c2d4..61403670d 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/codec/netty/Jt808Handler.java
@@ -44,12 +44,12 @@ public class Jt808Handler extends ChannelInboundHandlerAdapter {
Session session = SessionManager.INSTANCE.newSession(channel);
channel.attr(Session.KEY).set(session);
log.info("> Tcp connect {}", session);
- if (session.getDevId() == null) {
+ if (session.getPhoneNumber() == null) {
return;
}
ConnectChangeEvent event = new ConnectChangeEvent(this);
event.setConnected(true);
- event.setPhoneNumber(session.getDevId());
+ event.setPhoneNumber(session.getPhoneNumber());
applicationEventPublisher.publishEvent(event);
}
@@ -58,12 +58,12 @@ public class Jt808Handler extends ChannelInboundHandlerAdapter {
Session session = ctx.channel().attr(Session.KEY).get();
log.info("< Tcp disconnect {}", session);
ctx.close();
- if (session.getDevId() == null) {
+ if (session.getPhoneNumber() == null) {
return;
}
ConnectChangeEvent event = new ConnectChangeEvent(this);
event.setConnected(false);
- event.setPhoneNumber(session.getDevId());
+ event.setPhoneNumber(session.getPhoneNumber());
applicationEventPublisher.publishEvent(event);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
index 685a273fb..92763f029 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/dao/JTChannelMapper.java
@@ -18,7 +18,7 @@ public interface JTChannelMapper {
" AND " +
"jc.name LIKE concat('%',#{query},'%') " +
" " +
- "ORDER BY jc.update_time " +
+ "ORDER BY jc.channel_id " +
" "})
List getAll(@Param("terminalId") int terminalId, @Param("query") String query);
@@ -28,7 +28,7 @@ public interface JTChannelMapper {
", terminal_id=#{terminalId}" +
", has_audio=#{hasAudio}" +
", name=#{name}" +
- ", channelId=#{channelId}" +
+ ", channel_id=#{channelId}" +
"WHERE id=#{id}"+
" "})
void update(JTChannel channel);
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
index 86b7d7ada..f4b11e73c 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/Re.java
@@ -23,7 +23,7 @@ public abstract class Re {
protected abstract Rs handler(Header header, Session session, Ijt1078Service service);
public Rs decode(ByteBuf buf, Header header, Session session, Ijt1078Service service) {
- if (session != null && !StringUtils.hasLength(session.getDevId())) {
+ if (session != null && !StringUtils.hasLength(session.getPhoneNumber())) {
session.register(header.getPhoneNumber(), (int) header.getVersion(), header);
}
Rs rs = decode0(buf, header, session);
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java b/src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java
index d79e59d57..e8a96815d 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java
@@ -27,8 +27,8 @@ public class Session {
// 是否注册成功
private boolean registered = false;
- // 设备ID
- private String devId;
+ // 设备手机号
+ private String phoneNumber;
// 创建时间
private final long creationTime;
@@ -69,7 +69,7 @@ public class Session {
* @param devId 设备ID
*/
public void register(String devId, Integer version, Header header) {
- this.devId = devId;
+ this.phoneNumber = devId;
this.registered = true;
this.protocolVersion = version;
this.header = header;
@@ -81,8 +81,8 @@ public class Session {
*
* @return 设备号
*/
- public String getDevId() {
- return devId;
+ public String getPhoneNumber() {
+ return phoneNumber;
}
@@ -105,7 +105,7 @@ public class Session {
@Override
public String toString() {
return "[" +
- "devId=" + devId +
+ "phoneNumber=" + phoneNumber +
", reg=" + registered +
", version=" + protocolVersion +
",ip=" + channel.remoteAddress() +
@@ -114,6 +114,6 @@ public class Session {
public void unregister() {
channel.close();
- SessionManager.INSTANCE.remove(this.devId);
+ SessionManager.INSTANCE.remove(this.phoneNumber);
}
}