diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateDeserializer.java b/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateDeserializer.java deleted file mode 100644 index 4695e4b25..000000000 --- a/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateDeserializer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.njcn.common.utils.serializer; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.njcn.common.utils.PubUtils; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.time.Instant; - -/** - * @author hongawen - * @version 1.0.0 - * @date 2023年07月24日 13:33 - */ -@Component -public class InstantDateDeserializer extends StdDeserializer { - - - public InstantDateDeserializer() { - this(null); - } - - - protected InstantDateDeserializer(Class vc) { - super(vc); - } - - - @Override - public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException { - String text = p.getValueAsString(); - return PubUtils.dateToInstant(DateUtil.parse(text,DatePattern.NORM_DATETIME_PATTERN)); - } -} diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateSerializer.java b/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateSerializer.java deleted file mode 100644 index 369af0e3c..000000000 --- a/pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateSerializer.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.njcn.common.utils.serializer; - -import cn.hutool.core.date.DatePattern; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.time.Instant; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; - - -/** - * @author hongawen - * @version 1.0.0 - * @date 2023年04月25日 16:33 - */ -@Component -public class InstantDateSerializer extends StdSerializer { - - private static final long serialVersionUID = 1L; - - private static DateTimeFormatter format = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN); - - public InstantDateSerializer() { - this(null); - } - - public InstantDateSerializer(Class t) { - super(t); - } - - /*** - * 转义为 yyyy-MM-dd HH:mm:ss - * @author hongawen - */ - @Override - public void serialize(Instant instant, JsonGenerator jsonGenerator, SerializerProvider provider) - throws IOException { - if (instant == null) { - return; - } - String jsonValue = format.format(instant.atZone(ZoneId.of("+00:00"))); - jsonGenerator.writeString(jsonValue); - } -} \ No newline at end of file diff --git a/pqs-common/common-db/src/main/java/com/njcn/db/handler/AutoFillValueHandler.java b/pqs-common/common-db/src/main/java/com/njcn/db/handler/AutoFillValueHandler.java index 7d33a1cac..cd5792a3c 100644 --- a/pqs-common/common-db/src/main/java/com/njcn/db/handler/AutoFillValueHandler.java +++ b/pqs-common/common-db/src/main/java/com/njcn/db/handler/AutoFillValueHandler.java @@ -1,11 +1,8 @@ package com.njcn.db.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.njcn.common.pojo.constant.LogInfo; import com.njcn.web.utils.RequestUtil; -import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; import java.time.LocalDateTime; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java index 292017757..406a5c214 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.File; +import java.io.IOException; import java.util.List; import java.util.Objects; @@ -290,6 +291,21 @@ public class PmsMonitorController extends BaseController { } + public static void main(String[] args) throws IOException { + try { + // 创建一个临时文件,前缀为"temp_",后缀为".txt",存储在默认的临时文件夹中 + File tempFile = File.createTempFile("temp_", ".txt"); + + // 输出临时文件的路径 + System.out.println("临时文件路径: " + tempFile.getAbsolutePath()); + + // 关闭临时文件,以便系统自动删除它 + tempFile.deleteOnExit(); + } catch (IOException e) { + e.printStackTrace(); + } + } + diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java index fc3c897e6..dc01db6a5 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java @@ -1,7 +1,7 @@ package com.njcn.device.pq.pojo.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitTarget.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitTarget.java index 9d8d5c69c..4b0bb59c0 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitTarget.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/LimitTarget.java @@ -1,7 +1,7 @@ package com.njcn.harmonic.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-harmonic/harmonic-boot/pom.xml b/pqs-harmonic/harmonic-boot/pom.xml index eae5879d4..4bcdbb30b 100644 --- a/pqs-harmonic/harmonic-boot/pom.xml +++ b/pqs-harmonic/harmonic-boot/pom.xml @@ -58,6 +58,13 @@ common-oss ${project.version} + + + + com.baomidou + dynamic-datasource-spring-boot-starter + 3.5.1 + diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java index 51683e75c..3cb8c6a3e 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/HarmonicHistoryData.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.bo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java index 35b2fac32..891fa18a4 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/MeasurementCount.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.bo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java index 6b9537486..e9d1ffa66 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/bo/StatisticsResult.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.bo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import java.io.Serializable; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java index 4a85f7fd8..14d2fdcd3 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/HarmData.java @@ -2,8 +2,8 @@ package com.njcn.influx.pojo.dto; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateDeserializer; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateDeserializer; +import com.njcn.influx.utils.InstantDateSerializer; import com.njcn.influx.ano.IgnoreData; import lombok.Data; import org.influxdb.annotation.Column; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java index 9dd5f6195..066ae65cb 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/dto/StatisticalDataDTO.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.dto; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java index 0c34918c5..25903cf15 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/CldStatisFlow.java @@ -2,7 +2,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java index 513e7fec2..9131c8ceb 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java index e06319e18..c5655cf58 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFluc.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java index 79c7acb63..6c16d5ba2 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java index f699f52a4..af1d324a4 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java index b8ea20ed0..ab43018cc 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java index 06ab1e023..4cdd2c674 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java index bfba31dd6..04b24794e 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java index f0bed816d..c3c1db8a3 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java index f660fe602..0596d9b13 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java index 0e894bc3d..9cb432fc9 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java index 682f476b2..f3cf9d448 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/HarmonicRatioData.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java index 3678a106d..fae85a1ef 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PowerQualityData.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java index 64f994288..a064f1d55 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/PqsCommunicate.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java index ad0251e82..a5116fe57 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/CsDataHarmPowerP.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.cs; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java index cd53957e6..abe41eee2 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/cs/EntData.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.cs; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java index 1c2df87b4..e2d682dd8 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFlicker.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java index 955af5f14..4c92e8eeb 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayFluc.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java index 1c4b98ed6..de971cb32 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicI.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java index 70b648952..c7eb5b46f 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPhasicV.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java index db9197aa0..36706a672 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerP.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java index ee1a3aecd..e87f15dd5 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerQ.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java index f926a3078..2cf1878af 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayHarmPowerS.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java index a8299d40a..606ede879 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayI.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java index cff9f5024..b07834fc6 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayPlt.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java index 3bb6cdba8..646652908 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/day/DayV.java @@ -1,7 +1,7 @@ package com.njcn.influx.pojo.po.day; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.njcn.common.utils.serializer.InstantDateSerializer; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Resinformation.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Resinformation.java index 70c8dde7d..8260442bf 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Resinformation.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/Resinformation.java @@ -1,6 +1,7 @@ package com.njcn.system.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data;