feat(watch): listCustom 接口与导出增加 eventId、locateTime 字段
1. AbnormalEvent 新增 eventId、locateTime 字段 2. listCustom/largeScreenListCustom/listCustomForMap 三个接口返回新字段 3. 导出 Excel 通过 @Excel 注解自动支持新字段(顺序 12、13) 4. locateTime 时间格式化为 yyyy-MM-dd HH:mm:ss 5. 修正 createMonitorData 中遗漏的 eventId 与 locateTime 字段赋值 6. DDL 表名修正为 QH_WAT_MONITOR_DATA(项目实际表名)
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
-- WATCH_MONITOR_DATA 新增 EVENT_ID(事件ID)和 LOCATE_TIME(定位时间)字段
|
-- QH_WAT_MONITOR_DATA 新增 EVENT_ID(事件ID)和 LOCATE_TIME(定位时间)字段
|
||||||
-- 数据库:118-DM 达梦数据库,SQL 全大写规范
|
-- 数据库:118-DM 达梦数据库,SQL 全大写规范
|
||||||
ALTER TABLE "WATCH_MONITOR_DATA" ADD "EVENT_ID" VARCHAR(64) DEFAULT NULL;
|
ALTER TABLE "QH_WAT_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 "LOCATE_TIME" DATETIME DEFAULT NULL;
|
||||||
|
|
||||||
COMMENT ON COLUMN "WATCH_MONITOR_DATA"."EVENT_ID" IS '事件ID';
|
COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."EVENT_ID" IS '事件ID';
|
||||||
COMMENT ON COLUMN "WATCH_MONITOR_DATA"."LOCATE_TIME" IS '定位时间';
|
COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."LOCATE_TIME" IS '定位时间';
|
||||||
|
|
||||||
CREATE INDEX "IDX_EVENT_ID" ON "WATCH_MONITOR_DATA"("EVENT_ID");
|
CREATE INDEX "IDX_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("EVENT_ID");
|
||||||
CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "WATCH_MONITOR_DATA"("WATCH_NO", "EVENT_ID");
|
CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("WATCH_NO", "EVENT_ID");
|
||||||
+14
@@ -52,4 +52,18 @@ public class AbnormalEvent extends BaseUser {
|
|||||||
private Date bindDate;
|
private Date bindDate;
|
||||||
@Schema(title = "重点指标用户(0:非重点指标用户 1:大病异常 2:慢病异常 3:指标异常)")
|
@Schema(title = "重点指标用户(0:非重点指标用户 1:大病异常 2:慢病异常 3:指标异常)")
|
||||||
private List<WatchKeyUser> keyUserList;
|
private List<WatchKeyUser> 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;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -375,7 +375,9 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
|
|||||||
monitorDataEntity.setWatchNo(data.getWatchNo());
|
monitorDataEntity.setWatchNo(data.getWatchNo());
|
||||||
monitorDataEntity.setLon(data.getLon());
|
monitorDataEntity.setLon(data.getLon());
|
||||||
monitorDataEntity.setLat(data.getLat());
|
monitorDataEntity.setLat(data.getLat());
|
||||||
|
monitorDataEntity.setLocateTime(data.getLocateTime());
|
||||||
monitorDataEntity.setEventType(data.getEventType());
|
monitorDataEntity.setEventType(data.getEventType());
|
||||||
|
monitorDataEntity.setEventId(data.getEventId());
|
||||||
monitorDataEntity.setDataValue(data.getDataValue());
|
monitorDataEntity.setDataValue(data.getDataValue());
|
||||||
monitorDataEntity.setCreateDate(data.getCreateTime());
|
monitorDataEntity.setCreateDate(data.getCreateTime());
|
||||||
monitorDataEntity.setWarnTime(data.getWarnTime());
|
monitorDataEntity.setWarnTime(data.getWarnTime());
|
||||||
|
|||||||
Reference in New Issue
Block a user