|
|
@@ -120,7 +120,7 @@ public class TsbWebSocketService
|
|
|
LoginUser loginUser = tokenService.getLoginUser(token);
|
|
|
if (loginUser == null || loginUser.getUser() == null)
|
|
|
{
|
|
|
- log.warn("WebSocket 鉴权失败:无效 token");
|
|
|
+ log.info("WebSocket 鉴权失败:无效 token");
|
|
|
if (failReason != null)
|
|
|
{
|
|
|
failReason.append("登录状态无效,请重新登录");
|
|
|
@@ -138,7 +138,7 @@ public class TsbWebSocketService
|
|
|
String precheckMsg = precheckConnect(userId, deviceSn, loginUser);
|
|
|
if (precheckMsg != null)
|
|
|
{
|
|
|
- log.warn("WebSocket 预检失败:{}, userId={}, deviceSn={}", precheckMsg, userId, deviceSn);
|
|
|
+ log.info("WebSocket 预检失败:{}, userId={}, deviceSn={}", precheckMsg, userId, deviceSn);
|
|
|
if (failReason != null)
|
|
|
{
|
|
|
failReason.append(precheckMsg);
|
|
|
@@ -154,7 +154,7 @@ public class TsbWebSocketService
|
|
|
// 创建信息map
|
|
|
if (!TsbWebSocketUsers.tryPut(bind.getDeviceSn(), session))
|
|
|
{
|
|
|
- log.warn("WebSocket 注册失败:设备已被占用, deviceSn={}", bind.getDeviceSn());
|
|
|
+ log.info("WebSocket 注册失败:设备已被占用, deviceSn={}", bind.getDeviceSn());
|
|
|
if (failReason != null)
|
|
|
{
|
|
|
failReason.append("该设备已被占用连接,请稍后再试");
|
|
|
@@ -185,14 +185,14 @@ public class TsbWebSocketService
|
|
|
TsbWebSocketMessage tsbWebSocketMessage = JSON.parseObject(message, TsbWebSocketMessage.class);
|
|
|
if (tsbWebSocketMessage == null || StringUtils.isEmpty(tsbWebSocketMessage.getCmdType()))
|
|
|
{
|
|
|
- log.warn("WebSocket 消息格式无效, sessionId={}, message={}", session.getId(), message);
|
|
|
+ log.info("WebSocket 消息格式无效, sessionId={}, message={}", session.getId(), message);
|
|
|
return;
|
|
|
}
|
|
|
// 2、组装下发所需的消息
|
|
|
TsbUserDeviceBind bind = getBindFromSession(session);
|
|
|
if (bind == null || bind.getDeviceSn() == null || StringUtils.isEmpty(bind.getDeviceType()))
|
|
|
{
|
|
|
- log.warn("WebSocket 获取用户设备信息失败, sessionId={}, bind={}", session.getId(), bind);
|
|
|
+ log.info("WebSocket 获取用户设备信息失败, sessionId={}, bind={}", session.getId(), bind);
|
|
|
TsbWebSocketUsers.sendMessageToUserByText(session,
|
|
|
TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "会话缺少设备绑定信息,请重新连接"));
|
|
|
return;
|
|
|
@@ -201,7 +201,7 @@ public class TsbWebSocketService
|
|
|
Long userId = getUserIdFromSession(session);
|
|
|
if (!hasPagePermission(userPermissions, tsbWebSocketMessage.getCmdType(), userId))
|
|
|
{
|
|
|
- log.warn("WebSocket 用户权限不足, sessionId={}, cmdType={}", session.getId(), tsbWebSocketMessage.getCmdType());
|
|
|
+ log.info("WebSocket 用户权限不足, sessionId={}, cmdType={}", session.getId(), tsbWebSocketMessage.getCmdType());
|
|
|
TsbWebSocketUsers.sendMessageToUserByText(session,
|
|
|
TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "用户权限不足"));
|
|
|
return;
|
|
|
@@ -209,14 +209,14 @@ public class TsbWebSocketService
|
|
|
CmdTypeEnum cmdType = CmdTypeEnum.resolveDownlink(tsbWebSocketMessage.getCmdType());
|
|
|
if (cmdType == null)
|
|
|
{
|
|
|
- log.warn("WebSocket 命令类型无效, sessionId={}, cmdType={}", session.getId(), tsbWebSocketMessage.getCmdType());
|
|
|
+ log.info("WebSocket 命令类型无效, sessionId={}, cmdType={}", session.getId(), tsbWebSocketMessage.getCmdType());
|
|
|
TsbWebSocketUsers.sendMessageToUserByText(session,
|
|
|
TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "命令类型无效"));
|
|
|
return;
|
|
|
}
|
|
|
if (!deviceOnlineManager.isOnline(bind.getDeviceSn()))
|
|
|
{
|
|
|
- log.warn("WebSocket 设备未在线, sessionId={}, deviceSn={}", session.getId(), bind.getDeviceSn());
|
|
|
+ log.info("WebSocket 设备未在线, sessionId={}, deviceSn={}", session.getId(), bind.getDeviceSn());
|
|
|
TsbWebSocketUsers.sendMessageToUserByText(session,
|
|
|
TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "设备未在线"));
|
|
|
return;
|
|
|
@@ -230,7 +230,7 @@ public class TsbWebSocketService
|
|
|
}
|
|
|
if (handler == null)
|
|
|
{
|
|
|
- log.warn("未注册 JSON 命令处理器 cmd={}", cmdType);
|
|
|
+ log.info("未注册 JSON 命令处理器 cmd={}", cmdType);
|
|
|
TsbWebSocketUsers.sendMessageToUserByText(session,
|
|
|
TsbWebSocketMessage.fail(tsbWebSocketMessage.getCmdType(), "未实现的服务处理器"));
|
|
|
return;
|
|
|
@@ -241,7 +241,7 @@ public class TsbWebSocketService
|
|
|
IEncoder<BaseJsonBody> encoder = (IEncoder<BaseJsonBody>) handlerManager.getEncoder(key);
|
|
|
if (encoder == null)
|
|
|
{
|
|
|
- log.warn("未找到 JSON Body 编码器, deviceSn={}", bind.getDeviceSn());
|
|
|
+ log.info("未找到 JSON Body 编码器, deviceSn={}", bind.getDeviceSn());
|
|
|
return;
|
|
|
}
|
|
|
log.info("MQTT 下行发送, cmdType={}, deviceType={}, deviceSn={}",
|
|
|
@@ -313,19 +313,19 @@ public class TsbWebSocketService
|
|
|
Long deviceSn = bodyObj.getLong("deviceSn");
|
|
|
if (deviceSn == null)
|
|
|
{
|
|
|
- log.warn("MQTT上行设备SN码无效");
|
|
|
+ log.info("MQTT上行设备SN码无效");
|
|
|
return;
|
|
|
}
|
|
|
if (!deviceOnlineManager.isOnline(deviceSn))
|
|
|
{
|
|
|
- log.warn("MQTT上行设备未在线, deviceSn={}", deviceSn);
|
|
|
+ log.info("MQTT上行设备未在线, deviceSn={}", deviceSn);
|
|
|
return;
|
|
|
}
|
|
|
// 2、通过 deviceSn 判断WebSocket是否连接
|
|
|
Map<Long, Session> sessionUsers = TsbWebSocketUsers.getSessionUsers();
|
|
|
if (!sessionUsers.containsKey(deviceSn))
|
|
|
{
|
|
|
- log.warn("web端用户未操作设备, deviceSn={}", deviceSn);
|
|
|
+ log.info("web端用户未操作设备, deviceSn={}", deviceSn);
|
|
|
return;
|
|
|
}
|
|
|
// 3、发送消息
|