diff --git a/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/factory/RemoteQAFallbackFactory.java b/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/factory/RemoteQAFallbackFactory.java index d5632d9c..e03bfbb4 100644 --- a/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/factory/RemoteQAFallbackFactory.java +++ b/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/factory/RemoteQAFallbackFactory.java @@ -23,7 +23,7 @@ public class RemoteQAFallbackFactory implements FallbackFactory @Override public RemoteQAService create(Throwable throwable) { - log.error("短信服务调用失败:{}", throwable.getMessage()); + log.error("知识库服务调用失败:{}", throwable.getMessage()); return new RemoteQAService() { @Override public AjaxResult query(String manCode, String question, Long tenantId) { diff --git a/xueyi-modules/xueyi-file/src/main/resources/logback.xml b/xueyi-modules/xueyi-file/src/main/resources/logback.xml index fef7379a..100077fe 100644 --- a/xueyi-modules/xueyi-file/src/main/resources/logback.xml +++ b/xueyi-modules/xueyi-file/src/main/resources/logback.xml @@ -7,7 +7,7 @@ - + ${log.pattern} @@ -22,7 +22,7 @@ 60 - + ${log.pattern} @@ -44,7 +44,7 @@ 60 - + ${log.pattern} diff --git a/xueyi-modules/xueyi-message/src/main/resources/logback.xml b/xueyi-modules/xueyi-message/src/main/resources/logback.xml index 870e1da2..e5fb4ec0 100644 --- a/xueyi-modules/xueyi-message/src/main/resources/logback.xml +++ b/xueyi-modules/xueyi-message/src/main/resources/logback.xml @@ -22,7 +22,7 @@ 60 - + ${log.pattern} @@ -44,7 +44,7 @@ 60 - + ${log.pattern} 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 959541ca..36d33b16 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 @@ -78,10 +78,6 @@ public class ChatServerHandler extends SimpleChannelInboundHandler images; + + /** + * NLP相关日志 + */ + protected NLP nlp; + + /** + * 设备信息 + */ + @Data + class Device { + // 设备id + String devId; + // 麦阵方案 + String micOption; + } + + /** + * 图片信息 + */ + @Data + class Image { + // 图片id + String id; + // 时间戳 + Long timestamp; + // 图像识别方案 + String faceDetectOption; + // 人脸结果图片集 + List faces; + + /** + * 人脸结果 + */ + @Data + class FaceResult { + /** 文件名 */ + String filename; + /** 人脸结果参数 */ + Face face; + } + + /** + * 人脸识别信息 + */ + @Data + class Face { + Integer trackID; + Integer index; + Float confidence; + Float pitch; + Float yaw; + Float roll; + Integer leftEyeType; + Integer rightEyeType; + Integer mouthType; + Float minority; + Float blurness; + Float age; + Float female; + Float male; + Rect rect; + GazeResult gazeResult; + } + + /** + * 矩形框 + */ + @Data + class Rect { + Float x; + Float y; + Float width; + Float height; + } + + /** + * 视线结果 + */ + @Data + class GazeResult { + GazeInfo leftEyeGaze; + GazeInfo rightEyeGaze; + } + + /** + * 视线信息 + */ + @Data + class GazeInfo { + Float centerX; + Float centerY; + Float vectorX; + Float vectorY; + Float vectorZ; + Float roll; + Float pitch; + Float yaw; + } + } + /** + * ASR相关日志 + */ + @Data + class ASR { + // VAD 开始时间 + Long vadStartTime; + // VAD 结束时间 + Long vadEndTime; + // ASR 方案 + String asrOption; + // 文件名 + String filename; + // 识别结果 + String result; + } + + /** + * NLP相关日志 + */ + @Data + class NLP { + + // 问题 + String question; + /** 答案 */ + String answer; + /** 选项 */ + List options; + /** 匹配的的模型 + * -1: 未匹配模型 + * 0: 正则表达式 + * 1: 星火大模型 + * 2: 文心一言 + * 3: ChatGPT + * 4：智普AI + * 5：联动北方Lagi + */ + Integer model; + + /** 响应时间 */ + Long responseTime; + + // 用户选择的答案 + Integer choose; + } + + public String toJSONString() { + return JSONObject.toJSONString(this); + } + +} diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/template/FreeChatTemplate.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/template/FreeChatTemplate.java index cee50a09..6f796136 100644 --- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/template/FreeChatTemplate.java +++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/template/FreeChatTemplate.java @@ -15,6 +15,7 @@ import com.xueyi.nlt.nlt.domain.dto.DmPromptDto; import com.xueyi.nlt.nlt.service.IDmHotspotService; import com.xueyi.nlt.nlt.service.IDmPromptService; import com.xueyi.nlt.nlt.service.ISysLlmService; +import com.yomahub.tlog.core.annotation.TLogAspect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -104,6 +105,7 @@ public class FreeChatTemplate implements BaseTemplate{ return resultJson; } + @TLogAspect(str = "DGMAN-NLT") public JSONObject handle(String dev, String content, boolean stream) { Long operatorId = TerminalSecurityContextHolder.getOperatorId(); String redisKey = "group:nlp:" + SecurityContextHolder.getLocalMap().get("enterprise_id") + ":" + operatorId; @@ -139,6 +141,7 @@ public class FreeChatTemplate implements BaseTemplate{ llmContext.setDevId(dev); LlmParam param = new LlmParam(); LlmResponse response = sysLlmService.stream(llmContext,param); + log.info("llmContext:{}",llmContext); JSONObject resultJson = new JSONObject(); resultJson.put("tts","让我想一想。"); diff --git a/xueyi-modules/xueyi-nlt/src/main/resources/logback.xml b/xueyi-modules/xueyi-nlt/src/main/resources/logback.xml index 4b1dac0b..1d7add53 100644 --- a/xueyi-modules/xueyi-nlt/src/main/resources/logback.xml +++ b/xueyi-modules/xueyi-nlt/src/main/resources/logback.xml @@ -7,7 +7,7 @@ - + ${log.pattern} diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmManDeviceController.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmManDeviceController.java index 3b32d926..fd23bc33 100644 --- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmManDeviceController.java +++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmManDeviceController.java @@ -135,11 +135,10 @@ public class DmManDeviceController extends BaseController manDeviceInfoInner(@RequestParam(value = "devId") String devId) { - System.out.println("manDeviceInfoInner:" + devId); DmManDeviceDto dto = super.baseService.manDeviceInfoInner(devId); - System.out.println("manDeviceInfoInner:dto:" + dto.getTId()); SysEnterpriseDto enterpriseDto = enterpriseService.selectById(dto.getTId()); dto.setStrategyId(enterpriseDto.getStrategyId()); + log.info("获取租户信息：" + dto); return R.ok(dto); } diff --git a/xueyi-modules/xueyi-system/src/main/resources/logback.xml b/xueyi-modules/xueyi-system/src/main/resources/logback.xml index 2a468de6..6b009e52 100644 --- a/xueyi-modules/xueyi-system/src/main/resources/logback.xml +++ b/xueyi-modules/xueyi-system/src/main/resources/logback.xml @@ -7,7 +7,7 @@ - + ${log.pattern} @@ -22,7 +22,7 @@ 60 - + ${log.pattern} @@ -44,7 +44,7 @@ 60 - + ${log.pattern} diff --git a/xueyi-modules/xueyi-tenant/src/main/resources/logback.xml b/xueyi-modules/xueyi-tenant/src/main/resources/logback.xml index 4b20e3b3..e58bdc14 100644 --- a/xueyi-modules/xueyi-tenant/src/main/resources/logback.xml +++ b/xueyi-modules/xueyi-tenant/src/main/resources/logback.xml @@ -7,7 +7,7 @@ - + ${log.pattern} @@ -22,7 +22,7 @@ 60 - + ${log.pattern} @@ -44,7 +44,7 @@ 60 - + ${log.pattern}