diff --git a/influx-data/influx-source/pom.xml b/influx-data/influx-source/pom.xml index 247f787..997cc58 100644 --- a/influx-data/influx-source/pom.xml +++ b/influx-data/influx-source/pom.xml @@ -99,6 +99,12 @@ 1.0.0 + + org.apache.commons + commons-collections4 + 4.4 + + \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicI.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicI.java index ef18e17..9a5fd6f 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicI.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicI.java @@ -23,7 +23,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmphasic_i") -public class InfluxDBDataHarmPhasicI { +public class InfluxDBDataHarmphasicI { @TimeColumn @Column(name = "time",tag = true) @@ -193,14 +193,14 @@ public class InfluxDBDataHarmPhasicI { private Float i50; - public static List oralceToInfluxDB(DataHarmphasicI dataHarmphasicI) { + public static List oralceToInfluxDB(DataHarmphasicI dataHarmphasicI) { if (dataHarmphasicI == null) { return null; } - List influxDBDataHarmPhasicIList = new ArrayList<>(); + List influxDBDataHarmPhasicIList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmPhasicI influxDBDataHarmPhasicI = new InfluxDBDataHarmPhasicI(); + InfluxDBDataHarmphasicI influxDBDataHarmPhasicI = new InfluxDBDataHarmphasicI(); Instant instant = dataHarmphasicI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicI.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicV.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicV.java index 6bf6f97..7077531 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPhasicV.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmphasicV.java @@ -2,7 +2,6 @@ package com.njcn.influx.bo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; -import com.njcn.oracle.bo.po.DataHarmphasicI; import com.njcn.oracle.bo.po.DataHarmphasicV; import lombok.Data; import org.influxdb.annotation.Column; @@ -25,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmphasic_v") -public class InfluxDBDataHarmPhasicV { +public class InfluxDBDataHarmphasicV { @TimeColumn @Column(name = "time",tag = true) @@ -194,14 +193,14 @@ public class InfluxDBDataHarmPhasicV { @Column(name = "v_50") private Float v50; - public static List oralceToInfluxDB(DataHarmphasicV dataHarmphasicV) { + public static List oralceToInfluxDB(DataHarmphasicV dataHarmphasicV) { if (dataHarmphasicV == null) { return null; } - List influxDBDataHarmPhasicVList = new ArrayList<>(); + List influxDBDataHarmPhasicVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmPhasicV influxDBDataHarmPhasicV = new InfluxDBDataHarmPhasicV(); + InfluxDBDataHarmphasicV influxDBDataHarmPhasicV = new InfluxDBDataHarmphasicV(); Instant instant = dataHarmphasicV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java index e493f29..e38fb55 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerP.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java @@ -3,7 +3,6 @@ package com.njcn.influx.bo.po; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; import com.njcn.oracle.bo.po.DataHarmpowerP; -import com.njcn.oracle.bo.po.DataHarmpowerP; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; @@ -25,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmpower_p") -public class InfluxDBDataHarmPowerP { +public class InfluxDBDataHarmpowerP { @TimeColumn @Column(name = "time",tag = true) @@ -203,14 +202,14 @@ public class InfluxDBDataHarmPowerP { @Column(name = "p_50") private Float p50; - public static List oralceToInfluxDB(DataHarmpowerP dataHarmpowerP) { + public static List oralceToInfluxDB(DataHarmpowerP dataHarmpowerP) { if (dataHarmpowerP == null) { return null; } - List influxDBDataHarmPhasicVList = new ArrayList<>(); + List influxDBDataHarmPhasicVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmPowerP influxDBDataHarmPhasicV = new InfluxDBDataHarmPowerP(); + InfluxDBDataHarmpowerP influxDBDataHarmPhasicV = new InfluxDBDataHarmpowerP(); Instant instant = dataHarmpowerP.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java index c3e726b..57e2f6c 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerQ.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java @@ -24,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmpower_q") -public class InfluxDBDataHarmPowerQ { +public class InfluxDBDataHarmpowerQ { @TimeColumn @Column(name = "time",tag = true) @@ -196,14 +196,14 @@ public class InfluxDBDataHarmPowerQ { @Column(name = "q_50") private Float q50; - public static List oralceToInfluxDB(DataHarmpowerQ dataHarmpowerQ) { + public static List oralceToInfluxDB(DataHarmpowerQ dataHarmpowerQ) { if (dataHarmpowerQ == null) { return null; } - List influxDBDataHarmPhasicVList = new ArrayList<>(); + List influxDBDataHarmPhasicVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmPowerQ influxDBDataHarmPhasicV = new InfluxDBDataHarmPowerQ(); + InfluxDBDataHarmpowerQ influxDBDataHarmPhasicV = new InfluxDBDataHarmpowerQ(); Instant instant = dataHarmpowerQ.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java index 6756d03..94a9264 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmPowerS.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java @@ -24,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmpower_s") -public class InfluxDBDataHarmPowerS { +public class InfluxDBDataHarmpowerS { @TimeColumn @Column(name = "time",tag = true) @@ -196,14 +196,14 @@ public class InfluxDBDataHarmPowerS { @Column(name = "s_50") private Float s50; - public static List oralceToInfluxDB(DataHarmpowerS dataHarmpowerS) { + public static List oralceToInfluxDB(DataHarmpowerS dataHarmpowerS) { if (dataHarmpowerS == null) { return null; } - List influxDBDataHarmPhasicVList = new ArrayList<>(); + List influxDBDataHarmPhasicVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmPowerS influxDBDataHarmPhasicV = new InfluxDBDataHarmPowerS(); + InfluxDBDataHarmpowerS influxDBDataHarmPhasicV = new InfluxDBDataHarmpowerS(); Instant instant = dataHarmpowerS.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateI.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateI.java index f4e7134..d3b2e38 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateI.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateI.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; import com.njcn.oracle.bo.po.DataHarmrateI; import lombok.Data; -import lombok.EqualsAndHashCode; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; import org.influxdb.annotation.TimeColumn; @@ -25,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmrate_i") -public class InfluxDBDataHarmRateI { +public class InfluxDBDataHarmrateI { @TimeColumn @Column(name = "time",tag = true) @JsonSerialize(using = InstantDateSerializer.class) @@ -193,14 +192,14 @@ public class InfluxDBDataHarmRateI { @Column(name = "i_50") private Float i50; - public static List oralceToInfluxDB(DataHarmrateI dataHarmrateI) { + public static List oralceToInfluxDB(DataHarmrateI dataHarmrateI) { if (dataHarmrateI == null) { return null; } - List influxDBDataHarmRateIList = new ArrayList<>(); + List influxDBDataHarmRateIList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmRateI influxDBDataHarmRateI = new InfluxDBDataHarmRateI(); + InfluxDBDataHarmrateI influxDBDataHarmRateI = new InfluxDBDataHarmrateI(); Instant instant = dataHarmrateI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmRateI.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateV.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateV.java index c9e975b..dc5505c 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmRateV.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmrateV.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; import com.njcn.oracle.bo.po.DataHarmrateV; import lombok.Data; -import lombok.EqualsAndHashCode; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; import org.influxdb.annotation.TimeColumn; @@ -25,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_harmrate_v") -public class InfluxDBDataHarmRateV { +public class InfluxDBDataHarmrateV { @TimeColumn @Column(name = "time",tag = true) @JsonSerialize(using = InstantDateSerializer.class) @@ -193,14 +192,14 @@ public class InfluxDBDataHarmRateV { @Column(name = "v_50") private Float v50; - public static List oralceToInfluxDB(DataHarmrateV dataHarmrateV) { + public static List oralceToInfluxDB(DataHarmrateV dataHarmrateV) { if (dataHarmrateV == null) { return null; } - List influxDBDataHarmRateVList = new ArrayList<>(); + List influxDBDataHarmRateVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataHarmRateV influxDBDataHarmRateV = new InfluxDBDataHarmRateV(); + InfluxDBDataHarmrateV influxDBDataHarmRateV = new InfluxDBDataHarmrateV(); Instant instant = dataHarmrateV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmRateV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmI.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmI.java index d675c46..5b41b77 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmI.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmI.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.influx.utils.InstantDateSerializer; import com.njcn.oracle.bo.po.DataInharmI; import lombok.Data; -import lombok.EqualsAndHashCode; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; import org.influxdb.annotation.TimeColumn; @@ -25,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_inharm_i") -public class InfluxDBDataInHarmI { +public class InfluxDBDataInharmI { @TimeColumn @Column(name = "time",tag = true) @@ -195,14 +194,14 @@ public class InfluxDBDataInHarmI { private Float i50; - public static List oralceToInfluxDB(DataInharmI dataInharmI) { + public static List oralceToInfluxDB(DataInharmI dataInharmI) { if (dataInharmI == null) { return null; } - List influxDBDataInHarmIList = new ArrayList<>(); + List influxDBDataInHarmIList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataInHarmI influxDBDataInHarmI = new InfluxDBDataInHarmI(); + InfluxDBDataInharmI influxDBDataInHarmI = new InfluxDBDataInharmI(); Instant instant = dataInharmI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataInHarmI.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmV.java similarity index 98% rename from influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java rename to influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmV.java index 29a81a6..3d049cc 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInHarmV.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataInharmV.java @@ -24,7 +24,7 @@ import java.util.stream.Stream; */ @Data @Measurement(name = "data_inharm_v") -public class InfluxDBDataInHarmV { +public class InfluxDBDataInharmV { @Column(name = "time",tag =true) @TimeColumn @@ -193,14 +193,14 @@ public class InfluxDBDataInHarmV { @Column(name = "v_50") private Float v50; - public static List oralceToInfluxDB(DataInharmV dataInharmV) { + public static List oralceToInfluxDB(DataInharmV dataInharmV) { if (dataInharmV == null) { return null; } - List influxDBDataInHarmVList = new ArrayList<>(); + List influxDBDataInHarmVList = new ArrayList<>(); List valueTypeList = Stream.of("AVG", "MAX", "MIN", "CP95").collect(Collectors.toList()); for (String valueType : valueTypeList) { - InfluxDBDataInHarmV influxDBDataInHarmV = new InfluxDBDataInHarmV(); + InfluxDBDataInharmV influxDBDataInHarmV = new InfluxDBDataInharmV(); Instant instant = dataInharmV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataInHarmV.setTime(instant); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlickerMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlickerMapper.java new file mode 100644 index 0000000..8b9dff0 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlickerMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataFlicker; + +public interface InfluxDBDataFlickerMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlucMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlucMapper.java new file mode 100644 index 0000000..af7ddff --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataFlucMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataFluc; + +public interface InfluxDBDataFlucMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicIMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicIMapper.java new file mode 100644 index 0000000..7a799ec --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicIMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmphasicI; + +public interface InfluxDBDataHarmphasicIMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicVMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicVMapper.java new file mode 100644 index 0000000..e5c4850 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmphasicVMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmphasicV; + +public interface InfluxDBDataHarmphasicVMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerPMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerPMapper.java new file mode 100644 index 0000000..c61c14c --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerPMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmpowerP; + +public interface InfluxDBDataHarmpowerPMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerQMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerQMapper.java new file mode 100644 index 0000000..eb99fc3 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerQMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmpowerQ; + +public interface InfluxDBDataHarmpowerQMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerSMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerSMapper.java new file mode 100644 index 0000000..3827e03 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmpowerSMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmpowerS; + +public interface InfluxDBDataHarmpowerSMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateIMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateIMapper.java new file mode 100644 index 0000000..d289405 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateIMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmrateI; + +public interface InfluxDBDataHarmrateIMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateVMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateVMapper.java new file mode 100644 index 0000000..a2cdffc --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataHarmrateVMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataHarmrateV; + +public interface InfluxDBDataHarmrateVMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataIMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataIMapper.java new file mode 100644 index 0000000..e687e47 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataIMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataI; + +public interface InfluxDBDataIMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmIMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmIMapper.java new file mode 100644 index 0000000..3ac4e86 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmIMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataInharmI; + +public interface InfluxDBDataInharmIMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmVMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmVMapper.java new file mode 100644 index 0000000..405a250 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataInharmVMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataInharmV; + +public interface InfluxDBDataInharmVMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataPltMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataPltMapper.java new file mode 100644 index 0000000..3d1b4e3 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataPltMapper.java @@ -0,0 +1,7 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataPlt; + +public interface InfluxDBDataPltMapper extends InfluxDbBaseMapper { +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataVMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataVMapper.java new file mode 100644 index 0000000..6640051 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/imapper/InfluxDBDataVMapper.java @@ -0,0 +1,8 @@ +package com.njcn.influx.imapper; + +import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.InfluxDBDataV; + +public interface InfluxDBDataVMapper extends InfluxDbBaseMapper { + +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/InfluxDBBaseService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/InfluxDBBaseService.java index 6cd2f2d..5b7fba1 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/InfluxDBBaseService.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/InfluxDBBaseService.java @@ -19,6 +19,6 @@ public interface InfluxDBBaseService { * @param data 数据集合 * @param size 分片的尺寸 */ - void insertBatchBySlice(List data, int size); + void insertBatchBySlice(String tableName,List data, int size); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/InfluxDBBaseServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/InfluxDBBaseServiceImpl.java index be8acab..ab0811c 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/InfluxDBBaseServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/InfluxDBBaseServiceImpl.java @@ -1,12 +1,12 @@ package com.njcn.influx.service.impl; import cn.hutool.core.collection.ListUtil; +import cn.hutool.extra.spring.SpringUtil; +import com.njcn.influx.base.InfluxDbBaseMapper; import com.njcn.influx.service.InfluxDBBaseService; import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.ListUtils; import org.influxdb.InfluxDB; -import org.influxdb.annotation.Measurement; -import org.influxdb.dto.BatchPoints; -import org.influxdb.dto.Point; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -25,37 +25,55 @@ import java.util.List; public class InfluxDBBaseServiceImpl implements InfluxDBBaseService { private final InfluxDB influxDb; + + private final static String PACKAGE_PREFIX = "com.njcn.influx.imapper.InfluxDB"; + private final static String PACKAGE_SUFFIX = "Mapper"; + @Value("${spring.influx.database}") - private String database; + private String database; + @Override - public void insertBatchBySlice(List data, int size) { + public void insertBatchBySlice(String tableName, List data, int size) { int totalCount = data.size(); int idxLimit = Math.min(size, totalCount); - List> partition = ListUtil.partition(data, idxLimit); - partition.forEach(temp->{ - if (data.size() > 0) { - - Object firstObj = data.get(0); - Class domainClass = firstObj.getClass(); - List pointList = new ArrayList<>(); - for (Object o : data) { - Point point = Point - .measurementByPOJO(domainClass) - .addFieldsFromPOJO(o) - .build(); - pointList.add(point); - } - //获取数据库名和rp - Measurement measurement = firstObj.getClass().getAnnotation(Measurement.class); - String retentionPolicy = measurement.retentionPolicy(); - BatchPoints batchPoints = BatchPoints - .builder() - .points(pointList) - .retentionPolicy(retentionPolicy).build(); - influxDb.setDatabase(database); - influxDb.write(batchPoints); + List> partition = ListUtils.partition(data, idxLimit); + //根据表名找到mapper，执行批量插入 + InfluxDbBaseMapper mapper; + try { + mapper = (InfluxDbBaseMapper) SpringUtil.getBean(Class.forName(PACKAGE_PREFIX + tableName + PACKAGE_SUFFIX)); + System.out.println(PACKAGE_PREFIX + tableName + PACKAGE_SUFFIX); + for (List sliceList : partition) { + List sublistAsOriginalListType = new ArrayList<>(sliceList); + mapper.insertBatch(sublistAsOriginalListType); } - }); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } +// +// +// partition.forEach(temp -> { +// if (!data.isEmpty()) { +// Object firstObj = data.get(0); +// Class domainClass = firstObj.getClass(); +// List pointList = new ArrayList<>(); +// for (Object o : data) { +// Point point = Point +// .measurementByPOJO(domainClass) +// .addFieldsFromPOJO(o) +// .build(); +// pointList.add(point); +// } +// //获取数据库名和rp +// Measurement measurement = firstObj.getClass().getAnnotation(Measurement.class); +// String retentionPolicy = measurement.retentionPolicy(); +// BatchPoints batchPoints = BatchPoints +// .builder() +// .points(pointList) +// .retentionPolicy(retentionPolicy).build(); +// influxDb.setDatabase(database); +// influxDb.write(batchPoints); +// } +// }); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java index 3c5dfad..6848c54 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleToInfluxDBServiceImpl.java @@ -46,10 +46,12 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { private final static String PACKAGE_SUFFIX = "ServiceImpl"; private final JobDetailInfluxDBService jobDetailInfluxDBService; + private final InfluxDBBaseServiceImpl influxDBBaseService; @Value("${business.slice:2}") private int slice; + @Override @Async public void dataBacthSysc(DataAsynParam dataAsynParam) { @@ -96,39 +98,11 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { jobDetailInfluxDB.setTableName(tableName); jobDetailInfluxDB.setExcuteDate(date); jobDetailInfluxDB = jobDetailInfluxDBService.select(jobDetailInfluxDB); - if (Objects.nonNull(jobDetailInfluxDB)) { - if (jobDetailInfluxDB.getState() == 2 && i == 0 && size != 0) { - //第一片执行时返现是失败的，则再次执行 - jobDetailInfluxDB.setState(0); - jobDetailInfluxDB.setRowCount(size); - jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); - jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); - } else if (jobDetailInfluxDB.getState() == 0 && i > 0 && jobDetailInfluxDB.getRowCount() + size != 0) { - // 处理中，后续时间片的处理，累加记录数 - jobDetailInfluxDB.setState(0); - jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size); - jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); - jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); - } else { - System.gc(); - break; - } - } else { - if (size > 0) { - jobDetailInfluxDB = new JobDetailInfluxDB(); - jobDetailInfluxDB.setTableName(tableName); - jobDetailInfluxDB.setExcuteDate(date); - jobDetailInfluxDB.setState(0); - jobDetailInfluxDB.setRowCount(size); - jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); - jobDetailInfluxDBService.save(jobDetailInfluxDB); - } - } try { if (CollectionUtil.isNotEmpty(weakReferenceData.get())) { //执行目标库的数据处理 - Class clazz = null; - Class clazz2 = null; + Class clazz; + Class clazz2; //获取Table表对应的influxdb对应的表的实体类调用oralceToInfluxDB方法及oralceToInfluxDB的入参clazz2 try { clazz = Class.forName("com.njcn.influx.bo.po.InfluxDB" + tableName); @@ -138,28 +112,55 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { } Method method = null; try { - method = clazz.getDeclaredMethod("oralceToInfluxDB",clazz2); + method = clazz.getDeclaredMethod("oralceToInfluxDB", clazz2); } catch (NoSuchMethodException e) { throw new RuntimeException(e); } method.setAccessible(true); Method finalMethod = method; - List list1 =(List) weakReferenceData.get().stream().flatMap(po -> { + List list1 = (List) weakReferenceData.get().stream().flatMap(po -> { try { - - Object invoke = finalMethod.invoke(null,po); + Object invoke = finalMethod.invoke(null, po); Object invoke1 = invoke; - //返回oralce转inflaux，flicker等表是1-1，还有1-4，这是判断返回是否是集合如何是集合继续扁平化 + //返回oracle转influx，flicker等表是1-1，还有1-4，这是判断返回是否是集合如何是集合继续扁平化 return invoke1 instanceof List ? ((List) invoke1).stream() : Stream.of(invoke1); } catch (Exception e) { throw new RuntimeException(e); } - - }).map(item-> (Object) item).collect(Collectors.toList()); + }).collect(Collectors.toList()); //插入influxdb - influxDBBaseService.insertBatchBySlice(list1,5000); + influxDBBaseService.insertBatchBySlice(tableName, list1, 10000); + size = list1.size(); //最后一片时修改状态 } + if (Objects.nonNull(jobDetailInfluxDB)) { + if (jobDetailInfluxDB.getState() == 2 && i == 0 && size != 0) { + //第一片执行时返现是失败的，则再次执行 + jobDetailInfluxDB.setState(0); + jobDetailInfluxDB.setRowCount(size); + jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); + jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); + } else if (jobDetailInfluxDB.getState() == 0 && i > 0 && jobDetailInfluxDB.getRowCount() + size != 0) { + // 处理中，后续时间片的处理，累加记录数 + jobDetailInfluxDB.setState(0); + jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size); + jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); + jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); + } else { + System.gc(); + break; + } + } else { + if (size > 0) { + jobDetailInfluxDB = new JobDetailInfluxDB(); + jobDetailInfluxDB.setTableName(tableName); + jobDetailInfluxDB.setExcuteDate(date); + jobDetailInfluxDB.setState(0); + jobDetailInfluxDB.setRowCount(size); + jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); + jobDetailInfluxDBService.save(jobDetailInfluxDB); + } + } if (i + 1 == slice && Objects.nonNull(jobDetailInfluxDB)) { stopWatch.stop(); jobDetailInfluxDB.setState(1); diff --git a/influx-data/influx-target/src/main/java/com/njcn/InfluxDataApplication.java b/influx-data/influx-target/src/main/java/com/njcn/InfluxDataApplication.java index d32973e..389e269 100644 --- a/influx-data/influx-target/src/main/java/com/njcn/InfluxDataApplication.java +++ b/influx-data/influx-target/src/main/java/com/njcn/InfluxDataApplication.java @@ -6,6 +6,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration; +import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.EnableAsync; /** @@ -16,11 +17,12 @@ import org.springframework.scheduling.annotation.EnableAsync; */ @Slf4j @EnableAsync +@DependsOn("proxyMapperRegister") @MapperScan("com.njcn.**.mapper") -@SpringBootApplication(scanBasePackages = "com.njcn",exclude = {SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class}) +@SpringBootApplication(scanBasePackages = "com.njcn", exclude = {SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class}) public class InfluxDataApplication { - public static void main(String[] args) { + public static void main(String[] args) { SpringApplication.run(InfluxDataApplication.class, args); } diff --git a/influx-data/influx-target/src/main/resources/application.yml b/influx-data/influx-target/src/main/resources/application.yml index 0098f82..c1a8127 100644 --- a/influx-data/influx-target/src/main/resources/application.yml +++ b/influx-data/influx-target/src/main/resources/application.yml @@ -7,10 +7,10 @@ server: spring: #influxDB内容配置 influx: - url: http://192.168.1.24:8086 + url: http://192.168.1.81:18086 user: admin password: 123456 - database: test + database: pqsbase mapper-location: com.njcn.influx.imapper application: name: oracle-data @@ -68,8 +68,8 @@ spring: datasource: master: url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase - username: pqsadmin - password: Pqsadmin123 + username: pqsadmin_hn + password: pqsadmin driver-class-name: oracle.jdbc.driver.OracleDriver # target: # url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase diff --git a/oracle-data/oracle-target/src/main/resources/application.yml b/oracle-data/oracle-target/src/main/resources/application.yml index 3961169..32fcc3c 100644 --- a/oracle-data/oracle-target/src/main/resources/application.yml +++ b/oracle-data/oracle-target/src/main/resources/application.yml @@ -56,9 +56,9 @@ spring: strict: false datasource: master: - url: jdbc:oracle:thin:@192.168.1.101:1521:pqsbase - username: pqsadmin - password: Pqsadmin123 + url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase + username: pqsadmin_hn + password: pqsadmin driver-class-name: oracle.jdbc.driver.OracleDriver target: url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase