diff --git a/db/updatesql/20260903-watch_monitor_data新增字段.sql b/db/updatesql/20260903-watch_monitor_data新增字段.sql index 35f2c09..bb38e87 100644 --- a/db/updatesql/20260903-watch_monitor_data新增字段.sql +++ b/db/updatesql/20260903-watch_monitor_data新增字段.sql @@ -1,10 +1,10 @@ --- WATCH_MONITOR_DATA 新增 EVENT_ID(事件ID)和 LOCATE_TIME(定位时间)字段 +-- QH_WAT_MONITOR_DATA 新增 EVENT_ID(事件ID)和 LOCATE_TIME(定位时间)字段 -- 数据库:118-DM 达梦数据库,SQL 全大写规范 -ALTER TABLE "WATCH_MONITOR_DATA" ADD "EVENT_ID" VARCHAR(64) DEFAULT NULL; -ALTER TABLE "WATCH_MONITOR_DATA" ADD "LOCATE_TIME" DATETIME DEFAULT NULL; +ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "EVENT_ID" VARCHAR(64) DEFAULT NULL; +ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "LOCATE_TIME" DATETIME DEFAULT NULL; -COMMENT ON COLUMN "WATCH_MONITOR_DATA"."EVENT_ID" IS '事件ID'; -COMMENT ON COLUMN "WATCH_MONITOR_DATA"."LOCATE_TIME" IS '定位时间'; +COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."EVENT_ID" IS '事件ID'; +COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."LOCATE_TIME" IS '定位时间'; -CREATE INDEX "IDX_EVENT_ID" ON "WATCH_MONITOR_DATA"("EVENT_ID"); -CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "WATCH_MONITOR_DATA"("WATCH_NO", "EVENT_ID"); +CREATE INDEX "IDX_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("EVENT_ID"); +CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("WATCH_NO", "EVENT_ID"); \ No newline at end of file diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/response/AbnormalEvent.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/response/AbnormalEvent.java index 907c586..7d5d777 100644 --- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/response/AbnormalEvent.java +++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/response/AbnormalEvent.java @@ -52,4 +52,18 @@ public class AbnormalEvent extends BaseUser { private Date bindDate; @Schema(title = "重点指标用户(0:非重点指标用户 1:大病异常 2:慢病异常 3:指标异常)") private List keyUserList; + /** + * 事件ID(用于告警事件与GPS位置更新关联的唯一标识) + */ + @Excel(name = "事件ID", width = 32, orderNum = "12") + @Schema(title = "事件ID") + private String eventId; + /** + * 定位时间(手表定时上报的GPS定位时间) + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "定位时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13") + @Schema(title = "定位时间") + private Date locateTime; } diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java index a11662c..8c34442 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java @@ -375,7 +375,9 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl