From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Wed, 05 Aug 2026 14:09:29 +0800 Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误 --- drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 11 deletions(-) diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java index 182dd76..ab3f4b9 100644 --- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java +++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdClueEventEntity.java @@ -17,11 +17,13 @@ package org.sxkj.gd.workorder.entity; 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.mp.base.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -51,31 +53,65 @@ * 工单处置人 */ @ApiModelProperty(value = "工单处置人") - private String disposeUser; + private Long disposeUser; /** * 处置部门 */ @ApiModelProperty(value = "处置部门") - private String disposeDept; + private Long disposeDept; /** - * 分发时间 + * 经度 */ - @ApiModelProperty(value = "分发时间") - private Date distributeTime; + @ApiModelProperty(value = "经度") + private Double longitude; /** - * 工单位置(经纬度) + * 纬度 */ - @ApiModelProperty(value = "工单位置(经纬度)") - private byte[] workOrderLocation; + @ApiModelProperty(value = "纬度") + private Double latitude; /** - * 状态:0未知、1已分发、2已驳回 + * 状态:0待确认、1处置中、2已退回、3已处置、4已完成 */ - @ApiModelProperty(value = "状态:0未知、1已分发、2已驳回") - private Byte eventStatus; + @ApiModelProperty(value = "状态:0待确认、1处置中、2已退回、3已处置、4已完成") + private Integer eventStatus; /** * 区域编码 */ @ApiModelProperty(value = "区域编码") private String areaCode; + /** + * 事件编号 + */ + @ApiModelProperty(value = "事件编号") + private String eventNum; + /** + * 事件名称 + */ + @ApiModelProperty(value = "事件名称") + private String eventName; + + /** + * 附件类型:1媒体文件; 2ai文件; 3主视频 + */ + @ApiModelProperty(value = "附件类型:1媒体文件; 2ai文件; 3主视频 4视频文件mp4") + private Integer attachmentType; + /** + * 附件URL + */ + @ApiModelProperty(value = "附件URL") + private String attachUrl; + /** + * AI图片的画框数据 + */ + @ApiModelProperty(value = "AI图片的画框数据") + private String geojson; + + /** + * 拍摄时间 + */ + @ApiModelProperty(value = "拍摄时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date shootTime; } -- Gitblit v1.9.3