From 8950f7cd061f94cf23f84c6bc4d9c1bdac5ca516 Mon Sep 17 00:00:00 2001 From: stream Date: Fri, 30 Jan 2026 17:27:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=AD=E9=9F=B3=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=EF=BC=88=E9=83=A8=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/AeEvaluationController.java | 32 +++ .../src/main/resources/application-dev.yml | 2 + .../com/cmvr/llm/config/APIProperties.java | 2 + cmvr-iot-evaluation/pom.xml | 34 +++ .../evaluation/mapper/AeEvaluationMapper.java | 7 + .../evaluation/model/domain/AeEvaluation.java | 45 ++++ .../service/IAeEvaluationService.java | 12 + .../service/ex/ExAeEvaluationServiceImpl.java | 21 ++ .../service/impl/AeEvaluationServiceImpl.java | 253 ++++++++++++++++++ .../java/com/cmvr/test/enums/RunModeEnum.java | 3 +- .../dispatcher/FlowEndNodeHandler.java | 35 +++ .../flow/runtime/engine/FlowTaskEngine.java | 2 +- .../runtime/engine/FlowTaskRuntimeEntry.java | 2 +- .../edge/EdgeCameraOperateService.java | 2 +- .../edge/EdgeMicrophoneOperateService.java | 5 +- .../edge/vi/ViPlayOperateService.java | 6 +- .../service/ex/ExAeEvaluationService.java | 10 + cmvr-iot-vi/pom.xml | 6 + .../vi/service/impl/ViProjectServiceImpl.java | 8 +- pom.xml | 8 + 20 files changed, 485 insertions(+), 10 deletions(-) create mode 100644 cmvr-iot-admin/src/main/java/com/cmvr/web/controller/evaluation/AeEvaluationController.java create mode 100644 cmvr-iot-evaluation/pom.xml create mode 100644 cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/mapper/AeEvaluationMapper.java create mode 100644 cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/model/domain/AeEvaluation.java create mode 100644 cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/IAeEvaluationService.java create mode 100644 cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/ex/ExAeEvaluationServiceImpl.java create mode 100644 cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/impl/AeEvaluationServiceImpl.java create mode 100644 cmvr-iot-test/src/main/java/com/cmvr/test/service/ex/ExAeEvaluationService.java diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/evaluation/AeEvaluationController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/evaluation/AeEvaluationController.java new file mode 100644 index 0000000..7c352bf --- /dev/null +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/evaluation/AeEvaluationController.java @@ -0,0 +1,32 @@ +package com.cmvr.web.controller.evaluation; + +import com.cmvr.common.core.controller.BaseController; +import com.cmvr.common.core.domain.AjaxResult; +import com.cmvr.evaluation.model.domain.AeEvaluation; +import com.cmvr.evaluation.service.IAeEvaluationService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "AI评估") +@RestController +@RequestMapping("/evaluation") +@RequiredArgsConstructor +public class AeEvaluationController extends BaseController { + + + private final IAeEvaluationService aeEvaluationService; + + @ApiOperation("回调AI评估") + @GetMapping("/test") + public AjaxResult execute() { + AeEvaluation aeEvaluation = new AeEvaluation(); + aeEvaluation.setInstId("1336caf1e80b2d23b706ad1cd05d78bd"); + aeEvaluation.setItemId("18483d62ccec13c0a336d1d605e9b06c"); + aeEvaluationService.executeEvaluation(aeEvaluation); + return AjaxResult.ok(); + } +} diff --git a/cmvr-iot-admin/src/main/resources/application-dev.yml b/cmvr-iot-admin/src/main/resources/application-dev.yml index 3594f26..a76ca4b 100644 --- a/cmvr-iot-admin/src/main/resources/application-dev.yml +++ b/cmvr-iot-admin/src/main/resources/application-dev.yml @@ -120,6 +120,8 @@ api: INTENT_RECOGNITION: # 意图识别 app-id: d3c98sp0gdon0fcf6l00 app-key: d3c98vp0gdon0fcf6n20 + evaluation: http://192.168.0.18:8000/analyze + flowise: tts: 192.168.0.222:8080/tts/ diff --git a/cmvr-iot-api/cmvr-iot-llm/src/main/java/com/cmvr/llm/config/APIProperties.java b/cmvr-iot-api/cmvr-iot-llm/src/main/java/com/cmvr/llm/config/APIProperties.java index 212e20e..a200e09 100644 --- a/cmvr-iot-api/cmvr-iot-llm/src/main/java/com/cmvr/llm/config/APIProperties.java +++ b/cmvr-iot-api/cmvr-iot-llm/src/main/java/com/cmvr/llm/config/APIProperties.java @@ -41,6 +41,8 @@ public class APIProperties { /** 多应用配置（key=ActionEnum) */ private Map agents; + private String evaluation; + /** * 根据 ActionEnum 名称获取 app 配置 */ diff --git a/cmvr-iot-evaluation/pom.xml b/cmvr-iot-evaluation/pom.xml new file mode 100644 index 0000000..373b608 --- /dev/null +++ b/cmvr-iot-evaluation/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.cmvr + cmvr-iot + 3.8.9 + + + cmvr-iot-evaluation + + + AI评估模块 + + + + + + + com.cmvr + cmvr-iot-common + + + + + com.cmvr + cmvr-iot-test + + + + + \ No newline at end of file diff --git a/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/mapper/AeEvaluationMapper.java b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/mapper/AeEvaluationMapper.java new file mode 100644 index 0000000..b49edf7 --- /dev/null +++ b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/mapper/AeEvaluationMapper.java @@ -0,0 +1,7 @@ +package com.cmvr.evaluation.mapper; + +import com.cmvr.evaluation.model.domain.AeEvaluation; +import com.github.yulichang.base.MPJBaseMapper; + +public interface AeEvaluationMapper extends MPJBaseMapper { +} diff --git a/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/model/domain/AeEvaluation.java b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/model/domain/AeEvaluation.java new file mode 100644 index 0000000..916fe63 --- /dev/null +++ b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/model/domain/AeEvaluation.java @@ -0,0 +1,45 @@ +package com.cmvr.evaluation.model.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * AI评估实体类 + */ +@Data +public class AeEvaluation implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键id") + @TableId(value = "ae_id", type = IdType.ASSIGN_UUID) + private String aeId; + + @ApiModelProperty("评估类型（VOICE:语音，TOUCH:触控）") + private String aeType; + + @ApiModelProperty("流程实例ID") + private String instId; + + @ApiModelProperty("检测项ID") + private String itemId; + + @ApiModelProperty("音视频内容") + private String avContent; + + @ApiModelProperty("音频地址") + private String audioPath; + + @ApiModelProperty("视频地址") + private String videoPath; + + @ApiModelProperty("评估状态，0:待评估，1:评估中，3:评估成功，4:评估失败") + private Integer status; + + @ApiModelProperty("评估最终结果（JSON）") + private String result; +} diff --git a/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/IAeEvaluationService.java b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/IAeEvaluationService.java new file mode 100644 index 0000000..586563c --- /dev/null +++ b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/IAeEvaluationService.java @@ -0,0 +1,12 @@ +package com.cmvr.evaluation.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.cmvr.evaluation.model.domain.AeEvaluation; + +public interface IAeEvaluationService extends IService { + + /** + * 执行语音交互评估 + */ + public void executeEvaluation(AeEvaluation evaluation); +} diff --git a/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/ex/ExAeEvaluationServiceImpl.java b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/ex/ExAeEvaluationServiceImpl.java new file mode 100644 index 0000000..d10e2fa --- /dev/null +++ b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/ex/ExAeEvaluationServiceImpl.java @@ -0,0 +1,21 @@ +package com.cmvr.evaluation.service.ex; + +import com.alibaba.fastjson2.JSONObject; +import com.cmvr.evaluation.model.domain.AeEvaluation; +import com.cmvr.evaluation.service.IAeEvaluationService; +import com.cmvr.test.service.ex.ExAeEvaluationService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ExAeEvaluationServiceImpl implements ExAeEvaluationService { + + private final IAeEvaluationService aeEvaluationService; + + @Override + public void executeEvaluation(JSONObject body) { + AeEvaluation aeEvaluation = body.toJavaObject(AeEvaluation.class); + aeEvaluationService.executeEvaluation(aeEvaluation); + } +} diff --git a/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/impl/AeEvaluationServiceImpl.java b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/impl/AeEvaluationServiceImpl.java new file mode 100644 index 0000000..6c15c47 --- /dev/null +++ b/cmvr-iot-evaluation/src/main/java/com/cmvr/evaluation/service/impl/AeEvaluationServiceImpl.java @@ -0,0 +1,253 @@ +package com.cmvr.evaluation.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cmvr.common.utils.http.CallAPIUtil; +import com.cmvr.evaluation.mapper.AeEvaluationMapper; +import com.cmvr.evaluation.model.domain.AeEvaluation; +import com.cmvr.evaluation.service.IAeEvaluationService; +import com.cmvr.llm.config.APIProperties; +import com.cmvr.test.enums.ActionEnum; +import com.cmvr.test.model.domain.TeNodeInst; +import com.cmvr.test.model.vo.TeFlowViewVO; +import com.cmvr.test.service.ITeNodeInstService; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class AeEvaluationServiceImpl extends ServiceImpl implements IAeEvaluationService { + + private final ITeNodeInstService teNodeInstService; + private final APIProperties apiProperties; + private final StringRedisTemplate redisTemplate; + + public void executeEvaluation(AeEvaluation evaluation) { + + // 查询流程执行记录 + TeFlowViewVO teFlowViewVO = new TeFlowViewVO(); + teFlowViewVO.setInstId(evaluation.getInstId()); + teFlowViewVO.setItemId(evaluation.getItemId()); + + List view = teNodeInstService.view(teFlowViewVO); + + // 解析 VI_SCHEME 参数 + TeNodeInst viSchemeInst = view.stream() + .filter(e -> ActionEnum.VI_SCHEME.getAction().equals(e.getAction())) + .findFirst() + .orElseThrow(() -> new IllegalStateException("未找到 VI_SCHEME 节点")); + + JSONObject paramsOut = JSONObject.parseObject(viSchemeInst.getParamsOut()); + + Integer sceneType = paramsOut.getInteger("sceneType"); + + // 唤醒语料 + JSONObject wakeCorpus = paramsOut.getJSONObject("wakeCorpus"); + String wakeContent = wakeCorpus != null ? wakeCorpus.getString("textContent") : null; + + // 测试语料 + JSONArray testCorpusArray = paramsOut.getJSONArray("testCorpus"); + + // 构建评估任务列表 + List evaluations = new LinkedList<>(); + + switch (sceneType) { + + // 场景 1：唤醒 + case 1: { + AeEvaluation eval = new AeEvaluation(); + BeanUtil.copyProperties(evaluation, eval); + eval.setAeId(IdUtil.fastSimpleUUID()); + eval.setStatus(0); // 待评估 + eval.setAvContent(wakeContent); + evaluations.add(eval); + break; + } + + // 场景 2：单次对话（一层循环） + case 2: { + + Map> iterationMap = buildSingleIterationMap(view); + + for (Map.Entry> entry : iterationMap.entrySet()) { + + String iterationKey = entry.getKey(); // "1" / "2" / ... + List nodeList = entry.getValue(); + + int index = Integer.parseInt(iterationKey) - 1; + JSONObject corpus = testCorpusArray.getJSONObject(index); + + String content = StrUtil.join(", ", + wakeContent, + corpus.getString("textContent") + ); + + String audioUrl = extractAudioUrl(nodeList); + String videoUrl = extractVideoUrl(nodeList); + + AeEvaluation eval = new AeEvaluation(); + BeanUtil.copyProperties(evaluation, eval); + eval.setAeId(IdUtil.fastSimpleUUID()); + eval.setStatus(0); + eval.setAvContent(content); + eval.setAudioPath(audioUrl); + eval.setVideoPath(videoUrl); + + evaluations.add(eval); + } + break; + } + + // 场景 3：连续对话（嵌套循环） + case 3: { + + Map> ContinuousIterationMap = buildContinuousIterationMap(view); + for (Map.Entry> entry : ContinuousIterationMap.entrySet()) { + + String key = entry.getKey(); + List value = entry.getValue(); + + // 每一个 outer iteration 代表一次完整连续对话 + StringBuilder contentBuilder = new StringBuilder(wakeContent); + + + int corpusIndex = Integer.parseInt(key) - 1; + JSONArray corpus = testCorpusArray.getJSONArray(corpusIndex); + + String corpusText = corpus.stream() + .filter(Objects::nonNull) + .map(obj -> ((JSONObject) obj).getString("textContent")) + .filter(StrUtil::isNotEmpty) + .collect(Collectors.joining(", ")); + + if (StrUtil.isNotEmpty(corpusText)) { + contentBuilder.append(", ").append(corpusText); + } + + String audioUrl = extractAudioUrl(value); + String videoUrl = extractVideoUrl(value); + + AeEvaluation eval = new AeEvaluation(); + BeanUtil.copyProperties(evaluation, eval); + eval.setAeId(IdUtil.fastSimpleUUID()); + eval.setStatus(0); + eval.setAvContent(contentBuilder.toString()); + eval.setAudioPath(audioUrl); + eval.setVideoPath(videoUrl); + + evaluations.add(eval); + } + break; + } + + default: + throw new IllegalArgumentException("未知 sceneType：" + sceneType); + } + + try { + // 入库 + this.saveBatch(evaluations); + + // 提取第一个对象出来 + AeEvaluation first = CollUtil.getFirst(evaluations); + List rest = CollUtil.sub(evaluations, 1, evaluations.size()); + // 剩下的先入队列 + for (AeEvaluation e : rest) { + redisTemplate.opsForList().rightPush("ae:evaluation:queue", JSON.toJSONString(e)); + } + + // 构建评估请求 + Map body = new HashMap<>(); + body.put("aeId", first.getAeId()); + body.put("audioPath", first.getAudioPath()); + body.put("videoPath", first.getVideoPath()); + body.put("content", first.getAvContent()); + body.put("aeType", first.getAeType()); + CallAPIUtil.doPostJson(apiProperties.getEvaluation(), null, body); + + first.setStatus(1); + this.updateById(first); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private Map> buildSingleIterationMap(List view) { + return view.stream() + .filter(e -> StrUtil.isNotEmpty(e.getIteration())) + .collect(Collectors.groupingBy( + TeNodeInst::getIteration, + LinkedHashMap::new, + Collectors.collectingAndThen( + Collectors.toList(), + list -> list.stream() + .sorted(Comparator.comparing(TeNodeInst::getId)) + .collect(Collectors.toList()) + ) + )); + } + + + private Map> buildContinuousIterationMap(List view) { + + return view.stream() + .filter(e -> StrUtil.isNotEmpty(e.getIteration())) + // 只保留最外层 iteration（不包含子层） + .filter(e -> !e.getIteration().contains("-")) + .collect(Collectors.groupingBy( + TeNodeInst::getIteration, + LinkedHashMap::new, + Collectors.collectingAndThen( + Collectors.toList(), + list -> list.stream() + .sorted(Comparator.comparing(TeNodeInst::getId)) + .collect(Collectors.toList()) + ) + )); + } + + private String extractAudioUrl(List nodeList) { + TeNodeInst microPhoneInst = nodeList.stream() + .filter(e -> ActionEnum.MICROPHONE_START.getAction().equals(e.getAction())) + .findFirst() + .orElse(null); + + if (microPhoneInst == null) { + return null; + } + + JSONObject paramsOut = JSONObject.parseObject(microPhoneInst.getParamsOut()); + return paramsOut.getString("audioUrl"); + } + + + private String extractVideoUrl(List nodeList) { + TeNodeInst recordingInst = nodeList.stream() + .filter(e -> ActionEnum.CAMERA_RECORDING_START.getAction().equals(e.getAction())) + .findFirst() + .orElse(null); + + if (recordingInst == null) { + return null; + } + + JSONObject paramsOut = JSONObject.parseObject(recordingInst.getParamsOut()); + return paramsOut.getString("videoUrl"); + } +} diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/enums/RunModeEnum.java b/cmvr-iot-test/src/main/java/com/cmvr/test/enums/RunModeEnum.java index 3de1995..aaea162 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/enums/RunModeEnum.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/enums/RunModeEnum.java @@ -3,5 +3,6 @@ package com.cmvr.test.enums; public enum RunModeEnum { NORMAL, //正常 TRIAL, //试运行 - PROJECT //项目 + VI_PROJECT, //语音交互项目 + TI_PROJECT //触控交互项目 } \ No newline at end of file diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/dispatcher/FlowEndNodeHandler.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/dispatcher/FlowEndNodeHandler.java index fb20b52..72b1bd2 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/dispatcher/FlowEndNodeHandler.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/dispatcher/FlowEndNodeHandler.java @@ -1,18 +1,53 @@ package com.cmvr.test.flow.runtime.dispatcher; +import com.alibaba.fastjson2.JSONObject; +import com.cmvr.test.enums.RunModeEnum; +import com.cmvr.test.flow.context.TaskContext; +import com.cmvr.test.flow.context.TaskInstHolder; import com.cmvr.test.flow.runtime.message.TaskNodeExecuteMessage; import com.cmvr.test.flow.runtime.message.TaskNodeExecuteResult; +import com.cmvr.test.service.ex.ExAeEvaluationService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; +import javax.annotation.Resource; + @Slf4j @Component("END") @RequiredArgsConstructor public class FlowEndNodeHandler implements FlowNodeTypeHandler { + private final TaskInstHolder taskInstHolder; + private final ExAeEvaluationService exAeEvaluationService; + + @Resource(name = "threadPoolTaskExecutor") + private final ThreadPoolTaskExecutor executor; + @Override public TaskNodeExecuteResult handle(TaskNodeExecuteMessage message) { + String instId = message.getInstId(); + String itemId = message.getItemId(); + TaskContext context = taskInstHolder.getContext(instId); + RunModeEnum runMode = context.getRunMode(); + + JSONObject jsonObject = new JSONObject(); + jsonObject.put("instId", instId); + jsonObject.put("itemId", itemId); + jsonObject.put("aeType", "VOICE"); + + executor.submit(() -> { + Thread.currentThread().setName("evaluation-thread-" + Thread.currentThread().getId()); + try { +// log.info("异步任务开始执行：threadName={}, instId={}, taskId={}", Thread.currentThread().getName(), instId, taskId); + exAeEvaluationService.executeEvaluation(jsonObject); +// log.info("异步任务执行结束：threadName={}, instId={}, taskId={}", Thread.currentThread().getName(), instId, taskId); + } catch (Exception e) { +// log.error("任务执行异常：threadName={}, instId={}, taskId={}, 错误={}", Thread.currentThread().getName(), instId, taskId, e.getMessage(), e); + Thread.currentThread().interrupt(); // 保持中断状态 + } + }); return TaskNodeExecuteResult.success(message.getInputParams()); } } diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskEngine.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskEngine.java index d1e8982..322b8f6 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskEngine.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskEngine.java @@ -42,7 +42,7 @@ public class FlowTaskEngine { message.setTaskId(taskId); message.setTerminalId(terminalId); message.setItemId(itemId); - if (runMode.equals(RunModeEnum.PROJECT)) { + if (runMode.equals(RunModeEnum.VI_PROJECT)) { message.setLoopDetail(item.getSchemeInfo()); } diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskRuntimeEntry.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskRuntimeEntry.java index b5c4fe8..c4e29ef 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskRuntimeEntry.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/engine/FlowTaskRuntimeEntry.java @@ -111,7 +111,7 @@ public class FlowTaskRuntimeEntry implements FlowTaskRuntimeService { return executeTaskInternal( taskExecuteProjectVO.getTerminalId(), taskExecuteProjectVO.getProjectId(), - RunModeEnum.PROJECT, + RunModeEnum.VI_PROJECT, taskExecuteProjectVO.getRunParams(), taskExecuteProjectVO ); diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeCameraOperateService.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeCameraOperateService.java index dcbea43..938b742 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeCameraOperateService.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeCameraOperateService.java @@ -124,7 +124,7 @@ public class EdgeCameraOperateService implements EdgeOperateService { } case CAMERA_RECORDING_STOP: { - edgeCameraService.stopRecording(edgeCommonVO); +// edgeCameraService.stopRecording(edgeCommonVO); // todo 结束录像获取视频路径输出 // 获取视频录制开始节点的id FlowNodeWrapper startRecordNode = message.getGraph() diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeMicrophoneOperateService.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeMicrophoneOperateService.java index 644e6a9..dd7119a 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeMicrophoneOperateService.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/EdgeMicrophoneOperateService.java @@ -36,13 +36,14 @@ public class EdgeMicrophoneOperateService implements EdgeOperateService { edgeCommonVO.setTerminalId(terminalId); switch (action) { case MICROPHONE_START: { - String audioPath = edgeMicrophoneService.startRecord(edgeCommonVO); +// String audioPath = edgeMicrophoneService.startRecord(edgeCommonVO); + String audioPath = "xxx"; output.put("audioUrl", audioPath); break; } case MICROPHONE_STOP: { - edgeMicrophoneService.stopRecord(edgeCommonVO); +// edgeMicrophoneService.stopRecord(edgeCommonVO); break; } diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/vi/ViPlayOperateService.java b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/vi/ViPlayOperateService.java index 6b5c884..ac83111 100644 --- a/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/vi/ViPlayOperateService.java +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/flow/runtime/operator/edge/vi/ViPlayOperateService.java @@ -57,7 +57,9 @@ public class ViPlayOperateService implements EdgeOperateService { edgeCommonVO.setTerminalId(terminalId); } - try { + log.info("语料播放成功，audioPath={}", audioPath); + + /*try { // 播放音频 edgeSpeakerService.playAudio(terminalId, deviceId, audioPath); @@ -92,7 +94,7 @@ public class ViPlayOperateService implements EdgeOperateService { if (needBioSpeak) { edgeBioHeadService.speakStop(edgeCommonVO); } - } + }*/ return TaskNodeExecuteResult.success(); } diff --git a/cmvr-iot-test/src/main/java/com/cmvr/test/service/ex/ExAeEvaluationService.java b/cmvr-iot-test/src/main/java/com/cmvr/test/service/ex/ExAeEvaluationService.java new file mode 100644 index 0000000..b6750cd --- /dev/null +++ b/cmvr-iot-test/src/main/java/com/cmvr/test/service/ex/ExAeEvaluationService.java @@ -0,0 +1,10 @@ +package com.cmvr.test.service.ex; + +import com.alibaba.fastjson2.JSONObject; + +/** + * 外部-评估 + */ +public interface ExAeEvaluationService { + public void executeEvaluation(JSONObject body); +} diff --git a/cmvr-iot-vi/pom.xml b/cmvr-iot-vi/pom.xml index b87c779..7fe819c 100644 --- a/cmvr-iot-vi/pom.xml +++ b/cmvr-iot-vi/pom.xml @@ -29,6 +29,12 @@ cmvr-iot-test + + + com.cmvr + cmvr-iot-evaluation + + \ No newline at end of file diff --git a/cmvr-iot-vi/src/main/java/com/cmvr/vi/service/impl/ViProjectServiceImpl.java b/cmvr-iot-vi/src/main/java/com/cmvr/vi/service/impl/ViProjectServiceImpl.java index 4e703c7..05ef100 100644 --- a/cmvr-iot-vi/src/main/java/com/cmvr/vi/service/impl/ViProjectServiceImpl.java +++ b/cmvr-iot-vi/src/main/java/com/cmvr/vi/service/impl/ViProjectServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cmvr.common.exception.GlobalException; +import com.cmvr.evaluation.model.domain.AeEvaluation; import com.cmvr.test.enums.FlowSceneTypeEnum; import com.cmvr.test.enums.RunModeEnum; import com.cmvr.test.flow.runtime.engine.FlowTaskRuntimeService; @@ -63,10 +64,10 @@ public class ViProjectServiceImpl extends ServiceImpl${cmvr-iot.version} + + + com.cmvr + cmvr-iot-evaluation + ${cmvr-iot.version} + + com.cmvr @@ -330,6 +337,7 @@ cmvr-iot-api cmvr-iot-vi cmvr-iot-ti + cmvr-iot-evaluation pom