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-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java
index 6c19372..37f1e4b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/entity/FwTaskScheduleEntity.java
@@ -17,23 +17,98 @@
package org.sxkj.fw.detection.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableField;
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.mp.base.BaseEntity;
+
+import java.util.Date;
/**
* 任务调度记录表 实体类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Data
@TableName("ja_fw_task_schedule")
@ApiModel(value = "FwTaskSchedule对象", description = "任务调度记录表")
@EqualsAndHashCode(callSuper = true)
-public class FwTaskScheduleEntity extends TenantEntity {
+public class FwTaskScheduleEntity extends BaseEntity {
+ /**
+ * 设备ID（ja_fw_device.id）
+ */
+ @TableField("device_id")
+ @ApiModelProperty(value = "设备ID（ja_fw_device.id）")
+ private Long deviceId;
+ /**
+ * 关联区域ID
+ */
+ @TableField("area_divide_id")
+ @ApiModelProperty(value = "关联区域ID")
+ private Long areaDivideId;
+ /**
+ * 关联场景ID
+ */
+ @TableField("defense_scene_id")
+ @ApiModelProperty(value = "关联场景ID")
+ private Long defenseSceneId;
+ /**
+ * 调度经度
+ */
+ @TableField("longitude")
+ @ApiModelProperty(value = "调度经度")
+ private Double longitude;
+ /**
+ * 调度纬度
+ */
+ @TableField("latitude")
+ @ApiModelProperty(value = "调度纬度")
+ private Double latitude;
+ /**
+ * 调度人员
+ */
+ @TableField("dispatch_user")
+ @ApiModelProperty(value = "调度人员")
+ private String dispatchUser;
+ /**
+ * 调度日期-开始
+ */
+ @TableField("dispatch_start_time")
+ @ApiModelProperty(value = "调度日期-开始")
+ private Date dispatchStartTime;
+ /**
+ * 调度日期-结束
+ */
+ @TableField("dispatch_end_time")
+ @ApiModelProperty(value = "调度日期-结束")
+ private Date dispatchEndTime;
+ /**
+ * 调度内容
+ */
+ @TableField("dispatch_content")
+ @ApiModelProperty(value = "调度内容")
+ private String dispatchContent;
+ /**
+ * 调度结果
+ */
+ @TableField("dispatch_result")
+ @ApiModelProperty(value = "调度结果")
+ private String dispatchResult;
+ /**
+ * 处置措施
+ */
+ @TableField("dispose_measure")
+ @ApiModelProperty(value = "处置措施")
+ private String disposeMeasure;
+ /**
+ * 区域编码
+ */
+ @TableField("area_code")
+ @ApiModelProperty(value = "区域编码")
+ private String areaCode;
}
--
Gitblit v1.9.3