diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiRunDataController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiRunDataController.java index b795af0..54012b0 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiRunDataController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiRunDataController.java @@ -1,22 +1,23 @@ package com.volvo.ai.analytic.center.controller; import com.alibaba.fastjson.JSONObject; -import com.obs.services.model.ObsObject; import com.volvo.ai.analytic.center.feign.DiFyFeign; -import com.volvo.ai.analytic.center.utils.ObsUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; @Slf4j @RestController diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmCorpusReportMapper.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmCorpusReportMapper.java index 20aeb57..a39a08d 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmCorpusReportMapper.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmCorpusReportMapper.java @@ -2,9 +2,7 @@ package com.volvo.ai.analytic.center.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.volvo.ai.analytic.center.entity.TmCorpusReport; -import com.volvo.ai.analytic.center.entity.TmTelephoneCorpus; import org.apache.ibatis.annotations.Mapper; -import org.springframework.stereotype.Repository; /** * @description 电话语料表-同步表 diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwExternalcontactMapper.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwExternalcontactMapper.java index 846f1dc..a1b3ab7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwExternalcontactMapper.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwExternalcontactMapper.java @@ -1,13 +1,8 @@ package com.volvo.ai.analytic.center.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.volvo.ai.analytic.center.dto.corpus.OdsVdqwMessageOTD; import com.volvo.ai.analytic.center.entity.TmOdsVdqwExternalcontact; -import com.volvo.ai.analytic.center.entity.TmOdsVdqwMessagearchiving; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @description 会话存档消息记录表-湖仓同步表 diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwMessagearchivingMapper.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwMessagearchivingMapper.java index 30a6b6b..dcacc2a 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwMessagearchivingMapper.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwMessagearchivingMapper.java @@ -5,7 +5,6 @@ import com.volvo.ai.analytic.center.dto.corpus.OdsVdqwMessageOTD; import com.volvo.ai.analytic.center.entity.TmOdsVdqwMessagearchiving; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import java.util.List; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwWorkuserinfoMapper.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwWorkuserinfoMapper.java index 1cf9822..9b6467a 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwWorkuserinfoMapper.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mapper/TmOdsVdqwWorkuserinfoMapper.java @@ -1,13 +1,8 @@ package com.volvo.ai.analytic.center.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.volvo.ai.analytic.center.dto.corpus.OdsVdqwMessageOTD; -import com.volvo.ai.analytic.center.entity.TmOdsVdqwMessagearchiving; import com.volvo.ai.analytic.center.entity.TmOdsVdqwWorkuserinfo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @description 会话存档消息记录表-湖仓同步表 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 1b22bfc..8970a04 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,6 +1,7 @@ package com.volvo.ai.analytic.center.mq; import com.fasterxml.jackson.databind.ObjectMapper; +import com.volvo.ai.analytic.center.constant.Constant; import com.volvo.ai.analytic.center.dto.corpus.AicorpusTelephoneDTO; import com.volvo.ai.analytic.center.dto.corpus.DisplayDTO; import com.volvo.ai.analytic.center.entity.TmTelephoneCorpus; @@ -36,7 +37,7 @@ public class CorpusProcessKafkaProducer { @KafkaListener(topics = "${spring.kafka.topic}", groupId = "${spring.kafka.group}") public void listen(String message) { try { - log.info("CorpusProcessKafkaConsumer Received message: {}" , message); + log.info("CorpusProcessKafkaProducer Received message: {}" , message); AicorpusTelephoneDTO aicorpusTelephone = objectMapper.readValue(message, AicorpusTelephoneDTO.class); log.info("aicorpusTelephone categoryCode:{}, display: {}" ,aicorpusTelephone.getCategoryCode(), aicorpusTelephone.getDisplay()); @@ -47,11 +48,14 @@ public class CorpusProcessKafkaProducer { tmTelephoneCorpus.setCreateBy("kafka"); tmTelephoneCorpus.setCreateTime(LocalDateTime.now()); - // TODO 只处理dcc的 + // 条件： 只处理dcc的 10s通话时间以上 + log.info("CorpusProcessKafkaProducer getCategoryCode: {}" , tmTelephoneCorpus.getCategoryCode()); + if (Constant.CHANNEL_DCC.equals(tmTelephoneCorpus.getCategoryCode())){ + log.info(" dcc 语料开始处理: {}"); + tmTelephoneCorpusService.saveTelephoneCorpus(tmTelephoneCorpus); + tmTelephoneCorpusService.runTelephoneCorpusDify(aicorpusTelephone); + } - tmTelephoneCorpusService.saveTelephoneCorpus(tmTelephoneCorpus); - - tmTelephoneCorpusService.runTelephoneCorpusDify(aicorpusTelephone); // 在这里可以添加对解析后的对象的进一步处理逻辑 } catch (Exception e) { diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpushIsLikeConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpushIsLikeConsumer.java index f706402..b48d512 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpushIsLikeConsumer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpushIsLikeConsumer.java @@ -9,7 +9,6 @@ import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PostMapping; import java.util.Date; @@ -23,7 +22,6 @@ public class CorpushIsLikeConsumer implements RocketMQListener{ @Autowired private TmCorpusReportService tmCorpusReportService; @Override - @PostMapping public void onMessage(MessageExt messageExt) { log.info("CorpushIsLikeConsumer message: " + messageExt); String message = new String(messageExt.getBody()); diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/DiFyService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/DiFyService.java index 4b6e8f8..d561518 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/DiFyService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/DiFyService.java @@ -2,7 +2,6 @@ package com.volvo.ai.analytic.center.service; import com.alibaba.fastjson.JSONObject; import com.volvo.ai.analytic.center.dto.req.DiFyReq; -import com.volvo.ai.analytic.center.enums.BusinessTypeEnum; public interface DiFyService { diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmOdsVdqwMessagearchivingService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmOdsVdqwMessagearchivingService.java index 3c84187..748f88b 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmOdsVdqwMessagearchivingService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmOdsVdqwMessagearchivingService.java @@ -1,9 +1,7 @@ package com.volvo.ai.analytic.center.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.volvo.ai.analytic.center.dto.corpus.OdsVdqwMessageOTD; import com.volvo.ai.analytic.center.entity.TmOdsVdqwMessagearchiving; -import java.util.*; /** * @description 电话语料表-同步表 * @author BEJSON 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 6471cf3..c39f839 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 @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.volvo.ai.analytic.center.dto.corpus.AicorpusTelephoneDTO; import com.volvo.ai.analytic.center.entity.TmTelephoneCorpus; -import java.util.Map; - /** * @description 电话语料表-同步表 * @author BEJSON diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisErrorsServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisErrorsServiceImpl.java index a7c88e9..94c60a1 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisErrorsServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisErrorsServiceImpl.java @@ -1,7 +1,6 @@ package com.volvo.ai.analytic.center.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.volvo.ai.analytic.center.entity.AiAnalysisErrors; import com.volvo.ai.analytic.center.mapper.AiAnalysisErrorsMapper; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisRequestLogsServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisRequestLogsServiceImpl.java index e86cbbd..1d269c7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisRequestLogsServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/AiAnalysisRequestLogsServiceImpl.java @@ -2,7 +2,6 @@ package com.volvo.ai.analytic.center.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.volvo.ai.analytic.center.entity.AiAnalysisErrors; import com.volvo.ai.analytic.center.entity.AiAnalysisRequestLogs; import com.volvo.ai.analytic.center.mapper.AiAnalysisRequestLogsMapper; import com.volvo.ai.analytic.center.service.AiAnalysisRequestLogsService; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java index 25f4fce..ed632ac 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java @@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java index 8bf4cdf..fcde389 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java @@ -19,7 +19,6 @@ import com.volvo.ai.analytic.center.service.DiffdefeatApproveService; import com.volvo.ai.analytic.center.service.MqMessageRecordService; import com.volvo.ai.analytic.center.utils.AiAnalysisUtils; import lombok.extern.slf4j.Slf4j; -//import org.springframework.amqp.core.AmqpTemplate; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java index d2ddbda..e294887 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmOdsVdqwMessagearchivingServiceImpl.java @@ -38,6 +38,7 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; /** @@ -142,14 +143,15 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl contetnList = tmOdsVdqwMessagearchivingMapper.queryOdsVdqwMessageByFromUserIdAndAcceptUserId(statTime, endTime, Arrays.asList(item.getFromUserId(), item.getAcceptUserId()) ); OdsVdqwMessageOTD maxMsgTimeItem = contetnList.stream() @@ -163,16 +165,27 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl { - + String title = ""; + if(tmOdsVdqwExternalcontact.getUnionId().equals(contentItem.getFromUserId())){ + title="客户:"; + externalcontactCount.addAndGet(1); + }else{ + title="客服:"; + } JSONObject contentJson = JSONObject.parseObject(contentItem.getContent()); String content = contentJson.getString("content"); // 拼接 role 和 text - String chat = contentItem.getFromUserId().concat(":").concat(content); + String chat = title.concat(content); runMaskingRuleInput.setOldStr(chat); String corpusChat = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput); chatList.append(corpusChat).append("\n"); }); + if(externalcontactCount.get()<1){ + log.info("没有客户回复的语料，无需解析"); + return; + } inputMap.put("chat", chatList.toString()); // inputMap.put("model", tmTelephoneCorpusService.getCarModelList()); @@ -233,25 +246,25 @@ public class TmOdsVdqwMessagearchivingServiceImpl extends ServiceImpl userIds){ + private TmOdsVdqwExternalcontact getUnionId(List userIds){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(TmOdsVdqwExternalcontact::getExternalUserId, userIds); queryWrapper.eq(TmOdsVdqwExternalcontact::getIsDeleted, 0); List oldAiAnalysisRequestLogs= tmOdsVdqwExternalcontactMapper.selectList(queryWrapper); if(CollectionUtils.isNotEmpty(oldAiAnalysisRequestLogs)){ - return oldAiAnalysisRequestLogs.get(0).getUnionId(); + return oldAiAnalysisRequestLogs.get(0); } - return ""; + return null; } - private String getUserId(List userIds){ + private TmOdsVdqwWorkuserinfo getUserId(List userIds){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(TmOdsVdqwWorkuserinfo::getUserId, userIds); queryWrapper.eq(TmOdsVdqwWorkuserinfo::getIsDeleted, 0); List tmOdsVdqwWorkuserinfoList = tmOdsVdqwWorkuserinfoMapper.selectList(queryWrapper); if(CollectionUtils.isNotEmpty(tmOdsVdqwWorkuserinfoList)){ - return tmOdsVdqwWorkuserinfoList.get(0).getMiddleUserId().toString(); + return tmOdsVdqwWorkuserinfoList.get(0); } - return ""; + return null; } } \ No newline at end of file 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 2925921..d55ad87 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 @@ -1,6 +1,5 @@ package com.volvo.ai.analytic.center.service.impl; -import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -39,7 +38,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @@ -96,6 +98,11 @@ public class TmTelephoneCorpusServiceImpl extends ServiceImpl #{userId}