From ca4cfb3b8c78ef2a25bde11ce6026653732b00fd Mon Sep 17 00:00:00 2001 From: lxu75 Date: Thu, 6 Mar 2025 18:43:47 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisRequestLogs.java | 8 ++-- .../impl/MqMessageRecordServiceImpl.java | 45 ++++++++++++++----- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java index 457c93a..f5ba13b 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java @@ -2,13 +2,15 @@ package com.volvo.ai.analytic.center.entity; import com.baomidou.mybatisplus.annotation.*; import com.volvo.common.core.base.BaseEntity; -import lombok.Builder; -import lombok.Data; +import lombok.*; -@Data +@Setter +@Getter @TableName("tt_ai_analysis_request_logs") @Builder +@AllArgsConstructor +@NoArgsConstructor public class AiAnalysisRequestLogs extends BaseEntity { @TableId(value = "id", type = IdType.AUTO) 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..b540f6e 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 @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.volvo.ai.analytic.center.constant.Constant; import com.volvo.ai.analytic.center.dto.req.*; @@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -88,15 +90,8 @@ public class MqMessageRecordServiceImpl extends ServiceImpl { if (contentNode.getNodeType().equals(NodeTypeEnum.IMAGE.getCode())) { //构建图片分析请求对象 - DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); diFyImageWorkFlow.setUrl(contentNode.getNodeContent()); @@ -133,7 +127,10 @@ public class MqMessageRecordServiceImpl extends ServiceImpl().set("dify_request", JSON.toJSONString(difyCommunityTargetDTO)) + .eq("ai_analysis_request_id", aiAnalysisRequestId)); + } + + @Async + protected void syncUpdateDiFyResponse(JSONObject difResult, String aiAnalysisRequestId) { + aiAnalysisRequestLogsMapper.update(new AiAnalysisRequestLogs(), + new UpdateWrapper().set("business_response", difResult) + .eq("ai_analysis_request_id", aiAnalysisRequestId)); + } + + @Async + protected void syncSaveRequestLogs(String message, String aiAnalysisRequestId) { + aiAnalysisRequestLogsMapper.insert(AiAnalysisRequestLogs.builder() + .aiAnalysisRequestId(aiAnalysisRequestId) + .businessRequest(message) + .difyAgentKey(flowId) + .aiAnalysisRequestType(BusinessTypeEnum.COMMUNITYTARGET.getCode()) + .build()); + } + private void processMqSinceType51(MqFormData oldItem, MqMessageRecord curMQMessageRecord) { log.info("processMqSinceType51 辨别数据为分析请求 {}", SubSinceTypeEnum.SINCETYPE51.getCode()); DiffDefeatanAlysis diffDefeatanAlysis = JSON.parseObject(JSON.toJSONString(oldItem.getData()), DiffDefeatanAlysis.class); From d36ded1b3bedf5bc54e0a3557d1c4fcc2ff2ce91 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Thu, 6 Mar 2025 19:07:22 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/job/MessageProcessJob.java | 6 +++--- .../ai/analytic/center/mq/CommunityMessageConsumer.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java index a079214..f47086b 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java @@ -17,13 +17,13 @@ public class MessageProcessJob { /** * 邀约消息推送 */ - @XxlJob("processMessageByTask") + @XxlJob("communityMessageByTask") public ResultMsg processMessageByTask() { try { - log.info("processMessageByTask 开始执行定时任务补偿处理消息"); + log.info("communityMessageByTask 开始执行定时任务补偿处理消息"); mqMessageRecordService.processMessageByTask(); } catch (Exception e) { - log.error("processMessageByTask 定时任务补偿处理消息异常",e.getMessage()); + log.error("communityMessageByTask 定时任务补偿处理消息异常",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/CommunityMessageConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CommunityMessageConsumer.java index e590206..d60bd52 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CommunityMessageConsumer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CommunityMessageConsumer.java @@ -20,7 +20,7 @@ public class CommunityMessageConsumer implements RocketMQListener{ @Override public void onMessage(MessageExt messageExt) { - log.info("Received message: " + messageExt); + log.info("Received 社区舆情分析 message: " + messageExt); mqMessageRecordService.processMessageByMQ(new String(messageExt.getBody())); } } From 2ce086474ddcbaa1cb0ed4a481b2fae584051bbb Mon Sep 17 00:00:00 2001 From: lxu75 Date: Fri, 7 Mar 2025 14:37:15 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/MqMessageRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b540f6e..1f09a48 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 @@ -64,10 +64,10 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Fri, 7 Mar 2025 15:40:57 +0800 Subject: [PATCH 04/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/analytic/center/controller/TestController.java | 10 ++-------- .../analytic/center/service/impl/DiFyServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 1294dfd..4fa4448 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -41,13 +41,7 @@ public class TestController { @Autowired private MqMessageRecordService mqMessageRecordService; - @Value("${dify.user}") - private String user; - - @Value("${dify.flowId}") - private String flowId; - - +/* @PostMapping("/runWorkflows2") @ApiOperation(value = "测试Dify") public ResultMsg runWorkflows2(@RequestBody String contentStr) { @@ -86,7 +80,7 @@ public class TestController { log.info("contentStr {}", contentStr); boolean result = mqMessageRecordService.processMessageByMQ(contentStr); return ResultMsg.ok(result); - } + }*/ @PostMapping("/runWorkflows5") @ApiOperation(value = "补偿处理消息") 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 bef1387..a09185e 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 @@ -26,6 +26,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("user",diFyReq.getUser()); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); + log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); if (data != null && "succeeded".equals(data.get("status"))){ JSONObject outputs = data.getJSONObject("outputs"); From 5b316d34b12e8b4188d3faff0025f4cd6c034a69 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Fri, 7 Mar 2025 16:45:19 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analytic/center/controller/TestController.java | 12 ++++++++++++ .../service/impl/MqMessageRecordServiceImpl.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 4fa4448..8e90664 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -14,6 +14,7 @@ import com.volvo.common.core.util.ResultMsg; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; @@ -41,6 +42,9 @@ public class TestController { @Autowired private MqMessageRecordService mqMessageRecordService; + @Autowired + private RocketMQTemplate rocketMQTemplate; + /* @PostMapping("/runWorkflows2") @ApiOperation(value = "测试Dify") @@ -88,5 +92,13 @@ public class TestController { mqMessageRecordService.processMessageByTask(); return ResultMsg.ok(""); } + + + @PostMapping("/mockMq") + @ApiOperation(value = "补偿处理消息") + public ResultMsg mockMq( String message) { + rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); + return ResultMsg.ok("ok"); + } } 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 1f09a48..06dff77 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 @@ -149,7 +149,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Fri, 7 Mar 2025 16:45:19 +0800 Subject: [PATCH 06/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analytic/center/controller/TestController.java | 12 ++++++++++++ .../service/impl/MqMessageRecordServiceImpl.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 4fa4448..8e90664 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -14,6 +14,7 @@ import com.volvo.common.core.util.ResultMsg; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; @@ -41,6 +42,9 @@ public class TestController { @Autowired private MqMessageRecordService mqMessageRecordService; + @Autowired + private RocketMQTemplate rocketMQTemplate; + /* @PostMapping("/runWorkflows2") @ApiOperation(value = "测试Dify") @@ -88,5 +92,13 @@ public class TestController { mqMessageRecordService.processMessageByTask(); return ResultMsg.ok(""); } + + + @PostMapping("/mockMq") + @ApiOperation(value = "补偿处理消息") + public ResultMsg mockMq( String message) { + rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); + return ResultMsg.ok("ok"); + } } 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 1f09a48..06dff77 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 @@ -149,7 +149,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 15:26:59 +0800 Subject: [PATCH 07/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java | 2 +- .../ai/analytic/center/service/impl/DiFyServiceImpl.java | 2 +- .../center/service/impl/MqMessageRecordServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java index 240b05d..1e8abfb 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java @@ -9,5 +9,5 @@ public class DifyImageWorkFlow { private String type = "image"; - private String url; + private String imageUrl; } 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 a09185e..1eef397 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 @@ -24,7 +24,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("inputs",diFyReq.getInputs()); map.put("response_mode","blocking"); map.put("user",diFyReq.getUser()); - + log.info("请求DiFy入参:{}",diFyReq.getInputs()); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); 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 06dff77..802ac92 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 @@ -104,12 +104,12 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 15:57:53 +0800 Subject: [PATCH 08/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 802ac92..da4fb19 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 @@ -155,7 +155,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 15:57:53 +0800 Subject: [PATCH 09/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 802ac92..da4fb19 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 @@ -155,7 +155,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 17:23:58 +0800 Subject: [PATCH 10/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/analytic/center/service/impl/DiFyServiceImpl.java | 2 +- .../center/service/impl/MqMessageRecordServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 1eef397..d1e232a 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 @@ -24,7 +24,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("inputs",diFyReq.getInputs()); map.put("response_mode","blocking"); map.put("user",diFyReq.getUser()); - log.info("请求DiFy入参:{}",diFyReq.getInputs()); + log.info("请求DiFy入参:{}",map); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); 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 da4fb19..a48c199 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 @@ -109,7 +109,9 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 18:53:58 +0800 Subject: [PATCH 11/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/controller/TestController.java | 55 +++++-------------- .../impl/MqMessageRecordServiceImpl.java | 4 +- 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 8e90664..df57270 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.volvo.ai.analytic.center.dto.req.CallItem; import com.volvo.ai.analytic.center.dto.req.DiFyReq; import com.volvo.ai.analytic.center.dto.req.DiffDefeatanAlysis; +import com.volvo.ai.analytic.center.dto.req.DifyImageWorkFlow; import com.volvo.ai.analytic.center.dto.resp.DiffDefeatAnalyseOutputResult; import com.volvo.ai.analytic.center.feign.DiFyFeign; import com.volvo.ai.analytic.center.service.DiFyService; @@ -45,53 +46,25 @@ public class TestController { @Autowired private RocketMQTemplate rocketMQTemplate; -/* - @PostMapping("/runWorkflows2") + @PostMapping("/runWorkflows") @ApiOperation(value = "测试Dify") public ResultMsg runWorkflows2(@RequestBody String contentStr) { //"（1）语音电话（2024-11-09 12:10:57）客服：哎，哎，姚先生，你好打扰到您了，蹦蹦沃沃赛练呢。客户：喂你好。客服：哎，对对，小明那个昨天看了车不要着急走，今天可有时间到店来接待您试驾感受一下呢。客户：我现在已经开工了，我现在没时间过去啊。客服：好的，那等你忙完这段时间好吧。客户：好的，好的，好的好，再见啊。客服：好，那这边先不打扰您，哎，好，再见。"; - Map record = new HashMap<>(); - record.put("record",contentStr); - log.info("contentStr {}", contentStr); - DiFyReq diFyReq = new DiFyReq(); - diFyReq.setUser(user); - diFyReq.setFlowId(flowId); - diFyReq.setInputs(record); - Object difyResult = diFyService.getDiFyObject(diFyReq); + //构建图片分析请求对象 + DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); + diFyImageWorkFlow.setImageUrl("https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); + + DiFyReq diFyImageReq = new DiFyReq(); + diFyImageReq.setUser("admin"); + diFyImageReq.setFlowId("app-ZcRTduhbcyu9qzXs2GAnXo0v"); + JSONObject imageInputs = new JSONObject(); + imageInputs.put("image", JSON.toJSONString(diFyImageWorkFlow)); + diFyImageReq.setInputs(imageInputs.toJSONString()); + Object difyResult = diFyService.getDiFyObject(diFyImageReq); JSONObject dify = JSONObject.parseObject(difyResult.toString()); - String resultStr = dify.getString("result").replace("\n", "").replaceAll(" ", ""); - return ResultMsg.ok(resultStr); + return ResultMsg.ok(dify); } - @PostMapping("/runWorkflows3") - @ApiOperation(value = "测试Dify") - public ResultMsg runWorkflows3(@RequestBody String contentStr) { - //[{"sessionId":"1","sourceId":"1","audioTime":"2024-11-09 12:10:57","audioBillsec":"10"},{"sessionId":"2","sourceId":"2","audioTime":"2024-11-09 12:11:57","audioBillsec":"20"}] - log.info("contentStr {}", contentStr); - List callList = JSON.parseArray(contentStr, CallItem.class); - DiffDefeatanAlysis input = new DiffDefeatanAlysis(); - input.setCallList(callList); - DiffDefeatAnalyseOutputResult diffDefeatAnalyseOutputResult = mqMessageRecordService.processChatRecord(input); - return ResultMsg.ok(diffDefeatAnalyseOutputResult); - } - - @PostMapping("/runWorkflows4") - @ApiOperation(value = "测试Dify") - public ResultMsg runWorkflows4(@RequestBody String contentStr) { - - //{"formId": "123456789","sinceType": 2,"subSinceType": 51,"data": {"businessId": "123456789","vdqwUserId": "123","vdqwCustomerId": "uuid","defeatTime": "2024-10-27 08:09:09","callList": [{"sessionId": "123456789","sourceId": "123456789","audioTime": "2024-10-27 08:09:09","audioBillsec": 1800}, {"sessionId": "123456789","sourceId": "123456789","audioTime": "2024-10-27 08:09:09","audioBillsec": 1800}]} } - //{"formId": "123456789","sinceType": 2,"subSinceType": 52,"data": {"businessId": "123456789", "approveCode": "10001", "approveResult": "审批通过", "approveOpinion": "" } } - log.info("contentStr {}", contentStr); - boolean result = mqMessageRecordService.processMessageByMQ(contentStr); - return ResultMsg.ok(result); - }*/ - - @PostMapping("/runWorkflows5") - @ApiOperation(value = "补偿处理消息") - public ResultMsg runWorkflows5() { - mqMessageRecordService.processMessageByTask(); - return ResultMsg.ok(""); - } @PostMapping("/mockMq") 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 a48c199..d4fd0b3 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 @@ -110,8 +110,8 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 19:00:01 +0800 Subject: [PATCH 12/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index df57270..6d34b82 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -30,7 +30,7 @@ import java.util.Map; @RestController @Api(tags = "测试类API") -@RequestMapping("/test") +@RequestMapping("/ai-analytic-center") @Slf4j public class TestController { From 6203f26b107504b35161c243ea7bb5e033168d12 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:00:46 +0800 Subject: [PATCH 13/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index df57270..6d34b82 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -30,7 +30,7 @@ import java.util.Map; @RestController @Api(tags = "测试类API") -@RequestMapping("/test") +@RequestMapping("/ai-analytic-center") @Slf4j public class TestController { From 7949c935a267ef29f548723bee8147feec80ab95 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:20:10 +0800 Subject: [PATCH 14/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 6d34b82..d6523ef 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -69,7 +69,7 @@ public class TestController { @PostMapping("/mockMq") @ApiOperation(value = "补偿处理消息") - public ResultMsg mockMq( String message) { + public ResultMsg mockMq(@RequestBody String message) { rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); return ResultMsg.ok("ok"); } From 55dbc1e61865ba105c829992bb15a5bb1728278a Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:33:11 +0800 Subject: [PATCH 15/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index d6523ef..1e79916 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -70,7 +70,7 @@ public class TestController { @PostMapping("/mockMq") @ApiOperation(value = "补偿处理消息") public ResultMsg mockMq(@RequestBody String message) { - rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); + rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", message); return ResultMsg.ok("ok"); } } From c026237e8703d76b1c2162bf82f5f5baea7c658c Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:41:16 +0800 Subject: [PATCH 16/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/analytic/center/controller/TestController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 1e79916..6f26d61 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -50,16 +50,17 @@ public class TestController { @ApiOperation(value = "测试Dify") public ResultMsg runWorkflows2(@RequestBody String contentStr) { //"（1）语音电话（2024-11-09 12:10:57）客服：哎，哎，姚先生，你好打扰到您了，蹦蹦沃沃赛练呢。客户：喂你好。客服：哎，对对，小明那个昨天看了车不要着急走，今天可有时间到店来接待您试驾感受一下呢。客户：我现在已经开工了，我现在没时间过去啊。客服：好的，那等你忙完这段时间好吧。客户：好的，好的，好的好，再见啊。客服：好，那这边先不打扰您，哎，好，再见。"; - //构建图片分析请求对象 - DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); - diFyImageWorkFlow.setImageUrl("https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); - + JSONObject mbJsonp = new JSONObject(); + mbJsonp.put("type", "image"); + mbJsonp.put("transfer_method", "remote_url"); + mbJsonp.put("imageUrl", "https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); DiFyReq diFyImageReq = new DiFyReq(); diFyImageReq.setUser("admin"); diFyImageReq.setFlowId("app-ZcRTduhbcyu9qzXs2GAnXo0v"); JSONObject imageInputs = new JSONObject(); - imageInputs.put("image", JSON.toJSONString(diFyImageWorkFlow)); + imageInputs.put("image", mbJsonp); diFyImageReq.setInputs(imageInputs.toJSONString()); + log.info("difyImageReq:{}", JSON.toJSONString(diFyImageReq)); Object difyResult = diFyService.getDiFyObject(diFyImageReq); JSONObject dify = JSONObject.parseObject(difyResult.toString()); return ResultMsg.ok(dify); From d3e5a97ebd488155a2e6db403b744e2014c280b2 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:57:47 +0800 Subject: [PATCH 17/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a416a25..e8d88fe 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 @@ -39,7 +39,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("inputs",diFyReq.getInputs()); map.put("response_mode","blocking"); map.put("user",diFyReq.getUser()); - log.info("请求DiFy入参:{}",map); + log.info("请求DiFy入参:{}",JSON.toJSONString(map)); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); From d1e6020820a483fc356d6f37713ef38d4e2b0172 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:59:37 +0800 Subject: [PATCH 18/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java | 2 +- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java index 1e8abfb..240b05d 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java @@ -9,5 +9,5 @@ public class DifyImageWorkFlow { private String type = "image"; - private String imageUrl; + private String url; } 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 d4fd0b3..381c927 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 @@ -104,7 +104,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 19:20:10 +0800 Subject: [PATCH 19/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 6d34b82..d6523ef 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -69,7 +69,7 @@ public class TestController { @PostMapping("/mockMq") @ApiOperation(value = "补偿处理消息") - public ResultMsg mockMq( String message) { + public ResultMsg mockMq(@RequestBody String message) { rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); return ResultMsg.ok("ok"); } From 79947f450f9935fd5f4af614d0f7407b0711e8c7 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:33:11 +0800 Subject: [PATCH 20/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/controller/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index d6523ef..1e79916 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -70,7 +70,7 @@ public class TestController { @PostMapping("/mockMq") @ApiOperation(value = "补偿处理消息") public ResultMsg mockMq(@RequestBody String message) { - rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", JSON.toJSONString(message)); + rocketMQTemplate.syncSend("COMMUNITY_POST_TO_AI_TOPIC", message); return ResultMsg.ok("ok"); } } From 9e5b7c6995751e895998e381ea367a34caf5a94c Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:41:16 +0800 Subject: [PATCH 21/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/analytic/center/controller/TestController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 1e79916..6f26d61 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -50,16 +50,17 @@ public class TestController { @ApiOperation(value = "测试Dify") public ResultMsg runWorkflows2(@RequestBody String contentStr) { //"（1）语音电话（2024-11-09 12:10:57）客服：哎，哎，姚先生，你好打扰到您了，蹦蹦沃沃赛练呢。客户：喂你好。客服：哎，对对，小明那个昨天看了车不要着急走，今天可有时间到店来接待您试驾感受一下呢。客户：我现在已经开工了，我现在没时间过去啊。客服：好的，那等你忙完这段时间好吧。客户：好的，好的，好的好，再见啊。客服：好，那这边先不打扰您，哎，好，再见。"; - //构建图片分析请求对象 - DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); - diFyImageWorkFlow.setImageUrl("https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); - + JSONObject mbJsonp = new JSONObject(); + mbJsonp.put("type", "image"); + mbJsonp.put("transfer_method", "remote_url"); + mbJsonp.put("imageUrl", "https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); DiFyReq diFyImageReq = new DiFyReq(); diFyImageReq.setUser("admin"); diFyImageReq.setFlowId("app-ZcRTduhbcyu9qzXs2GAnXo0v"); JSONObject imageInputs = new JSONObject(); - imageInputs.put("image", JSON.toJSONString(diFyImageWorkFlow)); + imageInputs.put("image", mbJsonp); diFyImageReq.setInputs(imageInputs.toJSONString()); + log.info("difyImageReq:{}", JSON.toJSONString(diFyImageReq)); Object difyResult = diFyService.getDiFyObject(diFyImageReq); JSONObject dify = JSONObject.parseObject(difyResult.toString()); return ResultMsg.ok(dify); From dffb097723fe410060fdc5149aeb98324c73596c Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:57:47 +0800 Subject: [PATCH 22/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d1e232a..35f6ba5 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 @@ -24,7 +24,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("inputs",diFyReq.getInputs()); map.put("response_mode","blocking"); map.put("user",diFyReq.getUser()); - log.info("请求DiFy入参:{}",map); + log.info("请求DiFy入参:{}",JSON.toJSONString(map)); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); From e27c66da8474af746ac246bb2f40589969969ddb Mon Sep 17 00:00:00 2001 From: lxu75 Date: Mon, 10 Mar 2025 19:59:37 +0800 Subject: [PATCH 23/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java | 2 +- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java index 1e8abfb..240b05d 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/req/DifyImageWorkFlow.java @@ -9,5 +9,5 @@ public class DifyImageWorkFlow { private String type = "image"; - private String imageUrl; + private String url; } 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 d4fd0b3..381c927 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 @@ -104,7 +104,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 20:15:10 +0800 Subject: [PATCH 24/43] =?UTF-8?q?fix=20=E8=88=86=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9B=BE=E7=89=87=E5=88=86=E6=9E=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volvo/ai/analytic/center/service/impl/DiFyServiceImpl.java | 3 ++- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 35f6ba5..d9c7471 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 @@ -1,5 +1,6 @@ package com.volvo.ai.analytic.center.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.volvo.ai.analytic.center.dto.req.DiFyReq; import com.volvo.ai.analytic.center.feign.DiFyFeign; @@ -24,7 +25,7 @@ public class DiFyServiceImpl implements DiFyService{ map.put("inputs",diFyReq.getInputs()); map.put("response_mode","blocking"); map.put("user",diFyReq.getUser()); - log.info("请求DiFy入参:{}",JSON.toJSONString(map)); + log.info("请求DiFy入参:{}", JSON.toJSONString(map)); JSONObject difyResult = diFyFeign.runWorkflows("Bearer "+diFyReq.getFlowId(),map); log.info("请求DiFy响应结果:{}",difyResult.toJSONString()); JSONObject data = difyResult.getJSONObject("data"); 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 381c927..99af721 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 @@ -111,7 +111,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Mon, 10 Mar 2025 20:23:28 +0800 Subject: [PATCH 25/43] fix --- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 381c927..99af721 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 @@ -111,7 +111,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Tue, 11 Mar 2025 11:17:31 +0800 Subject: [PATCH 26/43] fix bug --- .../center/service/impl/MqMessageRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 99af721..63798ee 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 @@ -110,7 +110,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Wed, 12 Mar 2025 10:08:49 +0800 Subject: [PATCH 27/43] =?UTF-8?q?log=E8=A1=A8=E8=B0=83=E6=95=B4=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisRequestLogs.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java index a6a4ac6..0475193 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.*; import com.volvo.common.core.base.BaseEntity; import lombok.*; +import java.time.LocalDateTime; +import java.util.Date; + @Setter @Getter @@ -11,7 +14,7 @@ import lombok.*; @Builder @AllArgsConstructor @NoArgsConstructor -public class AiAnalysisRequestLogs extends BaseEntity { +public class AiAnalysisRequestLogs { @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -48,4 +51,27 @@ public class AiAnalysisRequestLogs extends BaseEntity { @Version private Integer versions; + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; } From fc75e7af8f4d757d68f4e7873e06f1baeefcde05 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Tue, 11 Mar 2025 15:19:49 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analytic/center/dto/resp/DifyCommunityTargetResult.java | 4 ++++ .../ai/analytic/center/entity/AiAnalysisRequestLogs.java | 3 --- .../center/service/impl/MqMessageRecordServiceImpl.java | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/DifyCommunityTargetResult.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/DifyCommunityTargetResult.java index ceb0aad..0906cf1 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/DifyCommunityTargetResult.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/dto/resp/DifyCommunityTargetResult.java @@ -10,4 +10,8 @@ public class DifyCommunityTargetResult { private String commentAnswer; private String targetType; + + private String keyWords; + + private String targetTag; } diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java index 0475193..eb42f09 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java @@ -31,9 +31,6 @@ public class AiAnalysisRequestLogs { @TableField("dify_request") private String difyRequest; // JSON 字符串 - @TableField("business_response") - private String businessResponse; // JSON 字符串 - @TableField("dify_response") private String difyResponse; 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 63798ee..ba2b2ba 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 @@ -146,10 +146,14 @@ public class MqMessageRecordServiceImpl extends ServiceImpl().set("business_response", difResult) + new UpdateWrapper().set("dify_response", difResult) .eq("ai_analysis_request_id", aiAnalysisRequestId)); } From 0e3de9db246bdb48e20ce9589e01e78136a673ea Mon Sep 17 00:00:00 2001 From: lxu75 Date: Tue, 11 Mar 2025 16:46:12 +0800 Subject: [PATCH 29/43] =?UTF-8?q?log=E8=A1=A8=E8=AE=B0=E5=BD=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/MqMessageRecordServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ba2b2ba..b2d3bd7 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 @@ -123,7 +123,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl NodeTypeEnum.TEXT.getCode().equals(contentNode.getNodeType())) .map(CommunityTargetDTO.ContentNode::getNodeContent) - .collect(Collectors.joining("")); + .collect(Collectors.joining(" ")); //构建舆情分析请求对象 DifyCommunityTargetDTO difyCommunityTargetDTO = new DifyCommunityTargetDTO(); @@ -161,7 +161,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl().set("dify_response", difResult) + new UpdateWrapper().set("dify_response", difResult.toJSONString()) .eq("ai_analysis_request_id", aiAnalysisRequestId)); } From 2fef988235e1b0c5e45e9be91f7f927e234b0497 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Wed, 12 Mar 2025 10:08:49 +0800 Subject: [PATCH 30/43] =?UTF-8?q?log=E8=A1=A8=E8=B0=83=E6=95=B4=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisRequestLogs.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java index eb42f09..424f367 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisRequestLogs.java @@ -1,15 +1,16 @@ package com.volvo.ai.analytic.center.entity; import com.baomidou.mybatisplus.annotation.*; -import com.volvo.common.core.base.BaseEntity; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; -import java.time.LocalDateTime; import java.util.Date; -@Setter -@Getter + +@Data @TableName("tt_ai_analysis_request_logs") @Builder @AllArgsConstructor @@ -51,24 +52,24 @@ public class AiAnalysisRequestLogs { /** * 创建者 */ - @TableField(fill = FieldFill.INSERT) + @TableField("create_by") private String createBy; /** * 创建时间 */ - @TableField(fill = FieldFill.INSERT) + @TableField("create_time") private Date createTime; /** * 更新者 */ - @TableField(fill = FieldFill.INSERT_UPDATE) + @TableField("update_by") private String updateBy; /** * 更新时间 */ - @TableField(fill = FieldFill.INSERT_UPDATE) + @TableField("update_time") private Date updateTime; } From 5da4701e6151f01e010fc50f9583a561dd8f71de Mon Sep 17 00:00:00 2001 From: lxu75 Date: Wed, 12 Mar 2025 14:01:25 +0800 Subject: [PATCH 31/43] =?UTF-8?q?=E8=84=B1=E6=95=8F=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/service/impl/MqMessageRecordServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 b2d3bd7..99d25f3 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 @@ -137,6 +137,11 @@ public class MqMessageRecordServiceImpl extends ServiceImpl maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); + + RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); + runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); + diFyReq.setInputs(difyCommunityTargetDTO); //调用舆情文本分析dify工作流 difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); From 0abb7ef7e7848693aa91fbade7d63e0ea2db6723 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Wed, 12 Mar 2025 14:05:35 +0800 Subject: [PATCH 32/43] =?UTF-8?q?=E8=84=B1=E6=95=8F=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MqMessageRecordServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 99d25f3..bb65d68 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 @@ -129,7 +129,13 @@ public class MqMessageRecordServiceImpl extends ServiceImpl maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); + RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); + runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); + runMaskingRuleInput.setOldStr(textContent + sb); + String corpusChat = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput); + difyCommunityTargetDTO.setTargetContent(corpusChat); //根据aiAnalysisRequestId更新请求日志表的difyRequest字段 syncUpdateDiFyRequest(difyCommunityTargetDTO, aiAnalysisRequestId); @@ -137,11 +143,6 @@ public class MqMessageRecordServiceImpl extends ServiceImpl maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); - - RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); - runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); - diFyReq.setInputs(difyCommunityTargetDTO); //调用舆情文本分析dify工作流 difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); From 8bbc896118992e8b44defc32c53b6daec118653c Mon Sep 17 00:00:00 2001 From: lxu75 Date: Wed, 12 Mar 2025 15:29:39 +0800 Subject: [PATCH 33/43] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=88=86=E6=83=85=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisErrors.java | 3 +++ .../analytic/center/job/MessageProcessJob.java | 2 +- .../center/service/MqMessageRecordService.java | 5 +++++ .../impl/MqMessageRecordServiceImpl.java | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java index a643b3d..01c3799 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java @@ -18,6 +18,9 @@ public class AiAnalysisErrors extends BaseEntity { @TableField("ai_analysis_request_id") private String aiAnalysisRequestId; + @TableField("ai_analysis_request_type") + private String aiAnalysisRequestType; + @TableField("dify_response") private String difyResponse; // JSON 字符串 diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java index f47086b..270dd6f 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/job/MessageProcessJob.java @@ -21,7 +21,7 @@ public class MessageProcessJob { public ResultMsg processMessageByTask() { try { log.info("communityMessageByTask 开始执行定时任务补偿处理消息"); - mqMessageRecordService.processMessageByTask(); + mqMessageRecordService.communityMessageByTask(); } catch (Exception e) { log.error("communityMessageByTask 定时任务补偿处理消息异常",e.getMessage()); throw new RuntimeException(e); diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/MqMessageRecordService.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/MqMessageRecordService.java index 7613500..ac3900a 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/MqMessageRecordService.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/MqMessageRecordService.java @@ -16,4 +16,9 @@ public interface MqMessageRecordService extends IService { //定时任务补偿处理消息 void processMessageByTask(); + + //定时任务补偿处理消息 + void communityMessageByTask(); } + + 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 bb65d68..1e4a54a 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 @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.volvo.ai.analytic.center.constant.Constant; @@ -173,6 +175,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl aiAnalysisErrors = aiAnalysisErrorsMapper.selectList(new LambdaQueryWrapper() + .eq(AiAnalysisErrors::getAiAnalysisRequestType, BusinessTypeEnum.COMMUNITYTARGET.getCode()) + .eq(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "0") + .lt(AiAnalysisErrors::getRetryCount, 4)); + + } + private String getUserStatus(String oldStr) { if (Objects.equals(MessageConvertEnum.CONFIRMED.getCode(), oldStr)) { return MessageConvertEnum.CONFIRMED.getMessage(); From adc3b42cb25ea3d382dbd06e5e7e83d4339e2138 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Wed, 12 Mar 2025 16:56:31 +0800 Subject: [PATCH 34/43] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=88=86=E6=83=85=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisErrors.java | 4 + .../impl/MqMessageRecordServiceImpl.java | 87 +++++++++++++------ 2 files changed, 66 insertions(+), 25 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java index 01c3799..0d2ff85 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java @@ -2,13 +2,17 @@ package com.volvo.ai.analytic.center.entity; import com.baomidou.mybatisplus.annotation.*; import com.volvo.common.core.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; @Data @Builder +@AllArgsConstructor +@NoArgsConstructor @TableName("tt_ai_analysis_errors") public class AiAnalysisErrors extends BaseEntity { 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 1e4a54a..00d03d9 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 @@ -148,26 +148,10 @@ public class MqMessageRecordServiceImpl extends ServiceImpl aiAnalysisErrors = aiAnalysisErrorsMapper.selectList(new LambdaQueryWrapper() - .eq(AiAnalysisErrors::getAiAnalysisRequestType, BusinessTypeEnum.COMMUNITYTARGET.getCode()) - .eq(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "0") - .lt(AiAnalysisErrors::getRetryCount, 4)); + try { + //捞取异常表中属于社区的异常数据 + List aiAnalysisErrors = aiAnalysisErrorsMapper.selectList(new LambdaQueryWrapper() + .eq(AiAnalysisErrors::getAiAnalysisRequestType, BusinessTypeEnum.COMMUNITYTARGET.getCode()) + .eq(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "0") + .lt(AiAnalysisErrors::getRetryCount, 4)); + if (aiAnalysisErrors != null && aiAnalysisErrors.size() > 0) { + //根据ai_analysis_request_id获取AiAnalysisRequestLogs表中的对应的dify_request字段 + for (AiAnalysisErrors aiAnalysisError : aiAnalysisErrors) { + AiAnalysisRequestLogs aiAnalysisRequestLogs = aiAnalysisRequestLogsMapper.selectOne(new LambdaQueryWrapper() + .eq(AiAnalysisRequestLogs::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId())); + if (aiAnalysisRequestLogs != null) { + //获取dify_request字段 + String difyRequest = aiAnalysisRequestLogs.getDifyRequest(); + if (StringUtils.isNotEmpty(difyRequest)) { + //调用dify接口 + DiFyReq diFyReq = new DiFyReq(); + diFyReq.setUser(user); + diFyReq.setFlowId(flowId); + diFyReq.setInputs(JSONObject.parseObject(difyRequest)); + JSONObject difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); + this.dueCommunityDifyResponse(difResult); + } + //根据ai_analysis_request_id更新ai_analysis_errors表中的retry_count字段+1,更新status字段为1 + aiAnalysisErrorsMapper.update(new AiAnalysisErrors(), new LambdaUpdateWrapper() + .eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId()) + .set(AiAnalysisErrors::getRetryCount, aiAnalysisError.getRetryCount() + 1) + .set(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "1")); + } + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } } private String getUserStatus(String oldStr) { From 4cf0751938d09ff4d591b978a258d4c4f76ec43d Mon Sep 17 00:00:00 2001 From: lxu75 Date: Thu, 13 Mar 2025 17:20:08 +0800 Subject: [PATCH 35/43] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=88=86=E6=83=85=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MqMessageRecordServiceImpl.java | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) 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 00d03d9..21c1501 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 @@ -543,31 +543,41 @@ public class MqMessageRecordServiceImpl extends ServiceImpl 0) { //根据ai_analysis_request_id获取AiAnalysisRequestLogs表中的对应的dify_request字段 for (AiAnalysisErrors aiAnalysisError : aiAnalysisErrors) { - AiAnalysisRequestLogs aiAnalysisRequestLogs = aiAnalysisRequestLogsMapper.selectOne(new LambdaQueryWrapper() - .eq(AiAnalysisRequestLogs::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId())); - if (aiAnalysisRequestLogs != null) { - //获取dify_request字段 - String difyRequest = aiAnalysisRequestLogs.getDifyRequest(); - if (StringUtils.isNotEmpty(difyRequest)) { - //调用dify接口 - DiFyReq diFyReq = new DiFyReq(); - diFyReq.setUser(user); - diFyReq.setFlowId(flowId); - diFyReq.setInputs(JSONObject.parseObject(difyRequest)); - JSONObject difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); - this.dueCommunityDifyResponse(difResult); + try { + AiAnalysisRequestLogs aiAnalysisRequestLogs = aiAnalysisRequestLogsMapper.selectOne(new LambdaQueryWrapper() + .eq(AiAnalysisRequestLogs::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId())); + if (aiAnalysisRequestLogs != null) { + //获取dify_request字段 + String difyRequest = aiAnalysisRequestLogs.getDifyRequest(); + if (StringUtils.isNotEmpty(difyRequest)) { + //调用dify接口 + DiFyReq diFyReq = new DiFyReq(); + diFyReq.setUser(user); + diFyReq.setFlowId(flowId); + diFyReq.setInputs(JSONObject.parseObject(difyRequest)); + JSONObject difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); + this.dueCommunityDifyResponse(difResult); + //根据ai_analysis_request_id更新ai_analysis_errors表中的retry_count字段+1,更新status字段为1 + aiAnalysisErrorsMapper.update(new AiAnalysisErrors(), new LambdaUpdateWrapper() + .eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId()) + .set(AiAnalysisErrors::getRetryCount, aiAnalysisError.getRetryCount() + 1) + .set(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "1")); + }else{ + aiAnalysisErrorsMapper.update(new AiAnalysisErrors(), new LambdaUpdateWrapper() + .eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId()) + .set(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "2")); + } } - //根据ai_analysis_request_id更新ai_analysis_errors表中的retry_count字段+1,更新status字段为1 + } catch (Exception e) { + log.error("补偿社区消息,AIID:{},异常:{}",aiAnalysisError.getAiAnalysisRequestId(), e); aiAnalysisErrorsMapper.update(new AiAnalysisErrors(), new LambdaUpdateWrapper() .eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId()) - .set(AiAnalysisErrors::getRetryCount, aiAnalysisError.getRetryCount() + 1) - .set(AiAnalysisErrors::getAiAnalysisErrorHandlingStatus, "1")); - + .set(AiAnalysisErrors::getRetryCount, aiAnalysisError.getRetryCount() + 1)); } } } } catch (Exception e) { - throw new RuntimeException(e); + log.error("处理社区异常消息异常:{}", e); } } From d5fdc77ced99372d9444adae7428761616a64d4f Mon Sep 17 00:00:00 2001 From: lxu75 Date: Fri, 14 Mar 2025 17:48:04 +0800 Subject: [PATCH 36/43] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=88=86=E6=83=85=E5=BC=82=E5=B8=B8=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=B5=81=E7=A8=8B=E8=A1=A5=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MqMessageRecordServiceImpl.java | 110 +++++++++++++----- 1 file changed, 79 insertions(+), 31 deletions(-) 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 21c1501..d88283c 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 @@ -101,26 +101,8 @@ public class MqMessageRecordServiceImpl extends ServiceImpl NodeTypeEnum.IMAGE.getCode().equals(contentNode.getNodeType())); //如果存在图片节点，则先处理图片节点 StringBuilder sb = new StringBuilder(); - if (hasImageNodeType) { - communityTargetDTO.getContent().forEach(contentNode -> { - if (contentNode.getNodeType().equals(NodeTypeEnum.IMAGE.getCode())) { - //构建图片分析请求对象 - DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); - diFyImageWorkFlow.setUrl(contentNode.getNodeContent()); + processingImageInfo(hasImageNodeType, communityTargetDTO, sb); - DiFyReq diFyImageReq = new DiFyReq(); - diFyImageReq.setUser(user); - diFyImageReq.setFlowId(imageFlowId); - JSONObject imageInputs = new JSONObject(); - imageInputs.put("image", diFyImageWorkFlow); - diFyImageReq.setInputs(imageInputs); - - //调用dify图片分析workflow - JSONObject difImageResult = (JSONObject) diFyService.getDiFyObject(diFyImageReq); - sb.append(difImageResult.get("text")); - } - }); - } String textContent = Optional.ofNullable(communityTargetDTO.getContent()) .orElse(Collections.emptyList()).stream() .filter(contentNode -> NodeTypeEnum.TEXT.getCode().equals(contentNode.getNodeType())) @@ -132,12 +114,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); - RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); - runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); - runMaskingRuleInput.setOldStr(textContent + sb); - String corpusChat = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput); - difyCommunityTargetDTO.setTargetContent(corpusChat); + dataMasking(textContent, sb, difyCommunityTargetDTO); //根据aiAnalysisRequestId更新请求日志表的difyRequest字段 syncUpdateDiFyRequest(difyCommunityTargetDTO, aiAnalysisRequestId); @@ -149,7 +126,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); + RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); + runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); + runMaskingRuleInput.setOldStr(textContent + sb); + String corpusChat = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput); + difyCommunityTargetDTO.setTargetContent(corpusChat); + } + + /** + * 处理图片信息 + * @param hasImageNodeType + * @param communityTargetDTO + * @param sb + */ + private void processingImageInfo(boolean hasImageNodeType, CommunityTargetDTO communityTargetDTO, StringBuilder sb) { + if (hasImageNodeType) { + communityTargetDTO.getContent().forEach(contentNode -> { + if (contentNode.getNodeType().equals(NodeTypeEnum.IMAGE.getCode())) { + //构建图片分析请求对象 + DifyImageWorkFlow diFyImageWorkFlow = new DifyImageWorkFlow(); + diFyImageWorkFlow.setUrl(contentNode.getNodeContent()); + + DiFyReq diFyImageReq = new DiFyReq(); + diFyImageReq.setUser(user); + diFyImageReq.setFlowId(imageFlowId); + JSONObject imageInputs = new JSONObject(); + imageInputs.put("image", diFyImageWorkFlow); + diFyImageReq.setInputs(imageInputs); + + //调用dify图片分析workflow + JSONObject difImageResult = (JSONObject) diFyService.getDiFyObject(diFyImageReq); + sb.append(difImageResult.get("text")); + } + }); + } + } + /** * 处理dify返回结果 * @param difResult */ - private void dueCommunityDifyResponse(JSONObject difResult) { + private void processingCommunityDifyResponse(JSONObject difResult) { if (difResult != null) { DifyCommunityTargetResult difyCommunityTargetResult = new DifyCommunityTargetResult(); String targetId = difResult.getString("targetId"); @@ -549,14 +570,41 @@ public class MqMessageRecordServiceImpl extends ServiceImpl NodeTypeEnum.IMAGE.getCode().equals(contentNode.getNodeType())); + //如果存在图片节点，则先处理图片节点 + StringBuilder sb = new StringBuilder(); + processingImageInfo(hasImageNodeType, communityTargetDTO, sb); + + String textContent = Optional.ofNullable(communityTargetDTO.getContent()) + .orElse(Collections.emptyList()).stream() + .filter(contentNode -> NodeTypeEnum.TEXT.getCode().equals(contentNode.getNodeType())) + .map(CommunityTargetDTO.ContentNode::getNodeContent) + .collect(Collectors.joining(" ")); + + //构建舆情分析请求对象 + DifyCommunityTargetDTO difyCommunityTargetDTO = new DifyCommunityTargetDTO(); + difyCommunityTargetDTO.setTargetId(communityTargetDTO.getTargetId()); + difyCommunityTargetDTO.setTargetType(communityTargetDTO.getTargetType()); + //脱敏处理 + dataMasking(textContent, sb, difyCommunityTargetDTO); + + //根据aiAnalysisRequestId更新请求日志表的difyRequest字段 + syncUpdateDiFyRequest(difyCommunityTargetDTO, aiAnalysisError.getAiAnalysisRequestId()); + DiFyReq diFyReq = new DiFyReq(); diFyReq.setUser(user); diFyReq.setFlowId(flowId); - diFyReq.setInputs(JSONObject.parseObject(difyRequest)); - JSONObject difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); - this.dueCommunityDifyResponse(difResult); + diFyReq.setInputs(difyCommunityTargetDTO); + //调用舆情文本分析dify工作流 + JSONObject difResult = (JSONObject) diFyService.getDiFyObject(diFyReq); + //处理结果 + processingCommunityDifyResponse(difResult); + //根据ai_analysis_request_id更新ai_analysis_errors表中的retry_count字段+1,更新status字段为1 aiAnalysisErrorsMapper.update(new AiAnalysisErrors(), new LambdaUpdateWrapper() .eq(AiAnalysisErrors::getAiAnalysisRequestId, aiAnalysisError.getAiAnalysisRequestId()) From d7a7f680e82d3a321239769f55408f4339590623 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Fri, 14 Mar 2025 18:27:40 +0800 Subject: [PATCH 37/43] =?UTF-8?q?fix=20=E5=BC=82=E5=B8=B8=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/entity/AiAnalysisErrors.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java index 0d2ff85..9774779 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/AiAnalysisErrors.java @@ -8,13 +8,14 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; +import java.util.Date; @Data @Builder @AllArgsConstructor @NoArgsConstructor @TableName("tt_ai_analysis_errors") -public class AiAnalysisErrors extends BaseEntity { +public class AiAnalysisErrors { @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -47,4 +48,28 @@ public class AiAnalysisErrors extends BaseEntity { @TableField("versions") @Version private Integer versions; + + /** + * 创建者 + */ + @TableField("create_by") + private String createBy; + + /** + * 创建时间 + */ + @TableField("create_time") + private Date createTime; + + /** + * 更新者 + */ + @TableField("update_by") + private String updateBy; + + /** + * 更新时间 + */ + @TableField("update_time") + private Date updateTime; } From 594688b099d1c3f6a4ad9bbf896eb6ab48509fc3 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Fri, 14 Mar 2025 18:38:12 +0800 Subject: [PATCH 38/43] fix bug --- .../center/service/impl/MqMessageRecordServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 d88283c..8e24e9a 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 @@ -569,9 +569,8 @@ public class MqMessageRecordServiceImpl extends ServiceImpl Date: Tue, 18 Mar 2025 14:36:45 +0800 Subject: [PATCH 39/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=B8=8A=E7=BA=BF=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AiCompareController.java | 26 -------- .../controller/AiImageCompareController.java | 63 ------------------- .../controller/DataMaskingController.java | 46 -------------- .../center/controller/TestController.java | 29 --------- .../center/mq/CorpusProcessKafkaConsumer.java | 6 +- 5 files changed, 5 insertions(+), 165 deletions(-) delete mode 100644 ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiCompareController.java delete mode 100644 ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiImageCompareController.java delete mode 100644 ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/DataMaskingController.java diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiCompareController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiCompareController.java deleted file mode 100644 index f0a8c3f..0000000 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiCompareController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.volvo.ai.analytic.center.controller; - -import com.volvo.ai.analytic.center.exception.BizException; -import com.volvo.ai.analytic.center.service.impl.DeepSeekServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/v1") -public class AiCompareController { - - @Autowired - private DeepSeekServiceImpl deepSeekService; - - @GetMapping("/chat1") - public String chat1( @RequestParam(value = "source") String source,@RequestParam(value = "target") String tag ) { - try { - return deepSeekService.chat(source, tag); - } catch (Exception e) { - throw new BizException(e.getMessage()); - } - } -} diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiImageCompareController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiImageCompareController.java deleted file mode 100644 index 2cbd2d8..0000000 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/AiImageCompareController.java +++ /dev/null @@ -1,63 +0,0 @@ -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.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.*; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -@RestController -@RequestMapping("/dms/run") -public class AiImageCompareController { - - @Autowired - private DiFyFeign diFyFeign; - - @PostMapping("/fileUpload") - public String fileUpload(@RequestHeader(value = "Authorization") String authorization, @RequestBody String filePath) throws IOException { - - JSONObject jsonObjectResult; - try { - ObsObject obsObject = ObsUtil.downloadFile(filePath); - InputStream inputStream = obsObject.getObjectContent(); - MultipartFile file = ObsUtil.getMultipartFile(inputStream, ObsUtil.getFilenameByUrl(filePath)); - JSONObject jsonObjectResult1 = diFyFeign.fileUpload(authorization,file); - ObsObject obsObjectDoc = ObsUtil.downloadFile("file_test/business.docx"); - InputStream inputStreamDoc = obsObjectDoc.getObjectContent(); - MultipartFile fileDoc = ObsUtil.getMultipartFile(inputStreamDoc, ObsUtil.getFilenameByUrl("file_test/business.docx")); - JSONObject jsonObjectResult2 = diFyFeign.fileUpload(authorization,fileDoc); - JSONObject tpJSon = new JSONObject(); - tpJSon.put("type","image"); - tpJSon.put("transfer_method","local_file"); - tpJSon.put("upload_file_id",jsonObjectResult1.get("id")); - JSONObject mbJsonp = new JSONObject(); - mbJsonp.put("type","document"); - mbJsonp.put("transfer_method","local_file"); - mbJsonp.put("upload_file_id",jsonObjectResult2.get("id")); - Map tpMpMap = new HashMap<>(); - tpMpMap.put("tp",tpJSon); - tpMpMap.put("mb",mbJsonp); - Map reqMap = new HashMap<>(); - reqMap.put("inputs",tpMpMap); - reqMap.put("response_mode","blocking"); - reqMap.put("user","streaming232"); - JSONObject runResultJson = diFyFeign.runWorkflows(authorization,reqMap); - System.out.println("runResultJson:"+runResultJson); - return runResultJson.toJSONString(); - } catch (Exception e) { - log.error("error:{}",e); - } - - return ""; - } - - -} diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/DataMaskingController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/DataMaskingController.java deleted file mode 100644 index 486eb6a..0000000 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/DataMaskingController.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.volvo.ai.analytic.center.controller; - -import com.volvo.ai.analytic.center.constant.Constant; -import com.volvo.ai.analytic.center.dto.req.RunMaskingRuleInput; -import com.volvo.ai.analytic.center.entity.DataMaskingRule; -import com.volvo.ai.analytic.center.service.DataMaskingRuleService; -import com.volvo.common.core.util.ResultMsg; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@Api(tags = "ai脱敏类API") -@RequestMapping("/dataMasking") -@Slf4j -public class DataMaskingController { - - @Autowired - private DataMaskingRuleService dataMaskingRuleService; - - @PostMapping("/runMaskingRule") - @ApiOperation(value = "执行文字脱敏") - public ResultMsg runMaskingRule(@RequestBody String contentStr) { - log.info("输入需要脱敏的文字信息为 {}", contentStr); - List maskingRuleItems = dataMaskingRuleService.getDataMaskingRuleListByApplicationChannel(Constant.CHANNEL_DCC); - if (CollectionUtils.isEmpty(maskingRuleItems)){ - log.info("没有找到脱敏规则"); - return ResultMsg.failed("没有找到脱敏规则"); - } - log.info("开始脱敏 {}", contentStr); - RunMaskingRuleInput runMaskingRuleInput = new RunMaskingRuleInput(); - runMaskingRuleInput.setOldStr(contentStr); - runMaskingRuleInput.setDataMaskingRules(maskingRuleItems); - String summaryText = dataMaskingRuleService.runMaskingRule(runMaskingRuleInput); - log.info("脱敏结果 {}", summaryText); - return ResultMsg.ok(summaryText); - } -} diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java index 6f26d61..902fdf7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java @@ -34,38 +34,9 @@ import java.util.Map; @Slf4j public class TestController { - @Autowired - private DiFyFeign diFyFeign; - - @Autowired - private DiFyService diFyService; - - @Autowired - private MqMessageRecordService mqMessageRecordService; - @Autowired private RocketMQTemplate rocketMQTemplate; - @PostMapping("/runWorkflows") - @ApiOperation(value = "测试Dify") - public ResultMsg runWorkflows2(@RequestBody String contentStr) { - //"（1）语音电话（2024-11-09 12:10:57）客服：哎，哎，姚先生，你好打扰到您了，蹦蹦沃沃赛练呢。客户：喂你好。客服：哎，对对，小明那个昨天看了车不要着急走，今天可有时间到店来接待您试驾感受一下呢。客户：我现在已经开工了，我现在没时间过去啊。客服：好的，那等你忙完这段时间好吧。客户：好的，好的，好的好，再见啊。客服：好，那这边先不打扰您，哎，好，再见。"; - JSONObject mbJsonp = new JSONObject(); - mbJsonp.put("type", "image"); - mbJsonp.put("transfer_method", "remote_url"); - mbJsonp.put("imageUrl", "https://newbie-assets.digitalvolvo.com/images/2025/02/21/174011708518185205a49d2aead89b9aa8918c72fe5c08dcc66777df1f9df95535d991fbc8533.1740117074777.386.png"); - DiFyReq diFyImageReq = new DiFyReq(); - diFyImageReq.setUser("admin"); - diFyImageReq.setFlowId("app-ZcRTduhbcyu9qzXs2GAnXo0v"); - JSONObject imageInputs = new JSONObject(); - imageInputs.put("image", mbJsonp); - diFyImageReq.setInputs(imageInputs.toJSONString()); - log.info("difyImageReq:{}", JSON.toJSONString(diFyImageReq)); - Object difyResult = diFyService.getDiFyObject(diFyImageReq); - JSONObject dify = JSONObject.parseObject(difyResult.toString()); - return ResultMsg.ok(dify); - } - @PostMapping("/mockMq") diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaConsumer.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaConsumer.java index 90596a8..2242cb1 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaConsumer.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/mq/CorpusProcessKafkaConsumer.java @@ -1,3 +1,4 @@ +/* package com.volvo.ai.analytic.center.mq; import com.fasterxml.jackson.databind.ObjectMapper; @@ -15,13 +16,15 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; +*/ /** * @ClassName CorpusProcessKafkaConsumer * @Description * @Author renzhen * @Date 2025-03-04 10:18 * @Version 1.0 - **/ + **//* + @Slf4j @Component @RestController @@ -56,3 +59,4 @@ public class CorpusProcessKafkaConsumer { } } } +*/ From 77614bc1e0d779f7934c32b49efb1f11f0827f49 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Tue, 18 Mar 2025 15:30:45 +0800 Subject: [PATCH 40/43] =?UTF-8?q?=E8=88=86=E6=83=85=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E4=B8=8A=E7=BA=BF=E5=88=86=E6=94=AF=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TmTelephoneCorpusServiceImpl.java | 154 ------------------ 1 file changed, 154 deletions(-) delete mode 100644 ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java 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 deleted file mode 100644 index 3bba793..0000000 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/TmTelephoneCorpusServiceImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.volvo.ai.analytic.center.service.impl; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.volvo.ai.analytic.center.dto.corpus.AicorpusTelephoneDTO; -import com.volvo.ai.analytic.center.dto.req.CarModelReqDTO; -import com.volvo.ai.analytic.center.dto.req.DiFyReq; -import com.volvo.ai.analytic.center.dto.resp.CarModelRespDTO; -import com.volvo.ai.analytic.center.dto.resp.ResultDTO; -import com.volvo.ai.analytic.center.entity.TmTelephoneCorpus; -import com.volvo.ai.analytic.center.enums.BizEnum; -import com.volvo.ai.analytic.center.enums.BusinessTypeEnum; -import com.volvo.ai.analytic.center.feign.RemoteCarModelClient; -import com.volvo.ai.analytic.center.mapper.TmTelephoneCorpusMapper; -import com.volvo.ai.analytic.center.service.DiFyService; -import com.volvo.ai.analytic.center.service.TmTelephoneCorpusService; -import com.volvo.ai.analytic.center.utils.FlowResultSplitUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; -import org.apache.rocketmq.client.producer.SendCallback; -import org.apache.rocketmq.client.producer.SendResult; -import org.apache.rocketmq.spring.core.RocketMQTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.messaging.support.MessageBuilder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - - -/** - * @description 电话语料表-同步表 - * @author rz - * @date 2025-03-04 - */ -@Slf4j -@Service -public class TmTelephoneCorpusServiceImpl extends ServiceImpl implements TmTelephoneCorpusService { - - - @Autowired - private DiFyService diFyService; - - @Resource - private RocketMQTemplate rocketMqTemplate; - - @Value("${rocketmq.corpusTelephone.topic}") - private String topic; - - @Autowired - private RemoteCarModelClient remoteCarModelClient; - - @Override - @Transactional - public void saveTelephoneCorpus(TmTelephoneCorpus tmTelephoneCorpus) { - this.save(tmTelephoneCorpus); - } - - @Override - public void runDify(AicorpusTelephoneDTO aicorpusTelephone) { - - if(null != aicorpusTelephone){ - - Map inputMap = new HashMap(); - DiFyReq diFyImageReq = new DiFyReq(); - diFyImageReq.setUser("11111"); - diFyImageReq.setFlowId("app-peJXSjHjVKdkYxjdOUuPnZ5b"); - - - JSONObject jsonObject = JSONObject.parseObject( aicorpusTelephone.getDisplay()); - JSONArray segments = jsonObject.getJSONArray("segments"); - // 遍历 segments - segments.stream() - .map(segment -> (JSONObject) segment) - .forEach(segment -> { - JSONObject result = segment.getJSONObject("result"); - String text = result.getString("text"); - JSONObject analysisInfo = result.getJSONObject("analysis_info"); - String role = analysisInfo.getString("role"); - - // 拼接 role 和 text - String chat = role + ": " + text; - inputMap.put("chat",chat); - }); - - - inputMap.put("model",getCarModelList()); - diFyImageReq.setInputs(inputMap); - // 获取配置 - JSONObject execDifyFlow = diFyService.execDifyFlow(diFyImageReq, BusinessTypeEnum.SMART_ASSISTANT.getCode()); - log.info("runDify execDifyFlow {}",execDifyFlow); - if(null != execDifyFlow && execDifyFlow.get("status").equals("succeeded")){ - - String text = execDifyFlow.getJSONObject("outputs").getString("text"); - String resultStrOne = FlowResultSplitUtil.flowOutputTextSplit(text, "任务1", "任务2"); - String resultStrTwo =FlowResultSplitUtil.flowOutputTextSplit(text, "任务2", null); - Map ltoMap = new HashMap(); - ltoMap.put("analysisRecordId", aicorpusTelephone.getSourceId()); - ltoMap.put("analysisScene", "2"); -// ltoMap.put("unionId", aicorpusTelephone.getSourceId()); - ltoMap.put("recordId", aicorpusTelephone.getSourceId()); - ltoMap.put("communicateDate", jsonObject.getString("start_time")); - ltoMap.put("analysisResult", resultStrOne); - ltoMap.put("analysisDetail", resultStrTwo); - // 发送MQ - - log.info("send mq {}",ltoMap); - rocketMqTemplate.asyncSend(topic, MessageBuilder.withPayload(JSON.toJSONString(ltoMap)).build(), - new SendCallback() { - @Override - public void onSuccess(SendResult sendResult) { - log.info("发送导入标签值成功 消息体:{}", JSON.toJSONString(ltoMap)); - } - @Override - public void onException(Throwable e) { - log.error("发送导入标签值异常 消息体:{}, 异常：", JSON.toJSONString(ltoMap), e); - } - }, 10000); - - } - } - } - - private String getCarModelList(){ - try { - long startTime = System.currentTimeMillis(); - CarModelReqDTO carModelReqDTO = new CarModelReqDTO(); - carModelReqDTO.setOnSale(10041001); - carModelReqDTO.setIsValid(10041001); - ResultDTO> cardModelResult= remoteCarModelClient.queryCarModelList(carModelReqDTO); - log.info("queryCarModelList 导出查询耗时开始时间：{}",System.currentTimeMillis()-startTime); - if (BizEnum.SUCCESS.getCode().toString().equals(cardModelResult.getReturnCode()) && CollectionUtils.isNotEmpty(cardModelResult.getData())) { - List carModelRespDTOList = cardModelResult.getData(); - // 拼接 modelName - String modelNames = carModelRespDTOList.stream() - .map(CarModelRespDTO::getModelName) // 提取 modelName - .collect(Collectors.joining(", ")); // 用逗号和空格拼接 - - log.info("拼接后的车型名称: {}", modelNames); - return modelNames; - } - } catch (Exception e) { - log.error("getCarModelList Exception: {}", e); - } - return "C40 RECHARGE、EM90、EX30、S60、S90、V60、V90、XC40、XC40 RECHARGE、XC60、XC90"; - } - - -} \ No newline at end of file From e976f8d87d14f7e892ed0f045df3bdbc383fc23c Mon Sep 17 00:00:00 2001 From: lxu75 Date: Tue, 18 Mar 2025 16:41:49 +0800 Subject: [PATCH 41/43] =?UTF-8?q?fix=20=E8=84=B1=E6=95=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../volvo/ai/analytic/center/entity/DataMaskingRule.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java index fbad8b9..9f1c0ac 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java @@ -13,9 +13,8 @@ import java.util.Date; */ @Data @Accessors -@EqualsAndHashCode(callSuper = true) @TableName("tt_ai_drives_datamaskingrule") -public class DataMaskingRule extends BaseEntity { +public class DataMaskingRule { /** * 主键 @@ -106,4 +105,7 @@ public class DataMaskingRule extends BaseEntity { */ @TableField("rule_remarks") private String ruleRemarks; + + @TableField("create_time") + private Date createTime; } From 5260c70b31fdf24d35277f3e5800a4d1dd9fdcf3 Mon Sep 17 00:00:00 2001 From: lxu75 Date: Tue, 18 Mar 2025 16:42:39 +0800 Subject: [PATCH 42/43] =?UTF-8?q?fix=20=E8=84=B1=E6=95=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/volvo/ai/analytic/center/entity/DataMaskingRule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java index 9f1c0ac..30a49f0 100644 --- a/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java +++ b/ai-analytic-center-api/src/main/java/com/volvo/ai/analytic/center/entity/DataMaskingRule.java @@ -1,9 +1,7 @@ package com.volvo.ai.analytic.center.entity; import com.baomidou.mybatisplus.annotation.*; -import com.volvo.common.core.base.BaseEntity; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.util.Date; From e5d1a73e2a2a186f3f3d1e0df6a33dbc735829c2 Mon Sep 17 00:00:00 2001 From: zren25 Date: Thu, 13 Mar 2025 16:31:19 +0800 Subject: [PATCH 43/43] =?UTF-8?q?=E5=A2=9E=E5=8A=A0xxjob=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ai-analytic-center-biz/pom.xml | 6 ++ .../analytic/center/config/XxlJobConfig.java | 60 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/XxlJobConfig.java diff --git a/ai-analytic-center-biz/pom.xml b/ai-analytic-center-biz/pom.xml index 79353d4..a5713bf 100644 --- a/ai-analytic-center-biz/pom.xml +++ b/ai-analytic-center-biz/pom.xml @@ -209,6 +209,12 @@ + + com.xuxueli + xxl-job-core + 2.3.0 + + diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/XxlJobConfig.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/XxlJobConfig.java new file mode 100644 index 0000000..5dc6dbc --- /dev/null +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/XxlJobConfig.java @@ -0,0 +1,60 @@ +package com.volvo.ai.analytic.center.config; + +import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @author liuyazhou + * @version 1.0.0 + * @ClassName XxlJobConfig.java + * @Description TODO + * @createTime 2022年08月09日 17:05:00 + */ +@Configuration +public class XxlJobConfig { + + private static final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class); + + @Value("${xxl.job.admin.addresses}") + private String adminAddresses; + @Value("${xxl.job.accessToken}") + private String accessToken; + + @Value("${xxl.job.executor.appName}") + private String appname; + + @Value("${xxl.job.executor.address}") + private String address; + + @Value("${xxl.job.executor.ip}") + private String ip; + + @Value("${xxl.job.executor.port}") + private int port; + + @Value("${xxl.job.executor.logPath}") + private String logPath; + + @Value("${xxl.job.executor.logRetentionDays}") + private int logRetentionDays; + + @Bean + public XxlJobSpringExecutor xxlJobExecutor() { + logger.info(">>>>>>>>>>> xxl-job config init."); + XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor(); + xxlJobSpringExecutor.setAdminAddresses(adminAddresses); + xxlJobSpringExecutor.setAppname(appname); + xxlJobSpringExecutor.setAddress(address); + xxlJobSpringExecutor.setIp(ip); + xxlJobSpringExecutor.setPort(port); + xxlJobSpringExecutor.setAccessToken(accessToken); + xxlJobSpringExecutor.setLogPath(logPath); + xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); + return xxlJobSpringExecutor; + } + +}