diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/bo/BaseEntity.java b/pqs-common/common-db/src/main/java/com/njcn/db/bo/BaseEntity.java index 2fd1b3ac6..e48e2cfe7 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/bo/BaseEntity.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/bo/BaseEntity.java @@ -3,6 +3,10 @@ package com.njcn.db.bo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import lombok.Data; import java.time.LocalDateTime; @@ -29,6 +33,8 @@ public class BaseEntity { */ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime createTime; /** @@ -42,6 +48,8 @@ public class BaseEntity { */ @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonDeserialize(using = LocalDateTimeDeserializer.class) + @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime updateTime; } diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppAutoDataMessageTemplate.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppAutoDataMessageTemplate.java index 10cf0edb0..9d3323e0d 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppAutoDataMessageTemplate.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/template/AppAutoDataMessageTemplate.java @@ -22,6 +22,7 @@ public class AppAutoDataMessageTemplate extends RocketMQEnhanceTemplate { } public SendResult sendMember(AppAutoDataMessage appAutoDataMessage) { + appAutoDataMessage.setSource("APP-AUTO-DATA"); return send(BusinessTopic.NJCJ_APP_AUTO_DATA_TOPIC, "CREATE", appAutoDataMessage); } } 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 new file mode 100644 index 000000000..7ec1eb4e6 --- /dev/null +++ b/pqs-common/common-redis/src/main/java/com/njcn/redis/pojo/enums/AppRedisKey.java @@ -0,0 +1,44 @@ +package com.njcn.redis.pojo.enums; + +/** + * 类的介绍: + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/8/16 16:22 + */ + +public interface AppRedisKey { + + /** + * 设备模板前缀 + */ + String MODEL = "MODEL"; + + + /** + * 监测点模板前缀 + */ + String LINE = "LINE"; + + /** + * 设备软件信息前缀 + */ + String SOFTINFO = "SOFTINFO"; + + /** + * 电能质量监测点详细数据 + */ + String LINE_DATA = "LINEDATA"; + + /** + * 指标字典和influxDB表名数据 + */ + String ELE_EPD_PQD = "ELEEPDPQD"; + + /** + * 监测点位置数据 + */ + String LINE_POSITION = "LINEPOSITION"; + +} diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java index 94fcfbeef..db99e7ab3 100644 --- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java +++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java @@ -72,7 +72,9 @@ public class Knife4jSwaggerConfig { "com.njcn.csharmonic.controller", "com.njcn.cssystem.controller", "com.njcn.advance.controller", - "com.njcn.access.controller" + "com.njcn.stat.controller", + "com.njcn.rt.controller", + "com.njcn.zlevent.controller" ) .collect(Collectors.toList()); List grantTypes = new ArrayList<>(); 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 1318498f7..2189ecccd 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 @@ -156,4 +156,9 @@ public interface InfluxDBTableConstant { */ String IS_ABNORMAL = "is_abnormal"; + /** + * 逻辑子设备id + */ + String CL_DID = "cl_did"; + }