diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/KafkaConfig.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/KafkaConfig.java index 3938ec7..8abfe67 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/KafkaConfig.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/KafkaConfig.java @@ -19,7 +19,7 @@ import java.util.Map; public class KafkaConfig { // 第一个Kafka配置 @Bean(name = "dccKafkaTemplate") - public KafkaTemplate dccProducerFactory( + public KafkaTemplate dccKafkaTemplate( @Value("${kafka.dcc.bootstrap-servers}") String bootstrapServers, @Value("${kafka.dcc.producer.key-serializer}") String keySerializer, @Value("${kafka.dcc.producer.value-serializer}") String valueSerializer) { @@ -35,7 +35,7 @@ public class KafkaConfig { // 第二个Kafka配置 @Bean(name = "analyticCenterKafkaTemplate") - public KafkaTemplate analyticCenterProducerFactory( + public KafkaTemplate analyticCenterKafkaTemplate( @Value("${kafka.analyticCenter.bootstrap-servers}") String bootstrapServers, @Value("${kafka.analyticCenter.producer.key-serializer}") String keySerializer, @Value("${kafka.analyticCenter.producer.value-serializer}") String valueSerializer) { diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/NameplateCorpusController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/NameplateCorpusController.java index 7311d0d..979a3df 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/NameplateCorpusController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/NameplateCorpusController.java @@ -27,10 +27,18 @@ public class NameplateCorpusController { private TmNameplateCorpusService tmNameplateCorpusService; @Autowired private AiAnalysisRequestLogsService aiAnalysisRequestLogsService; - @PostMapping("/updateNameplate") + @PostMapping("/update") @ApiOperation(value = "更新dify结果") public ResultMsg updateNameplate(@RequestBody String message) { log.info("updateNameplate message: {}", message); return tmNameplateCorpusService.updateNameplate(message); } + + @PostMapping("/mockInsert") + @ApiOperation(value = "更新dify结果") + public ResultMsg mockInsert(@RequestBody String data) { + log.info("mockInsert: {}", data); + return tmNameplateCorpusService.mockInsert(data); + } + } diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/CorpusFailJob.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/CorpusFailJob.java index 0e5c939..0020ca4 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/CorpusFailJob.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/CorpusFailJob.java @@ -100,7 +100,7 @@ public class CorpusFailJob { queryWrapper.eq(AiAnalysisRequestLogs::getAiAnalysisRequestId, aiAnalysisErrors.getAiAnalysisRequestId()); AiAnalysisRequestLogs oldAiAnalysisRequestLogs = aiAnalysisRequestLogsMapper.selectOne(queryWrapper); - if (null != oldAiAnalysisRequestLogs) { + if (null != oldAiAnalysisRequestLogs && StringUtils.isNotBlank(oldAiAnalysisRequestLogs.getBusinessResponse())) { DiFyReq diFyReq = JSONObject.parseObject(oldAiAnalysisRequestLogs.getDifyRequest(), DiFyReq.class); CorpusReportDTO corpusReportDTO = JSONObject.parseObject(oldAiAnalysisRequestLogs.getBusinessRequest(), CorpusReportDTO.class); Map ltoMap = new HashMap<>(); diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/NameplateKafkaConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/NameplateKafkaConsumer.java index f27ac4d..b082665 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/NameplateKafkaConsumer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/NameplateKafkaConsumer.java @@ -54,16 +54,19 @@ public class NameplateKafkaConsumer { if(StringUtils.isNotEmpty(recordMessages)){ try { NameplateTableKafkaDTO tmNameplateCorpus = JSON.parseObject(recordMessages, NameplateTableKafkaDTO.class); - tmNameplateCorpus.getData().forEach(nameplate -> { - log.info("tmNameplateCorpus customerFlowId: {}",nameplate.getCustomerFlowId()); - tmNameplateCorpusService.processItem(nameplate); - }); + log.info("nameplateKafkaConsumerParseType: {}", tmNameplateCorpus.getType()); + if(tmNameplateCorpus.getType().equals("INSERT")){ + tmNameplateCorpus.getData().forEach(nameplate -> { + log.info("nameplateKafkaConsumerCustomerFlowId: {}",nameplate.getCustomerFlowId()); + tmNameplateCorpusService.processItem(nameplate); + }); + } } catch (Exception e) { - log.error("tmNameplateCorpus 铭牌解析处理出错: {}", e.getMessage()); + log.error("nameplateKafkaConsumer铭牌解析处理出错: {}", e.getMessage()); } } - log.info("tmNameplateCorpus Kafka 消息处理完成,耗时:{}", System.currentTimeMillis() - startTime); + log.info("nameplateKafkaConsumer消息处理完成,耗时:{}", System.currentTimeMillis() - startTime); } diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmNameplateCorpusService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmNameplateCorpusService.java index 3c4cd2c..d76d0b1 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmNameplateCorpusService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/TmNameplateCorpusService.java @@ -23,5 +23,7 @@ public interface TmNameplateCorpusService extends IService { ResultMsg updateNameplate(String message); + ResultMsg mockInsert(String data); + List queryTelephoneCorpusByCustomerFlowId(List customerFlowIds); } \ No newline at end of file diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java index ec72aa7..2a7daf7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmNameplateCorpusServiceImpl.java @@ -7,13 +7,11 @@ import com.volvo.ai.analytic.center.dto.PageDto; import com.volvo.ai.analytic.center.dto.corpus.CorpusReportDTO; import com.volvo.ai.analytic.center.dto.req.DiFyReq; import com.volvo.ai.analytic.center.dto.req.RunMaskingRuleInput; -import com.volvo.ai.analytic.center.entity.AiAnalysisRequestLogs; -import com.volvo.ai.analytic.center.entity.DataMaskingRule; -import com.volvo.ai.analytic.center.entity.TmNameplateCorpus; -import com.volvo.ai.analytic.center.entity.TtNameplateRecord; +import com.volvo.ai.analytic.center.entity.*; import com.volvo.ai.analytic.center.enums.BusinessTypeEnum; import com.volvo.ai.analytic.center.enums.CategoryEnum; import com.volvo.ai.analytic.center.feign.RemoteCarModelClient; +import com.volvo.ai.analytic.center.mapper.AiAnalysisErrorsMapper; import com.volvo.ai.analytic.center.mapper.TmNameplateCorpusMapper; import com.volvo.ai.analytic.center.mapper.TmOdsVdqwMessagearchivingMapper; import com.volvo.ai.analytic.center.mapper.TtNameplateRecordMapper; @@ -60,6 +58,9 @@ public class TmNameplateCorpusServiceImpl extends ServiceImpl tmNameplateCorpusList = tmNameplateCorpusMapper.selectList(queryWrapper); if (CollectionUtils.isNotEmpty(tmNameplateCorpusList)){ sendNameplateLto(difyJson, tmNameplateCorpusList.get(0)); + LambdaQueryWrapper errorQueryWrapper = new LambdaQueryWrapper<>(); + errorQueryWrapper.eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisRequestId); + AiAnalysisErrors oldAiAnalysisErrors = aiAnalysisErrorsMapper.selectOne(errorQueryWrapper); + if (oldAiAnalysisErrors != null) { + oldAiAnalysisErrors.setAiAnalysisErrorHandlingStatus("1"); + aiAnalysisErrorsMapper.update(oldAiAnalysisErrors, errorQueryWrapper); + } } return ResultMsg.ok(); } return ResultMsg.failed(); } - + @Override + public ResultMsg mockInsert(String data) { + if(StringUtils.isNotEmpty(data)){ + TmNameplateCorpus analysisResp = JSONObject.parseObject(data, TmNameplateCorpus.class); + tmNameplateCorpusMapper.insert(analysisResp); + return ResultMsg.ok(analysisResp); + } + return ResultMsg.failed(); + } @Override public List queryTelephoneCorpusByCustomerFlowId(List customerFlowIds) { return tmNameplateCorpusMapper.queryTmNameplateCorpusByCustomerFlowIds(customerFlowIds);