diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleDeviceDetail.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleDeviceDetail.java new file mode 100644 index 0000000..b0fe8b0 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleDeviceDetail.java @@ -0,0 +1,81 @@ +package com.njcn.influx.bo.po; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import nonapi.io.github.classgraph.json.Id; +import org.influxdb.annotation.Column; + +import java.io.Serializable; +import java.util.Date; + +/** + * data-migration + * + * @author cdf + * @date 2024/3/5 + */ + + +@TableName(value = "PQ_DEVICE") +@Data +public class OracleDeviceDetail implements Serializable { + + + @TableField(value = "DEV_INDEX") + private Long devIndex; + + + @Column(name = "DEVFLAG") + private Integer devFlag; + + + /*@Column(name = "GD_INDEX") + private Long gdIndex; + + @Column(name = "SUB_INDEX") + private Long subIndex; + + @Column(name = "NAME") + private String name; + + @Column(name = "STATUS") + private Integer status; + + // 终端型号 + @Column(name = "DEVTYPE") + private String devType; + + @Column(name = "IP") + private String ip; + + @Column(name = "LOGONTIME") + private Date logonTime; + + @Column(name = "UPDATETIME") + private Date updateTime; + + //召唤标志 + @Column(name = "CALLFLAG") + private Integer callFlag; + + + //服务器表序号 + @Column(name = "NODE_INDEX") + private Long nodeIndex; + + @Column(name = "PORTID") + private Long portId; + + @Column(name = "DEVMODEL") + private Long devmodel; + + @Column(name = "DATATYPE") + private Long datatype; + + @Column(name = "Dev_Series") + private String series; + + @Column(name = "Dev_Key") + private String key;*/ +} 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 8a356a5..a8db2ad 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 @@ -34,6 +34,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -248,12 +249,17 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { StopWatch stopWatch = new StopWatch(); stopWatch.start(); LocalDateTime startTime = dataAsynParam.getStartDateTime(); - LocalDateTime endTime = dataAsynParam.getStartDateTime(); + LocalDateTime endTime = dataAsynParam.getEndDateTime(); //查询该时区的数据,并准备入库 MigrationParam migration = new MigrationParam(); migration.setStartTime(startTime); migration.setEndTime(endTime); - List list = executor.queryData(migration); + System.out.println("执行扫描起始时间------------------------------------"+startTime.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); + System.out.println("执行扫描结束时间------------------------------------"+endTime.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); + + + List list = executor.queryData(migration); + System.out.println("查询到的数据++++++++++++++"+list.size()); //反射獲取linid的值并把linid的值替换成mysql对应的linid,并记录未匹配的lineid Iterator iterator = list.iterator(); while (iterator.hasNext()) { diff --git a/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java b/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java index 17684b5..035e7c7 100644 --- a/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java +++ b/influx-data/influx-target/src/main/java/com/njcn/influx/job/OracleToInfluxDBJob.java @@ -65,6 +65,10 @@ public class OracleToInfluxDBJob { } + /** + * 每小时同步oracle数据库暂态事件 + * @date 2024/3/5 + */ @Scheduled(cron="0 30 * * * ?") public void executeEvent() { // 获取当前时间 @@ -77,4 +81,14 @@ public class OracleToInfluxDBJob { LocalDateTime modifiedResult = result.plusMinutes(59).plusSeconds(59); oracleEventDetailToMysqlService.eventBatch(result,modifiedResult); } + + /** + * 每天同步台账装置的运行状态,监测点的运行状态 + * @date 2024/3/5 + */ + @Scheduled(cron="0 20 0 * * ?") + public void synLedgerRunFlag() { + + + } }