diff --git a/influx-data/influx-source/pom.xml b/influx-data/influx-source/pom.xml index 997cc58..9114d8b 100644 --- a/influx-data/influx-source/pom.xml +++ b/influx-data/influx-source/pom.xml @@ -104,6 +104,12 @@ commons-collections4 4.4 + + + mysql + mysql-connector-java + + diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/param/TableEnum.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/param/TableEnum.java index 809f7a2..48bdd2e 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/param/TableEnum.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/param/TableEnum.java @@ -12,28 +12,31 @@ import java.util.stream.Collectors; * @version V1.0.0 */ public enum TableEnum { - DATAFLICKER("DataFlicker","电压闪变数据表"), - DATAFLUC("DataFluc","电压波动数据表"), - DATAHARMPHASICI("DataHarmphasicI","谐波电流角度数据表"), - DATAHARMPHASICV("DataHarmphasicV","谐波电压角度数据表"), - DATAHARMPOWERP("DataHarmpowerP","有功功率数据表"), - DATAHARMPOWERQ("DataHarmpowerQ","无功功率数据表"), - DATAHARMPOWERS("DataHarmpowerS","视在功率数据表"), - DATAHARMRATEI("DataHarmrateI","谐波电流含有率数据表"), - DATAHARMRATEV("DataHarmrateV","谐波电压含有率数据表"), - DATAINHARMI("DataInharmI","电流简谐波幅值数据表"), - DATAINHARMV("DataInharmV","电压间谐波幅值数据表"), - DATAI("DataI","谐波电流幅值数据表"), - DATAPLT("DataPlt","长时闪变数据表"), - DATAV("DataV","谐波电压幅值数据表"); + DATAFLICKER("DataFlicker","电压闪变数据表", 1), + DATAFLUC("DataFluc","电压波动数据表", 1), + DATAHARMPHASICI("DataHarmphasicI","谐波电流角度数据表", 4), + DATAHARMPHASICV("DataHarmphasicV","谐波电压角度数据表", 4), + DATAHARMPOWERP("DataHarmpowerP","有功功率数据表", 4), + DATAHARMPOWERQ("DataHarmpowerQ","无功功率数据表", 4), + DATAHARMPOWERS("DataHarmpowerS","视在功率数据表", 4), + DATAHARMRATEI("DataHarmrateI","谐波电流含有率数据表", 4), + DATAHARMRATEV("DataHarmrateV","谐波电压含有率数据表", 4), + DATAINHARMI("DataInharmI","电流简谐波幅值数据表", 4), + DATAINHARMV("DataInharmV","电压间谐波幅值数据表", 4), + DATAI("DataI","谐波电流幅值数据表", 4), + DATAPLT("DataPlt","长时闪变数据表", 1), + DATAV("DataV","谐波电压幅值数据表", 4); private final String code; private final String value; - TableEnum(String code, String value) { + private final Integer multiple; + + TableEnum(String code, String value, Integer multiple) { this.code = code; this.value = value; + this.multiple = multiple; } /** @@ -62,4 +65,13 @@ public enum TableEnum { return null; } + public static Integer getMultipleByCode(String code) { + for (TableEnum item : TableEnum.values()) { + if (item.code.equals(code)) { + return item.multiple; + } + } + return null; + } + } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java index 971812e..5fd6ed4 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java @@ -55,7 +55,7 @@ public class InfluxDBDataFlicker { Instant instant = dataFlicker.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataFlicker.setTime(instant); - influxDBDataFlicker.setLineId(dataFlicker.getLineid()+""); + influxDBDataFlicker.setLineId(dataFlicker.getLineid()); influxDBDataFlicker.setPhaseType(dataFlicker.getPhasicType()); influxDBDataFlicker.setFluc(dataFlicker.getFluc()); influxDBDataFlicker.setPlt(dataFlicker.getPst()); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java index 533e1d9..69c4475 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFluc.java @@ -52,7 +52,7 @@ public class InfluxDBDataFluc { Instant instant = dataFluc.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataFluc.setTime(instant); - influxDBDataFluc.setLineId(dataFluc.getLineid()+""); + influxDBDataFluc.setLineId(dataFluc.getLineid()); influxDBDataFluc.setPhaseType(dataFluc.getPhasicType()); influxDBDataFluc.setFluc(dataFluc.getFluc()); influxDBDataFluc.setFluccf(dataFluc.getFluccf()); 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 index 2caad4f..311538b 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 @@ -204,7 +204,7 @@ public class InfluxDBDataHarmphasicI { Instant instant = dataHarmphasicI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicI.setTime(instant); - influxDBDataHarmPhasicI.setLineId(dataHarmphasicI.getLineid()+""); + influxDBDataHarmPhasicI.setLineId(dataHarmphasicI.getLineid()); influxDBDataHarmPhasicI.setPhaseType(dataHarmphasicI.getPhasicType()); influxDBDataHarmPhasicI.setQualityFlag(dataHarmphasicI.getQualityflag()+""); influxDBDataHarmPhasicI.setValueType(valueType); 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 index 9813241..99a3d99 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 @@ -204,7 +204,7 @@ public class InfluxDBDataHarmphasicV { Instant instant = dataHarmphasicV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); - influxDBDataHarmPhasicV.setLineId(dataHarmphasicV.getLineid()+""); + influxDBDataHarmPhasicV.setLineId(dataHarmphasicV.getLineid()); influxDBDataHarmPhasicV.setPhaseType(dataHarmphasicV.getPhasicType()); influxDBDataHarmPhasicV.setQualityFlag(dataHarmphasicV.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); 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 index 334efc1..b36da57 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 @@ -213,7 +213,7 @@ public class InfluxDBDataHarmpowerP { Instant instant = dataHarmpowerP.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); - influxDBDataHarmPhasicV.setLineId(dataHarmpowerP.getLineid()+""); + influxDBDataHarmPhasicV.setLineId(dataHarmpowerP.getLineid()); influxDBDataHarmPhasicV.setPhaseType(dataHarmpowerP.getPhasicType()); influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerP.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); 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 index d50d43b..f7722e6 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 @@ -207,7 +207,7 @@ public class InfluxDBDataHarmpowerQ { Instant instant = dataHarmpowerQ.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); - influxDBDataHarmPhasicV.setLineId(dataHarmpowerQ.getLineid()+""); + influxDBDataHarmPhasicV.setLineId(dataHarmpowerQ.getLineid()); influxDBDataHarmPhasicV.setPhaseType(dataHarmpowerQ.getPhasicType()); influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerQ.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); 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 index 77a99a9..7b87b74 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 @@ -207,7 +207,7 @@ public class InfluxDBDataHarmpowerS { Instant instant = dataHarmpowerS.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmPhasicV.setTime(instant); - influxDBDataHarmPhasicV.setLineId(dataHarmpowerS.getLineid()+""); + influxDBDataHarmPhasicV.setLineId(dataHarmpowerS.getLineid()); influxDBDataHarmPhasicV.setPhaseType(dataHarmpowerS.getPhasicType()); influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerS.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); 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 index 3ec45d0..ab78812 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 @@ -203,7 +203,7 @@ public class InfluxDBDataHarmrateI { Instant instant = dataHarmrateI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmRateI.setTime(instant); - influxDBDataHarmRateI.setLineId(dataHarmrateI.getLineid()+""); + influxDBDataHarmRateI.setLineId(dataHarmrateI.getLineid()); influxDBDataHarmRateI.setPhaseType(dataHarmrateI.getPhasicType()); influxDBDataHarmRateI.setQualityFlag(dataHarmrateI.getQualityflag()+""); influxDBDataHarmRateI.setValueType(valueType); 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 index 8697114..3186ab6 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 @@ -203,7 +203,7 @@ public class InfluxDBDataHarmrateV { Instant instant = dataHarmrateV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataHarmRateV.setTime(instant); - influxDBDataHarmRateV.setLineId(dataHarmrateV.getLineid()+""); + influxDBDataHarmRateV.setLineId(dataHarmrateV.getLineid()); influxDBDataHarmRateV.setPhaseType(dataHarmrateV.getPhasicType()); influxDBDataHarmRateV.setQualityFlag(dataHarmrateV.getQualityflag()+""); influxDBDataHarmRateV.setValueType(valueType); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java index a73cc13..d31da56 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataI.java @@ -222,7 +222,7 @@ public class InfluxDBDataI { Instant instant = dataI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataI.setTime(instant); - influxDBDataI.setLineId(dataI.getLineid()+""); + influxDBDataI.setLineId(dataI.getLineid()); influxDBDataI.setPhaseType(dataI.getPhasicType()); influxDBDataI.setQualityFlag(dataI.getQualityflag()+""); influxDBDataI.setValueType(valueType); 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 index af9723d..638fe06 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 @@ -205,7 +205,7 @@ public class InfluxDBDataInharmI { Instant instant = dataInharmI.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataInHarmI.setTime(instant); - influxDBDataInHarmI.setLineId(dataInharmI.getLineid()+""); + influxDBDataInHarmI.setLineId(dataInharmI.getLineid()); influxDBDataInHarmI.setPhaseType(dataInharmI.getPhasicType()); influxDBDataInHarmI.setQualityFlag(dataInharmI.getQualityflag()+""); influxDBDataInHarmI.setValueType(valueType); 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 index ef408ea..2e57754 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 @@ -204,7 +204,7 @@ public class InfluxDBDataInharmV { Instant instant = dataInharmV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataInHarmV.setTime(instant); - influxDBDataInHarmV.setLineId(dataInharmV.getLineid()+""); + influxDBDataInHarmV.setLineId(dataInharmV.getLineid()); influxDBDataInHarmV.setPhaseType(dataInharmV.getPhasicType()); influxDBDataInHarmV.setQualityFlag(dataInharmV.getQualityflag()+""); influxDBDataInHarmV.setValueType(valueType); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java index 3c5bd88..da3b35c 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataPlt.java @@ -48,7 +48,7 @@ public class InfluxDBDataPlt { Instant instant = dataPlt.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataPlt.setTime(instant); - influxDBDataPlt.setLineId(dataPlt.getLineid()+""); + influxDBDataPlt.setLineId(dataPlt.getLineid()); influxDBDataPlt.setPhaseType(dataPlt.getPhasicType()); influxDBDataPlt.setPlt(dataPlt.getPlt()); influxDBDataPlt.setQualityFlag(dataPlt.getQualityflag()+""); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java index c7649b3..08eb75e 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataV.java @@ -243,7 +243,7 @@ public class InfluxDBDataV { Instant instant = dataV.getTimeid().atZone(ZoneId.systemDefault()).toInstant(); influxDBDataV.setTime(instant); - influxDBDataV.setLineId(dataV.getLineid()+""); + influxDBDataV.setLineId(dataV.getLineid()); influxDBDataV.setPhasicType(dataV.getPhasicType()); influxDBDataV.setQualityFlag(dataV.getQualityflag()+""); influxDBDataV.setValueType(valueType); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqLineBak.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqLineBak.java new file mode 100644 index 0000000..0fd7c50 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqLineBak.java @@ -0,0 +1,23 @@ +package com.njcn.influx.bo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * Description: + * Date: 2024/1/17 14:39【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "pq_line_bak") +public class PqLineBak { + @TableId(value = "id") + private String id; + + @TableField(value = "line_id") + private String lineId; +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java b/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java new file mode 100644 index 0000000..bb46b37 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/config/IdMappingCache.java @@ -0,0 +1,45 @@ +package com.njcn.influx.config; + +import com.njcn.influx.bo.po.PqLineBak; +import com.njcn.influx.mapper.PqLineBakMapper; +import com.njcn.influx.service.PqLineBakService; +import io.swagger.v3.oas.annotations.servers.Server; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Description: + * Date: 2024/1/17 14:36【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Component +public class IdMappingCache { + + @Autowired + private PqLineBakService pqLineBakService; + + public static Map IdMapping = new HashMap<>(); + + @PostConstruct + public void init() { + List resultList = pqLineBakService.list(); + for (PqLineBak row : resultList) { + String id = row.getId(); + String line_id = row.getLineId(); + IdMapping.put(line_id,id ); + } + } + + public String getDataById(String id) { + return IdMapping.get(id); + } +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqLineBakMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqLineBakMapper.java new file mode 100644 index 0000000..f190bf1 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqLineBakMapper.java @@ -0,0 +1,17 @@ +package com.njcn.influx.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.influx.bo.po.JobDetailInfluxDB; +import com.njcn.influx.bo.po.PqLineBak; + +/** + * + * Description: + * Date: 2024/1/8 12:27【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqLineBakMapper extends BaseMapper { +} \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqLineBakService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqLineBakService.java new file mode 100644 index 0000000..8323f46 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqLineBakService.java @@ -0,0 +1,19 @@ +package com.njcn.influx.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.influx.bo.po.PqLineBak; + +import java.util.List; + +/** + * Description: + * Date: 2024/1/15 11:38【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqLineBakService extends IService { + + + +} 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 cc66598..33a4a1a 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 @@ -5,27 +5,31 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.text.StrPool; import cn.hutool.extra.spring.SpringUtil; +import com.njcn.influx.bo.param.TableEnum; import com.njcn.influx.bo.po.JobDetailInfluxDB; +import com.njcn.influx.config.IdMappingCache; import com.njcn.influx.service.JobDetailInfluxDBService; import com.njcn.influx.service.OracleToInfluxDBService; import com.njcn.oracle.bo.param.DataAsynParam; import com.njcn.oracle.bo.param.MigrationParam; -import com.njcn.oracle.bo.po.JobDetail; import com.njcn.oracle.mybatis.service.IReplenishMybatisService; -import com.njcn.oracle.service.JobDetailService; import com.njcn.oracle.util.LocalDateUtil; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.StopWatch; import java.lang.ref.WeakReference; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.Iterator; import java.util.List; import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -39,6 +43,7 @@ import java.util.stream.Stream; @Service @RequiredArgsConstructor +@Slf4j public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { @@ -49,6 +54,8 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { private final InfluxDBBaseServiceImpl influxDBBaseService; + private final IdMappingCache idMappingCache; + @Value("${business.slice:2}") private int slice; @@ -94,8 +101,31 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { MigrationParam migration = new MigrationParam(); migration.setStartTime(startTime); migration.setEndTime(endTime); + List list = executor.queryData(migration); + //反射獲取linid的值并把linid的值替换成mysql对应的linid，并记录未匹配的lineid + Iterator iterator = list.iterator(); + while (iterator.hasNext()) { + try{ + Object obj = iterator.next(); + //获取 + Field id = obj.getClass().getDeclaredField("lineid"); + id.setAccessible(true); //暴力访问id + String id1 = id.get(obj).toString(); + if (!IdMappingCache.IdMapping.containsKey(id1)){ + log.info(tableName+"表---Oralcet数据同步到InfluxDB未找mysql中到lineid匹配的lineid"+id1); + iterator.remove(); + }else { + id.set(obj, IdMappingCache.IdMapping.get(id1)); + } + }catch (Exception e){ + e.printStackTrace(); + } + + + } + //采用弱引用接受，后续手动调用gc后，会清空该对象 - WeakReference weakReferenceData = new WeakReference<>(executor.queryData(migration)); + WeakReference weakReferenceData = new WeakReference<>(list); int size = 0; if (CollectionUtil.isNotEmpty(weakReferenceData.get())) { size = weakReferenceData.get().size(); @@ -143,7 +173,7 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { if (i == 0) { jobDetailInfluxDB.setRowCount(0); } - jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size); + jobDetailInfluxDB.setRowCount(jobDetailInfluxDB.getRowCount() + size* TableEnum.getMultipleByCode(tableName)); jobDetailInfluxDB.setUpdateTime(LocalDateTime.now()); jobDetailInfluxDBService.updateByMultiId(jobDetailInfluxDB); if (i + 1 == slice && Objects.nonNull(jobDetailInfluxDB)) { diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqLineBakServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqLineBakServiceImpl.java new file mode 100644 index 0000000..1578871 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqLineBakServiceImpl.java @@ -0,0 +1,20 @@ +package com.njcn.influx.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.influx.bo.po.PqLineBak; +import com.njcn.influx.mapper.PqLineBakMapper; +import com.njcn.influx.service.PqLineBakService; +import org.springframework.stereotype.Service; + +/** + * Description: + * Date: 2024/1/17 15:56【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@DS("target") +@Service +public class PqLineBakServiceImpl extends ServiceImpl implements PqLineBakService { +} diff --git a/influx-data/influx-target/src/main/resources/application.yml b/influx-data/influx-target/src/main/resources/application.yml index a7e99dc..092564f 100644 --- a/influx-data/influx-target/src/main/resources/application.yml +++ b/influx-data/influx-target/src/main/resources/application.yml @@ -71,11 +71,11 @@ spring: username: pqsadmin_hn password: pqsadmin driver-class-name: oracle.jdbc.driver.OracleDriver -# target: -# 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:mysql://192.168.1.24:13306/pqsinfo_pq?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT + username: root + password: njcnpqs + driver-class-name: com.mysql.cj.jdbc.Driver #mybatis配置信息 mybatis-plus: #别名扫描 diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFlicker.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFlicker.java index 001f534..4501404 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFlicker.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFlicker.java @@ -27,7 +27,7 @@ public class DataFlicker implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("FLUC") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFluc.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFluc.java index ad79fa2..4493cc5 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFluc.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataFluc.java @@ -24,7 +24,7 @@ public class DataFluc implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("FLUC") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicI.java index 0cdb9d4..43396f2 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicI.java @@ -25,7 +25,7 @@ public class DataHarmphasicI implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicV.java index fb62519..98105b1 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmphasicV.java @@ -25,7 +25,7 @@ public class DataHarmphasicV implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerP.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerP.java index aae70a2..99fc4d8 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerP.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerP.java @@ -25,7 +25,7 @@ public class DataHarmpowerP implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("PF") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerQ.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerQ.java index 670a4a8..58a5714 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerQ.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerQ.java @@ -25,7 +25,7 @@ public class DataHarmpowerQ implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("Q") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerS.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerS.java index 41b768d..c43da97 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerS.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmpowerS.java @@ -25,7 +25,7 @@ public class DataHarmpowerS implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("S") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateI.java index a50161b..b281e57 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateI.java @@ -25,7 +25,7 @@ public class DataHarmrateI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateV.java index 8438244..7476efa 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataHarmrateV.java @@ -25,7 +25,7 @@ public class DataHarmrateV implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataI.java index d08d998..8aa8348 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataI.java @@ -25,7 +25,7 @@ public class DataI implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("RMS") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmI.java index 51f3a32..dc701c1 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmI.java @@ -25,7 +25,7 @@ public class DataInharmI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmV.java index 55cffb1..4f175f9 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataInharmV.java @@ -25,7 +25,7 @@ public class DataInharmV implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataPlt.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataPlt.java index 624256c..3282b78 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataPlt.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataPlt.java @@ -25,7 +25,7 @@ public class DataPlt implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("PLT") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataV.java index 305d1a5..5835d17 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DataV.java @@ -25,7 +25,7 @@ public class DataV implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("RMS") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java index a754b23..7a1f155 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java @@ -25,7 +25,7 @@ public class DayFlicker implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("FLUC") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFluc.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFluc.java index 2f0e7dd..9dbcf37 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFluc.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFluc.java @@ -25,7 +25,7 @@ public class DayFluc implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("FLUC") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicI.java index 9f2751a..4b5e00f 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicI.java @@ -25,7 +25,7 @@ public class DayHarmphasicI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicV.java index d7d681d..4bd8cf4 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmphasicV.java @@ -25,7 +25,7 @@ public class DayHarmphasicV implements Serializable{ @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerP.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerP.java index d5983da..a353497 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerP.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerP.java @@ -25,7 +25,7 @@ public class DayHarmpowerP implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("PF") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerQ.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerQ.java index 7c5027d..ba610d8 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerQ.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerQ.java @@ -25,7 +25,7 @@ public class DayHarmpowerQ implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("Q") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerS.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerS.java index dd8f53e..33f9939 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerS.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmpowerS.java @@ -25,7 +25,7 @@ public class DayHarmpowerS implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("S") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateI.java index d25f32f..f35bb0c 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateI.java @@ -25,7 +25,7 @@ public class DayHarmrateI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateV.java index b79ec83..172b0b1 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayHarmrateV.java @@ -25,7 +25,7 @@ public class DayHarmrateV implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java index 02d63be..7d67720 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java @@ -25,7 +25,7 @@ public class DayI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("RMS") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmI.java index 98e5485..d852a4a 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmI.java @@ -24,7 +24,7 @@ public class DayInharmI implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("I_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java index ce4ee78..b0a2f90 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java @@ -25,7 +25,7 @@ public class DayInharmV implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("V_1") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java index e20bd3c..67dec66 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java @@ -25,7 +25,7 @@ public class DayPlt implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("PLT") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayV.java index 6763d1d..5f9c9ea 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayV.java @@ -26,7 +26,7 @@ public class DayV implements Serializable { @TableField("TIMEID") private LocalDateTime timeid; @TableField("LINEID") - private Integer lineid; + private String lineid; @TableField("PHASIC_TYPE") private String phasicType; @TableField("RMS")