From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java | 60 ++++++++++++++++--------------------------------------------
1 files changed, 16 insertions(+), 44 deletions(-)
diff --git a/drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java b/drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java
index 1f19879..d60e98e 100644
--- a/drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java
+++ b/drone-ops-api/drone-resource-api/src/main/java/org/sxkj/resource/entity/Attach.java
@@ -4,17 +4,16 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.util.StringUtils;
-import org.sxkj.common.constant.CommonConstant;
+import org.sxkj.common.handler.GenericListTypeHandler;
import org.sxkj.common.utils.file.FileNameHarsher;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Stream;
@@ -27,24 +26,24 @@
@Data
@TableName(value = "blade_attach")
@EqualsAndHashCode(callSuper = true)
-//@ApiModel(value = "Attach对象", description = "附件表")
+@ApiModel(value = "Attach对象", description = "附件表")
public class Attach extends TenantEntity {
/**
* ai类型
*/
- public static final Integer RESULT_TYPE_AI = 2;
+ public static final String RESULT_TYPE_AI = "2";
/**
* 图片类型
*/
- public static final Integer RESULT_TYPE_IMG = 0;
+ public static final String RESULT_TYPE_IMG = "0";
/**
* 视频类型(压缩)
*/
- public static final Integer RESULT_TYPE_VEDIO_SHOW = 9;
+ public static final String RESULT_TYPE_VEDIO_SHOW = "9";
/**
* 视频类型
*/
- public static final Integer RESULT_TYPE_VEDIO = 1;
+ public static final String RESULT_TYPE_VEDIO = "1";
private static final long serialVersionUID = 1L;
@@ -79,13 +78,13 @@
@ApiModelProperty(value = "附件大小")
private Long attachSize;
+ @ApiModelProperty(value = "巡查任务id")
+ @TableField(value = "patrol_task_id")
+ private String patrolTaskId;
- @ApiModelProperty(value = "任务id")
- @TableField(value = "wayline_job_id")
- private String wayLineJobId;
-
- @ApiModelProperty(value = "成果类型：0图片，1=视频，2=ai,3=三维，4=正射,5=全景, 6=图片压缩小(后缀small)，7=图片压缩中（后缀show），8视频一帧图，9视频压缩，10ai压缩小，11ai压缩中,12水印,13 倾斜，14 工单上传,15精准复拍")
- private Integer resultType;
+ @ApiModelProperty(value = "附件类型： 1=巡查类文档，2=巡检类文档,3=安保类文档，4=文旅类文档,5=采集数据类文档")
+ @TableField(typeHandler = GenericListTypeHandler.class)
+ private List<List<String>> resultType;
@ApiModelProperty(value = "设备SN")
private String deviceSn;
@@ -102,46 +101,19 @@
@ApiModelProperty(value = "文件昵称")
private String nickName;
- //区域
- @TableField(exist = false)
- private String areaCode;
- @TableField(exist = false)
- private List<String> wayLineJobIds;
-
- /**
- * 是否缩略图 0=原图 1=缩略图
- */
- @TableField(value = "is_thumbnail")
- private Boolean thumbnail;
/**
* 最末尾文件名称hash算法
*/
@TableField("md5")
private String md5;
- private Double longitude;
- private Double latitude;
- /**
- * 是否生成过ai 图 0 =未生成过 1=已生成过
- */
- private Integer isGenerateAiImg;
@TableField("is_deleted")
private Integer isDeleted;
- @ApiModelProperty(value = "媒体类型：0 可见光 1 红外")
- @TableField("media_category")
- private Integer mediaCategory;
-
- @ApiModelProperty(value = "媒体创建时间")
- @TableField("media_create_time")
- @JsonFormat(pattern = CommonConstant.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
- private LocalDateTime mediaCreateTime;
-
- @ApiModelProperty(value = "变化监测标识（0：否，1：是）")
- @TableField("is_change_monitor")
- private Integer isChangeMonitor;
-
+ //区域
+ @TableField(exist = false)
+ private String areaCode;
public String getMd5() {
String link = this.link;
--
Gitblit v1.9.3