From 5ea88ddb992719507f43e0df7536240fc43ce767 Mon Sep 17 00:00:00 2001 From: lixiaolong <702156524@qq.com> Date: Wed, 24 Jun 2026 09:55:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(aima):=20=E6=9B=B4=E6=96=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=AE=9E=E4=BE=8B=E5=92=8C=E6=B5=8B=E8=AF=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将AimaTestLog实体中的logMessage字段改为logContent，并调整数据库表结构 - 在AimaTaskInstance表中新增create_by、update_time、update_by和remark字段 - 添加AimaTaskInstanceQuery查询DTO类支持多条件查询 - 修改控制器和业务层方法参数类型从AimaTaskInstance到AimaTaskInstanceQuery - 更新MyBatis映射文件中的参数类型和字段引用 - 在监听器中更新日志记录的字段名和状态设置 - 移除测试日志服务中自动设置创建者和更新者的逻辑 --- .../aima/AimaTaskInstanceController.java | 9 ++--- .../com/cmvr/aima/domain/AimaTestLog.java | 2 +- .../domain/dto/AimaTaskInstanceQuery.java | 34 +++++++++++++++++++ .../listener/AimaFlowExecutionListener.java | 5 +-- .../aima/mapper/AimaTaskInstanceMapper.java | 5 +-- .../service/IAimaTaskInstanceService.java | 3 +- .../impl/AimaTaskInstanceServiceImpl.java | 5 +-- .../service/impl/AimaTestLogServiceImpl.java | 2 -- .../mapper/aima/AimaTaskInstanceMapper.xml | 8 ++++- .../mapper/aima/AimaTestLogMapper.xml | 10 +++--- sql/aima_module.sql | 6 +++- 11 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/dto/AimaTaskInstanceQuery.java diff --git a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/aima/AimaTaskInstanceController.java b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/aima/AimaTaskInstanceController.java index a831cdc..482dad2 100644 --- a/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/aima/AimaTaskInstanceController.java +++ b/cmvr-iot-admin/src/main/java/com/cmvr/web/controller/aima/AimaTaskInstanceController.java @@ -12,6 +12,7 @@ import com.cmvr.common.core.controller.BaseController; import com.cmvr.common.core.domain.AjaxResult; import com.cmvr.common.enums.BusinessType; import com.cmvr.aima.domain.AimaTaskInstance; +import com.cmvr.aima.domain.dto.AimaTaskInstanceQuery; import com.cmvr.aima.domain.vo.AimaTaskInstanceVo; import com.cmvr.aima.service.IAimaTaskInstanceService; import com.cmvr.common.utils.poi.ExcelUtil; @@ -27,9 +28,9 @@ public class AimaTaskInstanceController extends BaseController { @ApiOperation("查询任务实例列表") @PreAuthorize("@ss.hasPermi('aima:taskinstance:list')") @GetMapping("/list") - public TableDataInfo list(AimaTaskInstance aimaTaskInstance) { + public TableDataInfo list(AimaTaskInstanceQuery query) { startPage(); - List list = aimaTaskInstanceService.selectAimaTaskInstanceVoList(aimaTaskInstance); + List list = aimaTaskInstanceService.selectAimaTaskInstanceVoList(query); return getDataTable(list); } @@ -37,8 +38,8 @@ public class AimaTaskInstanceController extends BaseController { @PreAuthorize("@ss.hasPermi('aima:taskinstance:export')") @Log(title = "任务执行实例", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, AimaTaskInstance aimaTaskInstance) { - List list = aimaTaskInstanceService.selectAimaTaskInstanceVoList(aimaTaskInstance); + public void export(HttpServletResponse response, AimaTaskInstanceQuery query) { + List list = aimaTaskInstanceService.selectAimaTaskInstanceVoList(query); ExcelUtil util = new ExcelUtil<>(AimaTaskInstanceVo.class); util.exportExcel(response, list, "任务实例数据"); } diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/AimaTestLog.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/AimaTestLog.java index 1d98ed4..74142dc 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/AimaTestLog.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/AimaTestLog.java @@ -60,7 +60,7 @@ public class AimaTestLog extends BaseEntity @Excel(name = "日志内容") @ApiModelProperty("日志内容") - private String logMessage; + private String logContent; @Excel(name = "日志时间") @ApiModelProperty("日志时间") diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/dto/AimaTaskInstanceQuery.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/dto/AimaTaskInstanceQuery.java new file mode 100644 index 0000000..e6de18f --- /dev/null +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/domain/dto/AimaTaskInstanceQuery.java @@ -0,0 +1,34 @@ +package com.cmvr.aima.domain.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 爱玛任务实例查询入参DTO + * + * @author cmvr-iot + * @since 2026-06-22 + */ +@Data +@ApiModel("爱玛任务实例查询条件") +public class AimaTaskInstanceQuery { + + @ApiModelProperty("任务ID") + private String taskId; + + @ApiModelProperty("手机ID") + private String phoneId; + + @ApiModelProperty("车辆ID") + private String vehicleId; + + @ApiModelProperty("单个状态（兼容原有精确查询）") + private Integer status; + + @ApiModelProperty("多状态集合，in查询用：0待执行 1执行中 2已完成 3已取消 4执行失败 5已暂停") + private List statusList; + +} diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/listener/AimaFlowExecutionListener.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/listener/AimaFlowExecutionListener.java index f5c2c6a..b530877 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/listener/AimaFlowExecutionListener.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/listener/AimaFlowExecutionListener.java @@ -137,8 +137,9 @@ public class AimaFlowExecutionListener implements FlowExecutionListener { .testCaseId(itemId) .logLevel("INFO") .logType("执行日志") - .logMessage("节点【" + event.getNodeName() + "】" + info) + .logContent("节点【" + event.getNodeName() + "】" + info) .logTime(now) + .status(targetStatus) .executionStep(event.getNodeName()) .testStatus("0") // 0未执行 .durationMs(0L) @@ -179,7 +180,7 @@ public class AimaFlowExecutionListener implements FlowExecutionListener { .taskInstanceId(dbInsId) .logLevel("INFO") .logType("系统日志") - .logMessage("任务执行完成") + .logContent("任务执行完成") .logTime(now) .status(targetStatus) .build(); diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/mapper/AimaTaskInstanceMapper.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/mapper/AimaTaskInstanceMapper.java index 7931795..3076485 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/mapper/AimaTaskInstanceMapper.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/mapper/AimaTaskInstanceMapper.java @@ -3,6 +3,7 @@ package com.cmvr.aima.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.cmvr.aima.domain.AimaTaskInstance; +import com.cmvr.aima.domain.dto.AimaTaskInstanceQuery; import com.cmvr.aima.domain.vo.AimaTaskInstanceVo; /** @@ -31,10 +32,10 @@ public interface AimaTaskInstanceMapper extends BaseMapper { /** * 查询爱玛任务执行实例视图列表（包含关联信息） * - * @param aimaTaskInstance 爱玛任务执行实例 + * @param query 查询条件 * @return 爱玛任务执行实例视图集合 */ - List selectAimaTaskInstanceVoList(AimaTaskInstance aimaTaskInstance); + List selectAimaTaskInstanceVoList(AimaTaskInstanceQuery query); /** * 新增爱玛任务执行实例 diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/IAimaTaskInstanceService.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/IAimaTaskInstanceService.java index c699e44..18ab065 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/IAimaTaskInstanceService.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/IAimaTaskInstanceService.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.cmvr.aima.domain.AimaTaskInstance; +import com.cmvr.aima.domain.dto.AimaTaskInstanceQuery; import com.cmvr.aima.domain.vo.AimaTaskInstanceVo; /** @@ -15,7 +16,7 @@ import com.cmvr.aima.domain.vo.AimaTaskInstanceVo; public interface IAimaTaskInstanceService extends IService { AimaTaskInstance selectAimaTaskInstanceById(String id); List selectAimaTaskInstanceList(AimaTaskInstance aimaTaskInstance); - List selectAimaTaskInstanceVoList(AimaTaskInstance aimaTaskInstance); + List selectAimaTaskInstanceVoList(AimaTaskInstanceQuery query); int insertAimaTaskInstance(AimaTaskInstance aimaTaskInstance); int updateAimaTaskInstance(AimaTaskInstance aimaTaskInstance); int deleteAimaTaskInstanceByIds(String[] ids); diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTaskInstanceServiceImpl.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTaskInstanceServiceImpl.java index b8ff9b5..ab41be3 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTaskInstanceServiceImpl.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTaskInstanceServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.UUID; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cmvr.aima.domain.dto.AimaTaskInstanceQuery; import com.cmvr.aima.domain.vo.AimaTaskInstanceVo; import com.cmvr.common.exception.ServiceException; import com.cmvr.common.utils.SecurityUtils; @@ -60,8 +61,8 @@ public class AimaTaskInstanceServiceImpl extends ServiceImpl selectAimaTaskInstanceVoList(AimaTaskInstance aimaTaskInstance) { - return aimaTaskInstanceMapper.selectAimaTaskInstanceVoList(aimaTaskInstance); + public List selectAimaTaskInstanceVoList(AimaTaskInstanceQuery query) { + return aimaTaskInstanceMapper.selectAimaTaskInstanceVoList(query); } @Override diff --git a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTestLogServiceImpl.java b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTestLogServiceImpl.java index 7845911..250f0b7 100644 --- a/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTestLogServiceImpl.java +++ b/cmvr-iot-aima/src/main/java/com/cmvr/aima/service/impl/AimaTestLogServiceImpl.java @@ -40,14 +40,12 @@ public class AimaTestLogServiceImpl extends ServiceImpl where id = #{id} - select ti.id, ti.create_by, ti.create_time, ti.update_by, ti.update_time, ti.remark, ti.task_id, t.task_code, t.task_name, ti.phone_id, p.phone_name, ti.vehicle_id, v.vehicle_name, v.vin, @@ -65,6 +65,12 @@ and ti.phone_id = #{phoneId} and ti.vehicle_id = #{vehicleId} and ti.status = #{status} + + and ti.status in + + #{statusItem} + + order by ti.create_time desc diff --git a/cmvr-iot-aima/src/main/resources/mapper/aima/AimaTestLogMapper.xml b/cmvr-iot-aima/src/main/resources/mapper/aima/AimaTestLogMapper.xml index 504f666..c9f351c 100644 --- a/cmvr-iot-aima/src/main/resources/mapper/aima/AimaTestLogMapper.xml +++ b/cmvr-iot-aima/src/main/resources/mapper/aima/AimaTestLogMapper.xml @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - select id, create_by, create_time, update_by, update_time, remark, task_instance_id, task_id, task_name, test_case_id, case_name, log_level, log_type, log_message, log_time, execution_step, actual_result, test_status, screenshot_url, video_url, error_stack, duration_ms,progress,status from aima_test_log + select id, create_by, create_time, update_by, update_time, remark, task_instance_id, task_id, task_name, test_case_id, case_name, log_level, log_type, log_content, log_time, execution_step, actual_result, test_status, screenshot_url, video_url, error_stack, duration_ms,progress,status from aima_test_log