代码调整

pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateDeserializer.java

@@ -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<Instant> {
-
-
-    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));
-    }
-}

pqs-common/common-core/src/main/java/com/njcn/common/utils/serializer/InstantDateSerializer.java

@@ -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<Instant> {
-
-    private static final long serialVersionUID = 1L;
-
-    private static DateTimeFormatter format = DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN);
-
-    public InstantDateSerializer() {
-        this(null);
-    }
-
-    public InstantDateSerializer(Class<Instant> 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);
-    }
-}

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;
 

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();
+        }
+    }
+
 
 
 

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;
 

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;

pqs-harmonic/harmonic-boot/pom.xml

@@ -58,6 +58,13 @@
             <artifactId>common-oss</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <!-- 多数据源切换，当数据源为oracle时需要使用 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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;
 

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;

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;

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.influx.utils.InstantDateDeserializer;
-import com.njcn.common.utils.serializer.InstantDateSerializer;
+import com.njcn.influx.utils.InstantDateSerializer;
 import com.njcn.influx.ano.IgnoreData;
 import lombok.Data;
 import org.influxdb.annotation.Column;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;