diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/server/handler/ChatServerHandler.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/server/handler/ChatServerHandler.java index b7cdc9c6..d6bff226 100644 --- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/server/handler/ChatServerHandler.java +++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/server/handler/ChatServerHandler.java @@ -3,13 +3,22 @@ package com.xueyi.nlt.netty.server.handler; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.xueyi.common.core.utils.core.ObjectUtil; +import com.xueyi.common.core.utils.core.SpringUtils; +import com.xueyi.common.core.web.result.AjaxResult; +import com.xueyi.common.core.web.result.R; import com.xueyi.nlt.api.nlt.domain.vo.DmIntentVo; import com.xueyi.nlt.api.nlt.domain.vo.response.DmIntentResponse; import com.xueyi.nlt.netty.server.config.ServerConfig; import com.xueyi.nlt.nlt.service.IDmIntentService; import com.xueyi.nlt.nlt.service.IDmRegularService; +import com.xueyi.nlt.nlt.service.impl.LogServiceImpl; import com.xueyi.nlt.nlt.template.FreeChatTemplate; import com.xueyi.nlt.nlt.template.MovieChatTemplate; +import com.xueyi.system.api.digitalmans.domain.dto.DmManDeviceDto; +import com.xueyi.system.api.digitalmans.feign.RemoteManDeviceService; +import com.xueyi.system.api.organize.domain.dto.SysEnterpriseDto; +import com.xueyi.system.api.organize.feign.RemoteEnterpriseService; +import com.yomahub.tlog.context.TLogContext; import com.yomahub.tlog.core.annotation.TLogAspect; import com.yomahub.tlog.core.rpc.TLogLabelBean; import com.yomahub.tlog.core.rpc.TLogRPCHandler; @@ -25,18 +34,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.net.InetSocketAddress; @Component public class ChatServerHandler extends SimpleChannelInboundHandler { // 添加log private static final Logger log = LoggerFactory.getLogger(ChatServerHandler.class); + private static final Logger intentLog = LoggerFactory.getLogger("intentLog"); public static ChatServerHandler INSTANCE; + @Autowired + private RemoteManDeviceService manDeviceService; @Autowired private FreeChatTemplate freeChatTemplate; + @Autowired + private RemoteEnterpriseService remoteEnterpriseService; + @Autowired private IDmIntentService intentService; @@ -44,6 +60,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler manDeviceDtoR = INSTANCE.manDeviceService.manDeviceInfoInner(devId); + if (!manDeviceDtoR.isOk() || manDeviceDtoR.getData() == null) { + JSONObject jo = new JSONObject(); + jo.put("action",""); + jo.put("motion","idle"); + jo.put("traceId",""); + jo.put("status",2); + jo.put("code",1); + jo.put("tts","设备号未激活或已过期。"); + channel.writeAndFlush(new TextWebSocketFrame(jo.toJSONString())); + } + String enterpriseName = ""; + // 获取当前数字人租户信息 + R enterpriseDtoR = INSTANCE.remoteEnterpriseService.getInfo(manDeviceDtoR.getData().getTId()); + if (enterpriseDtoR.isOk()) { + enterpriseName = enterpriseDtoR.getData().getName(); + } synchronized (ServerConfig.class) { @@ -97,14 +137,15 @@ public class ChatServerHandler extends SimpleChannelInboundHandler + + + ${log.path}/intent/intentInfo.log + + + + ${log.path}/intent/intentInfo.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + + + @@ -70,5 +97,6 @@ + \ No newline at end of file