feat: new api
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package org.dromara.inspection.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
@@ -69,6 +70,7 @@ public class ArExecutionController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("inspection:execution:query")
|
||||
@GetMapping("/{id}")
|
||||
@SaIgnore
|
||||
public R<ArExecutionDetailVo> getInfo(@NotNull(message = "执行ID不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
return R.ok(arExecutionService.queryDetailById(id));
|
||||
@@ -102,6 +104,7 @@ public class ArExecutionController extends BaseController {
|
||||
@SaCheckPermission("inspection:execution:submit")
|
||||
@Log(title = "提交任务执行结果", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit
|
||||
@SaIgnore
|
||||
@PostMapping("/submit")
|
||||
public R<Void> submit(@Validated @RequestBody ArExecutionSubmitBo bo) {
|
||||
return toAjax(arExecutionService.submitExecution(bo));
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package org.dromara.inspection.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
@@ -46,7 +45,6 @@ public class ArStepRecordController extends BaseController {
|
||||
* 查询步骤执行记录列表
|
||||
*/
|
||||
|
||||
@SaIgnore
|
||||
@SaCheckPermission("inspection:stepRecord:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<ArStepRecordVo> list(@Validated(QueryGroup.class) ArStepRecordBo bo, PageQuery pageQuery) {
|
||||
@@ -71,7 +69,6 @@ public class ArStepRecordController extends BaseController {
|
||||
*/
|
||||
@SaCheckPermission("inspection:stepRecord:query")
|
||||
@GetMapping("/{id}")
|
||||
@SaIgnore
|
||||
public R<ArStepRecordVo> getInfo(@NotNull(message = "记录ID不能为空")
|
||||
@PathVariable("id") Long id) {
|
||||
return R.ok(arStepRecordService.queryById(id));
|
||||
@@ -95,7 +92,6 @@ public class ArStepRecordController extends BaseController {
|
||||
@Log(title = "步骤执行记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit
|
||||
@PutMapping()
|
||||
@SaIgnore
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ArStepRecordBo bo) {
|
||||
return toAjax(arStepRecordService.updateByBo(bo));
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
package org.dromara.inspection.domain.vo;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 步骤执行记录树形视图对象
|
||||
@@ -14,12 +15,130 @@ import java.util.List;
|
||||
* @date 2025-01-13
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ArStepRecordTreeVo extends ArStepTreeVo {
|
||||
public class ArStepRecordTreeVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
// ========== 步骤模板信息(来自 ar_step) ==========
|
||||
|
||||
/**
|
||||
* 步骤ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 所属任务ID
|
||||
*/
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 父步骤ID(0为顶级)
|
||||
*/
|
||||
private Long parentId;
|
||||
|
||||
/**
|
||||
* 祖级列表
|
||||
*/
|
||||
private String ancestors;
|
||||
|
||||
/**
|
||||
* 步骤名称
|
||||
*/
|
||||
private String stepName;
|
||||
|
||||
/**
|
||||
* 步骤内容描述
|
||||
*/
|
||||
private String stepContent;
|
||||
|
||||
/**
|
||||
* 步骤语音文本
|
||||
*/
|
||||
private String contentVoice;
|
||||
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
private Integer orderNum;
|
||||
|
||||
/**
|
||||
* 关联点位ID
|
||||
*/
|
||||
private Long pointId;
|
||||
|
||||
/**
|
||||
* 需要语音朗读(0否 1是)
|
||||
*/
|
||||
private String needVoiceRead;
|
||||
|
||||
/**
|
||||
* 需要用户复述(0否 1是)
|
||||
*/
|
||||
private String needVoiceRephrase;
|
||||
|
||||
/**
|
||||
* 复述提示文本
|
||||
*/
|
||||
private String rephraseContent;
|
||||
|
||||
/**
|
||||
* 复述语音文本
|
||||
*/
|
||||
private String rephraseVoice;
|
||||
|
||||
/**
|
||||
* 需要确认(0否 1是)
|
||||
*/
|
||||
private String needVoiceConfirm;
|
||||
|
||||
/**
|
||||
* 确认提示文本
|
||||
*/
|
||||
private String confirmContent;
|
||||
|
||||
/**
|
||||
* 确认语音文本
|
||||
*/
|
||||
private String confirmVoice;
|
||||
|
||||
/**
|
||||
* 确认词
|
||||
*/
|
||||
private String confirmWord;
|
||||
|
||||
/**
|
||||
* 需要AI识别(0否 1是)
|
||||
*/
|
||||
private String needAi;
|
||||
|
||||
/**
|
||||
* AI目标名称
|
||||
*/
|
||||
private String aiTargetName;
|
||||
|
||||
/**
|
||||
* AI配置数据(预留)
|
||||
*/
|
||||
private Map<String, Object> aiData;
|
||||
|
||||
/**
|
||||
* 是否操作步骤(0否 1是)
|
||||
*/
|
||||
private String isOperation;
|
||||
|
||||
/**
|
||||
* 是否叶子节点(0否 1是)
|
||||
*/
|
||||
private String isLeaf;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
// ========== 执行记录信息(来自 ar_step_record) ==========
|
||||
|
||||
/**
|
||||
* 执行记录ID
|
||||
*/
|
||||
@@ -75,6 +194,8 @@ public class ArStepRecordTreeVo extends ArStepTreeVo {
|
||||
*/
|
||||
private String executorName;
|
||||
|
||||
// ========== 树形结构 ==========
|
||||
|
||||
/**
|
||||
* 子步骤列表
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user