eric/ar-inspection
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: fix build issue

Browse Source
This commit is contained in:
杨建宽
2025-11-28 18:10:29 +08:00
parent 44d55d2a6e
commit 398ab1b515
38 changed files with 5165 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArDeviceVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.inspection.domain.ArDevice;
@@ -55,7 +57,8 @@ public class ArDeviceVo implements Serializable {
/**
* 状态(0启用 1停用)
*/
@ExcelProperty(value = "状态", readConverterExp = "0=启用,1=停用")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=启用,1=停用")
private String status;
/**

5
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArExecutionVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.inspection.domain.ArExecution;
@@ -120,7 +122,8 @@ public class ArExecutionVo implements Serializable {
/**
* 状态
*/
@ExcelProperty(value = "状态", readConverterExp = "pending=待执行,in_progress=执行中,completed=已完成,cancelled=已取消")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "pending=待执行,in_progress=执行中,completed=已完成,cancelled=已取消")
private String status;
/**

5
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArRegionVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.inspection.domain.ArRegion;
@@ -54,7 +56,8 @@ public class ArRegionVo implements Serializable {
/**
* 状态(0正常 1停用)
*/
@ExcelProperty(value = "状态", readConverterExp = "0=正常,1=停用")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
/**

5
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArStepMediaVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.inspection.domain.ArStepMedia;
@@ -40,7 +42,8 @@ public class ArStepMediaVo implements Serializable {
/**
* 媒体类型
*/
@ExcelProperty(value = "媒体类型", readConverterExp = "image=图片,video=视频,audio=音频")
@ExcelProperty(value = "媒体类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "image=图片,video=视频,audio=音频")
private String mediaType;
/**

8
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArStepRecordVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.inspection.domain.ArStepRecord;
@@ -48,13 +50,15 @@ public class ArStepRecordVo implements Serializable {
/**
* 状态
*/
@ExcelProperty(value = "状态", readConverterExp = "pending=待执行,completed=已完成,skipped=已跳过")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "pending=待执行,completed=已完成,skipped=已跳过")
private String status;
/**
* 是否完成
*/
@ExcelProperty(value = "是否完成", readConverterExp = "0=否,1=是")
@ExcelProperty(value = "是否完成", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=否,1=是")
private String isDone;
/**

5
ruoyi-modules/ruoyi-inspection/src/main/java/org/dromara/inspection/domain/vo/ArTaskVo.java
View File

@@ -3,6 +3,8 @@ package org.dromara.inspection.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import cn.idev.excel.annotation.format.DateTimeFormat;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.inspection.domain.ArTask;
@@ -60,7 +62,8 @@ public class ArTaskVo implements Serializable {
/**
* 状态(0正常 1停用)
*/
@ExcelProperty(value = "状态", readConverterExp = "0=正常,1=停用")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
/**