From 9a96e9bdab87dc28b9a1e597a494b8992a8592ea Mon Sep 17 00:00:00 2001 From: ZLI263 Date: Fri, 12 Sep 2025 11:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sonar=E6=89=AB=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/volvo/ai/analytic/center/dto/PageDto.java | 1 - .../ai/analytic/center/dto/corpus/ImCurMessageDTO.java | 2 -- .../center/dto/req/SummaryQuestionRequestDTO.java | 1 - .../volvo/ai/analytic/center/dto/resp/AnalysisResp.java | 1 - .../com/volvo/ai/analytic/center/enums/CategoryEnum.java | 1 + .../center/controller/EGEventSubscriptionController.java | 1 - .../volvo/ai/analytic/center/job/AiAnalysisDifyJob.java | 4 +++- .../com/volvo/ai/analytic/center/job/QiWeiCorpusJob.java | 8 +++++--- .../volvo/ai/analytic/center/mq/CorpusDccMqConsumer.java | 5 ++--- .../ai/analytic/center/mq/CorpusProcessKafkaProducer.java | 1 - .../ai/analytic/center/service/AiAnalysisDifyService.java | 1 - .../analytic/center/service/TmTelephoneCorpusService.java | 3 --- .../center/service/impl/CorpusPortraitServiceImpl.java | 3 ++- .../center/service/impl/TmTelephoneCorpusServiceImpl.java | 1 + 14 files changed, 14 insertions(+), 19 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/PageDto.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/PageDto.java index b7f8cf9..3134787 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/PageDto.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/PageDto.java @@ -8,7 +8,6 @@ package com.volvo.ai.analytic.center.dto; **/ import lombok.Data; -import org.springframework.cloud.context.config.annotation.RefreshScope; @Data public class PageDto { diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/corpus/ImCurMessageDTO.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/corpus/ImCurMessageDTO.java index 1ab00a6..3b65de3 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/corpus/ImCurMessageDTO.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/corpus/ImCurMessageDTO.java @@ -2,8 +2,6 @@ package com.volvo.ai.analytic.center.dto.corpus; import lombok.Data; -import java.util.Date; - /** * @description IM会话存档消息记录表-湖仓同步表 * @author jlu diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/SummaryQuestionRequestDTO.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/SummaryQuestionRequestDTO.java index 0fe2a34..57c7506 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/SummaryQuestionRequestDTO.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/SummaryQuestionRequestDTO.java @@ -1,6 +1,5 @@ package com.volvo.ai.analytic.center.dto.req; -import com.alibaba.fastjson.JSONObject; import lombok.Data; @Data diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/AnalysisResp.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/AnalysisResp.java index 21a11ab..c8ce6a8 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/AnalysisResp.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/AnalysisResp.java @@ -1,7 +1,6 @@ package com.volvo.ai.analytic.center.dto.resp; import com.volvo.common.core.constant.CommonConstants; -import com.volvo.common.core.util.ResultMsg; import lombok.Data; /** diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java index d8a1767..0f77033 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/enums/CategoryEnum.java @@ -3,6 +3,7 @@ package com.volvo.ai.analytic.center.enums; public enum CategoryEnum { ENTERPRISE_WECHAT("enterprise_wechat", "企微记录"), + ENTERPRISE_WECHAT_PORTRAIT("enterprise_wechat_portrait", "企微语料客户画像"), PHONE_VOICE("phone_voice", "语音电话"), PORTRAIT_ALLIN("portrait_allin", "语音电话,用户画像"), NAMEPLATE_VOICE("nameplate_voice", "铭牌"), diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/EGEventSubscriptionController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/EGEventSubscriptionController.java index e0d124c..0707d99 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/EGEventSubscriptionController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/EGEventSubscriptionController.java @@ -2,7 +2,6 @@ package com.volvo.ai.analytic.center.controller; import com.huaweicloud.sdk.eg.v1.model.*; import com.volvo.ai.analytic.center.dto.event.ListSubscriptionsRequestDto; -import com.volvo.ai.analytic.center.dto.event.SendEventDto; import com.volvo.ai.analytic.center.dto.event.SubscriptionCreateReqDto; import com.volvo.ai.analytic.center.dto.event.SubscriptionOperateReqDto; import com.volvo.ai.analytic.center.dto.resp.ResultDTO; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/AiAnalysisDifyJob.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/AiAnalysisDifyJob.java index 040dbe6..93a19b9 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/AiAnalysisDifyJob.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/AiAnalysisDifyJob.java @@ -28,6 +28,8 @@ import java.util.List; @RestController public class AiAnalysisDifyJob { + private static final String PROCESS_MESSAGE_TASK_ERROR = "processMessageByTask 定时任务补偿处理消息异常"; + @Autowired private AiAnalysisRequestLogsMapper aiAnalysisRequestLogsMapper; @@ -63,7 +65,7 @@ public class AiAnalysisDifyJob { }); } catch (Exception e) { - log.error("processMessageByTask 定时任务补偿处理消息异常",e.getMessage()); + log.error(PROCESS_MESSAGE_TASK_ERROR,e.getMessage()); throw new RuntimeException(e); } return ResultMsg.ok(); diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/QiWeiCorpusJob.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/QiWeiCorpusJob.java index e23fc70..2bf8975 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/QiWeiCorpusJob.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/QiWeiCorpusJob.java @@ -26,6 +26,8 @@ import java.util.List; @RestController public class QiWeiCorpusJob { + private static final String PROCESS_MESSAGE_TASK_ERROR = "processMessageByTask 定时任务补偿处理消息异常"; + @Autowired private TmOdsVdqwMessagearchivingService tmOdsVdqwMessagearchivingService; @@ -58,7 +60,7 @@ public class QiWeiCorpusJob { log.info("qiWeiCorpusTask 企微语料查询处理:{}",param); tmOdsVdqwMessagearchivingService.runQiWeiCorpusDify(param); } catch (Exception e) { - log.error("processMessageByTask 定时任务补偿处理消息异常",e.getMessage()); + log.error(PROCESS_MESSAGE_TASK_ERROR,e.getMessage()); throw new RuntimeException(e); } return ResultMsg.ok(); @@ -86,7 +88,7 @@ public class QiWeiCorpusJob { } ); } catch (Exception e) { - log.error("processMessageByTask 定时任务补偿处理消息异常",e.getMessage()); + log.error(PROCESS_MESSAGE_TASK_ERROR,e.getMessage()); throw new RuntimeException(e); } return ResultMsg.ok(); @@ -111,7 +113,7 @@ public class QiWeiCorpusJob { } ); } catch (Exception e) { - log.error("processMessageByTask 定时任务补偿处理消息异常",e.getMessage()); + log.error(PROCESS_MESSAGE_TASK_ERROR,e.getMessage()); throw new RuntimeException(e); } return ResultMsg.ok(); diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusDccMqConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusDccMqConsumer.java index c2d5eaf..a1ba6ec 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusDccMqConsumer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusDccMqConsumer.java @@ -2,7 +2,6 @@ package com.volvo.ai.analytic.center.mq; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -50,14 +49,14 @@ public class CorpusDccMqConsumer implements RocketMQListener { try { log.info("corpusDccMqConsumer1 当前线程: {}, 线程ID: {}", Thread.currentThread().getName(), Thread.currentThread().getId()); String message = new String(messageExt.getBody()); - log.info("dcc_mq message: " + message); + log.info("dcc_mq接收到消息 : " + message); AicorpusTelephoneDTO aicorpusTelephone = objectMapper.readValue(message, AicorpusTelephoneDTO.class); //DCC场景 if(Objects.equals(aicorpusTelephone.getCategoryCode(), Constant.CHANNEL_DCC)){ //TODO 这里需要确认客户画像下这个字段值是什么？ 已经确认了，和总结需求的dcc场景是一致的 ， 所以不需要修改。。 //总结和客户画像都是这一个:Constant.CHANNEL_DCC JSONObject jsonObject = JSONObject.parseObject( aicorpusTelephone.getDisplay()); - log.info(" message: " + JSON.toJSONString(aicorpusTelephone)); + log.info(" dcc_mq接收到消息 ， 总结和分类业务场景: " + JSON.toJSONString(aicorpusTelephone)); tmTelephoneCorpusService.runTelephoneCorpusDify(aicorpusTelephone); } //channel_4in1场景 diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaProducer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaProducer.java index 23084bb..96c691e 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaProducer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaProducer.java @@ -1,7 +1,6 @@ package com.volvo.ai.analytic.center.mq; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.volvo.ai.analytic.center.constant.Constant; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/AiAnalysisDifyService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/AiAnalysisDifyService.java index 3663dd4..08c5a22 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/AiAnalysisDifyService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/AiAnalysisDifyService.java @@ -2,7 +2,6 @@ package com.volvo.ai.analytic.center.service; import com.volvo.ai.analytic.center.dto.req.AnalysisQueryReq; import com.volvo.ai.analytic.center.dto.req.AnalysisReq; -import com.volvo.ai.analytic.center.dto.resp.AnalysisDifyResultDTO; import com.volvo.ai.analytic.center.dto.resp.AnalysisResp; public interface AiAnalysisDifyService { diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmTelephoneCorpusService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmTelephoneCorpusService.java index fe8af6a..0e29408 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmTelephoneCorpusService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmTelephoneCorpusService.java @@ -2,11 +2,8 @@ package com.volvo.ai.analytic.center.service; import com.baomidou.mybatisplus.extension.service.IService; import com.volvo.ai.analytic.center.dto.corpus.AicorpusTelephoneDTO; -import com.volvo.ai.analytic.center.entity.DataMaskingRule; import com.volvo.ai.analytic.center.entity.TmTelephoneCorpus; -import java.util.List; - /** * @description 电话语料表-同步表 * @author BEJSON diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/CorpusPortraitServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/CorpusPortraitServiceImpl.java index 869fb90..7c59b35 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/CorpusPortraitServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/CorpusPortraitServiceImpl.java @@ -15,6 +15,7 @@ import com.volvo.ai.analytic.center.dto.resp.ResultDTO; import com.volvo.ai.analytic.center.entity.*; import com.volvo.ai.analytic.center.enums.BizEnum; import com.volvo.ai.analytic.center.enums.BusinessTypeEnum; +import com.volvo.ai.analytic.center.enums.CategoryEnum; import com.volvo.ai.analytic.center.feign.CompetingBrandsClient; import com.volvo.ai.analytic.center.mapper.TmOdsVdqwMessagearchivingMapper; import com.volvo.ai.analytic.center.service.*; @@ -265,7 +266,7 @@ public class CorpusPortraitServiceImpl implements CorpusPortraitService { // TODO 检查是否发了 unionid ， 画像场景 "businessId": "业务ID", // 根据分析不同传不同的值 1、unionId 2、通话ID 3、客流ID 4、试驾ID // huaWeiService.sendEvent(setCloudEvents(aiAnalysisRequestId, text.toJSONString(),"QIWEI"),ltoChannelId); log.info("send mq ，企微语料，画像场景 {}", text); - tmTelephoneCorpusService.sendMq( BusinessTypeEnum.CORPUS_PORTRAIT_QIWEI.getCode(), text.toJSONString()); + tmTelephoneCorpusService.sendMq( CategoryEnum.ENTERPRISE_WECHAT_PORTRAIT.getCode(), text.toJSONString()); aiAnalysisRequestLogsService.saveOrUpdateAiAnalysisRequestLogs(AiAnalysisRequestLogs.builder().aiAnalysisRequestId(execDifyFlow.getString("aiAnalysisRequestId")).businessResponse(text.toJSONString()).build()); } diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java index 5611135..a2eebe9 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java @@ -167,6 +167,7 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl summaryFuture = CompletableFuture.runAsync(() -> { JSONObject execDifyFlow = diFyService.executeDifyFlow(diFyImageReq, BusinessTypeEnum.SMART_ASSISTANT.getCode(), JSONObject.toJSONString(corpusReportDTO), aicorpusTelephone.getAiAnalysisRequestId()); + log.info("runDify execDifyFlow 返回 ,总结场景 ： {}", execDifyFlow); parseDfiyResult(execDifyFlow, aicorpusTelephone.getSourceId(), formattedDateStartTime, aicorpusTelephone.getAiAnalysisRequestId(), BusinessTypeEnum.SMART_ASSISTANT.getCode());