diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java index df11d563b..74db14224 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java @@ -1,5 +1,6 @@ package com.njcn.mq.message; +import com.google.gson.annotations.SerializedName; import com.njcn.middle.rocket.domain.BaseMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -60,6 +61,9 @@ public class AppEventMessage extends BaseMessage { @ApiModelProperty("事件类型") private String type; + @ApiModelProperty("告警故障编码(一般显示为Hex)") + private String code; + private List param; } diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java index c05bac26d..2b2d2688a 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppFileMessage.java @@ -40,6 +40,14 @@ public class AppFileMessage extends BaseMessage { private String data; private String name; + + private Integer frameCurr; + + private Integer frameTotal; + + private Integer frameLen; + + private Integer offset; } @Data diff --git a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java index accd3a1c1..46f78b75d 100644 --- a/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java +++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java @@ -58,4 +58,20 @@ public interface AppRedisKey { */ String FILE_PART="filePartKey:"; + /** + * 文件分片信息接收超时时间 + */ + String FILE_PART_TIME="filePartTimeKey:"; + + /** + * 文件分片信息缺失 + */ + String FILE_PART_MISSING="filePartMissingKey:"; + + + /** + * 文件等待处理时间 + */ + String FILE_WAITING="fileWaitingKey:"; + } diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java index 6e214aebd..7a015fb3d 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java @@ -167,6 +167,11 @@ public interface InfluxDBTableConstant { */ String UUID = "uuid"; + /** + * 流程(1:设备登记,2:功能调试,3:出厂调试 4:设备投运) + */ + String process = "process"; + /** * 报表业务计算方式 */