diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlinerateMysql.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlinerateMysql.java new file mode 100644 index 0000000..378e8eb --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlinerateMysql.java @@ -0,0 +1,34 @@ +package com.njcn.influx.bo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; + +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; + +/** + * + * Description: + * Date: 2024/5/9 14:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "r_stat_onlinerate_d") +public class PqsOnlinerateMysql { + @MppMultiId(value = "time_id") + private LocalDateTime timeId; + + @MppMultiId(value = "dev_index") + private String devIndex; + + @TableField(value = "online_min") + private Integer onlineMin; + + @TableField(value = "offline_min") + private Integer offlineMin; +} \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlineratePO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlineratePO.java new file mode 100644 index 0000000..e67536b --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/PqsOnlineratePO.java @@ -0,0 +1,34 @@ +package com.njcn.influx.bo.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.time.LocalDateTime; +import lombok.Data; + +/** + * + * Description: + * Date: 2024/5/9 10:42【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +@TableName(value = "PQS_ONLINERATE") +public class PqsOnlineratePO { + @TableField(value = "TIMEID") + private LocalDateTime timeid; + + @TableField(value = "DEV_INDEX") + private Integer devIndex; + + @TableField(value = "ONLINEMIN") + private Integer onlinemin; + + @TableField(value = "OFFLINEMIN") + private Integer offlinemin; + + +} \ No newline at end of file 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 index bb46b37..f3d61e7 100644 --- 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 @@ -1,7 +1,9 @@ package com.njcn.influx.config; +import com.njcn.influx.bo.po.PqDeviceBak; import com.njcn.influx.bo.po.PqLineBak; import com.njcn.influx.mapper.PqLineBakMapper; +import com.njcn.influx.service.IPqDeviceBakService; import com.njcn.influx.service.PqLineBakService; import io.swagger.v3.oas.annotations.servers.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +28,8 @@ public class IdMappingCache { @Autowired private PqLineBakService pqLineBakService; - + @Autowired + private IPqDeviceBakService pqDeviceBakService; public static Map IdMapping = new HashMap<>(); @PostConstruct @@ -37,6 +40,13 @@ public class IdMappingCache { String line_id = row.getLineId(); IdMapping.put(line_id,id ); } + List list = pqDeviceBakService.list(); + + for (PqDeviceBak row : list) { + String id = row.getId(); + String dev_id = row.getDevId()+""; + IdMapping.put(dev_id,id ); + } } public String getDataById(String id) { diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlinerateMysqlMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlinerateMysqlMapper.java new file mode 100644 index 0000000..16cd4dc --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlinerateMysqlMapper.java @@ -0,0 +1,15 @@ +package com.njcn.influx.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.influx.bo.po.PqsOnlinerateMysql; + +/** + * + * Description: + * Date: 2024/5/9 14:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqsOnlinerateMysqlMapper extends BaseMapper { +} \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlineratePOMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlineratePOMapper.java new file mode 100644 index 0000000..1c22e4c --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/PqsOnlineratePOMapper.java @@ -0,0 +1,15 @@ +package com.njcn.influx.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.influx.bo.po.PqsOnlineratePO; + +/** + * + * Description: + * Date: 2024/5/9 10:42【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqsOnlineratePOMapper extends BaseMapper { +} \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlinerateMysqlMapper.xml b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlinerateMysqlMapper.xml new file mode 100644 index 0000000..2dea712 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlinerateMysqlMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN + + \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlineratePOMapper.xml b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlineratePOMapper.xml new file mode 100644 index 0000000..a4c251f --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/PqsOnlineratePOMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, + TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN, TIMEID, DEV_INDEX, ONLINEMIN, OFFLINEMIN + + \ No newline at end of file diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/JobDetailHoursInfluxDBService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/JobDetailHoursInfluxDBService.java index af61639..3a79815 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/JobDetailHoursInfluxDBService.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/JobDetailHoursInfluxDBService.java @@ -2,7 +2,6 @@ package com.njcn.influx.service; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.influx.bo.po.JobDetailHoursInfluxDB; -import com.njcn.oracle.bo.po.JobDetailHours; /** * diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleToInfluxDBService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleToInfluxDBService.java index 9d7de4f..79a4858 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleToInfluxDBService.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleToInfluxDBService.java @@ -6,4 +6,6 @@ public interface OracleToInfluxDBService { void dataBacthSysc(DataAsynParam dataAsynParam); void hourseDataBacthSysc(DataAsynParam dataAsynParam); + + void AsyncData(DataAsynParam dataAsynParam); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlinerateMysqlService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlinerateMysqlService.java new file mode 100644 index 0000000..3cf5a3d --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlinerateMysqlService.java @@ -0,0 +1,16 @@ +package com.njcn.influx.service; + +import com.njcn.influx.bo.po.PqsOnlinerateMysql; +import com.baomidou.mybatisplus.extension.service.IService; + /** + * + * Description: + * Date: 2024/5/9 14:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqsOnlinerateMysqlService extends IService{ + + +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlineratePOService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlineratePOService.java new file mode 100644 index 0000000..24ad4f1 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/PqsOnlineratePOService.java @@ -0,0 +1,21 @@ +package com.njcn.influx.service; + +import com.njcn.influx.bo.po.PqsOnlineratePO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.oracle.bo.param.DataAsynParam; + +/** + * + * Description: + * Date: 2024/5/9 10:42【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface PqsOnlineratePOService extends IService{ + + + void minutesDataBacthSysc(DataAsynParam dataAsynParam); + + void AsyncData(DataAsynParam dataAsynParam); +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/JobDetailHoursInfluxDBServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/JobDetailHoursInfluxDBServiceImpl.java index ed2f5fa..282e486 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/JobDetailHoursInfluxDBServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/JobDetailHoursInfluxDBServiceImpl.java @@ -4,8 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.influx.bo.po.JobDetailHoursInfluxDB; import com.njcn.influx.mapper.JobDetailHoursInfluxDBMapper; import com.njcn.influx.service.JobDetailHoursInfluxDBService; -import com.njcn.oracle.bo.po.JobDetailHours; -import com.njcn.oracle.mybatis.mapper.JobDetailHoursMapper; + import org.springframework.stereotype.Service; /** 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 a8db2ad..3e2ed4c 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 @@ -16,11 +16,7 @@ import com.njcn.influx.service.JobHistoryLogInfluxdbService; 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.param.ServiceTypeEnum; -import com.njcn.oracle.bo.po.JobDetailHours; -import com.njcn.oracle.bo.po.JobHistoryLog; import com.njcn.oracle.mybatis.service.IReplenishMybatisService; -import com.njcn.oracle.service.JobDetailHoursService; import com.njcn.oracle.util.LocalDateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -216,6 +212,7 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { } //按小时来同步数据 @Override +// @Async public void hourseDataBacthSysc(DataAsynParam dataAsynParam) { Runtime runtime = Runtime.getRuntime(); System.out.println("开始执行前总堆内存为：" + runtime.totalMemory() / (1024 * 1024) + " MB"); @@ -258,8 +255,8 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { System.out.println("执行扫描结束时间------------------------------------"+endTime.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); - List list = executor.queryData(migration); - System.out.println("查询到的数据++++++++++++++"+list.size()); + List list = executor.queryData(migration); + System.out.println("查询到的数据++++++++++++++"+list.size()); //反射獲取linid的值并把linid的值替换成mysql对应的linid，并记录未匹配的lineid Iterator iterator = list.iterator(); while (iterator.hasNext()) { @@ -346,4 +343,20 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { }); } + + @Override + @Async + public void AsyncData(DataAsynParam dataAsynParam) { + LocalDateTime startDateTime1 = dataAsynParam.getStartDateTime(); + LocalDateTime endDateTime1 = dataAsynParam.getEndDateTime(); + while (endDateTime1.isBefore(startDateTime1)) { + startDateTime1 = startDateTime1.minusHours(1); + DataAsynParam dataAsynParam1 = new DataAsynParam(); + dataAsynParam1.setEndDateTime(startDateTime1.minusHours(-1).minusSeconds(1)); + dataAsynParam1.setStartDateTime(startDateTime1); + dataAsynParam1.setTableNames(TableEnum.getExecutableTypes()); + log.info("执行"+startDateTime1+"时刻数据"); + this.hourseDataBacthSysc(dataAsynParam1); + } + } } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlinerateMysqlServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlinerateMysqlServiceImpl.java new file mode 100644 index 0000000..bd070eb --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlinerateMysqlServiceImpl.java @@ -0,0 +1,23 @@ +package com.njcn.influx.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.influx.mapper.PqsOnlinerateMysqlMapper; +import com.njcn.influx.bo.po.PqsOnlinerateMysql; +import com.njcn.influx.service.PqsOnlinerateMysqlService; +/** + * + * Description: + * Date: 2024/5/9 14:25【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@DS("target") +public class PqsOnlinerateMysqlServiceImpl extends ServiceImpl implements PqsOnlinerateMysqlService{ + +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlineratePOServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlineratePOServiceImpl.java new file mode 100644 index 0000000..cd7ffd2 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/PqsOnlineratePOServiceImpl.java @@ -0,0 +1,86 @@ +package com.njcn.influx.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.njcn.influx.bo.param.TableEnum; +import com.njcn.influx.bo.po.PqsOnlinerateMysql; +import com.njcn.influx.config.IdMappingCache; +import com.njcn.influx.service.IPqDeviceBakService; +import com.njcn.influx.service.PqsOnlinerateMysqlService; +import com.njcn.oracle.bo.param.DataAsynParam; +import com.njcn.oracle.bo.po.DataFlicker; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.influx.bo.po.PqsOnlineratePO; +import com.njcn.influx.mapper.PqsOnlineratePOMapper; +import com.njcn.influx.service.PqsOnlineratePOService; +import org.springframework.transaction.annotation.Transactional; + +/** + * + * Description: + * Date: 2024/5/9 10:42【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class PqsOnlineratePOServiceImpl extends ServiceImpl implements PqsOnlineratePOService{ + private final PqsOnlinerateMysqlService pqsOnlinerateMysqlService; + @Override + public void minutesDataBacthSysc(DataAsynParam dataAsynParam) { + + List list = this.lambdaQuery().between(PqsOnlineratePO::getTimeid, LocalDateTimeUtil.beginOfDay(dataAsynParam.getStartDateTime()), LocalDateTimeUtil.endOfDay(dataAsynParam.getStartDateTime()).minusSeconds(1)).list(); + log.info(dataAsynParam.getStartDateTime()+"-----数据量："+list.size()); + if (CollectionUtil.isNotEmpty(list)) { + List collect = new ArrayList<>(); + list.stream().forEach(temp -> { + PqsOnlinerateMysql pqsOnlinerateMysql = new PqsOnlinerateMysql(); + + if (!IdMappingCache.IdMapping.containsKey(temp.getDevIndex()+"")){ + return; + }else { + pqsOnlinerateMysql.setDevIndex(IdMappingCache.IdMapping.get(temp.getDevIndex()+"")); + } + pqsOnlinerateMysql.setTimeId(temp.getTimeid()); + pqsOnlinerateMysql.setOnlineMin(temp.getOnlinemin()); + pqsOnlinerateMysql.setOfflineMin(temp.getOfflinemin()); + + collect.add(pqsOnlinerateMysql); + }); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().between(PqsOnlinerateMysql::getTimeId, LocalDateTimeUtil.beginOfDay(dataAsynParam.getStartDateTime()), LocalDateTimeUtil.endOfDay(dataAsynParam.getStartDateTime()).minusSeconds(1)); + pqsOnlinerateMysqlService.remove(queryWrapper); + pqsOnlinerateMysqlService.saveBatch(collect); + } + } + + @Override + @Async + public void AsyncData(DataAsynParam dataAsynParam) { + LocalDateTime startDateTime1 = dataAsynParam.getStartDateTime(); + LocalDateTime endDateTime1 = dataAsynParam.getEndDateTime(); + while (endDateTime1.isBefore(startDateTime1)) { + log.info("执行"+startDateTime1+"时刻数据"); + DataAsynParam dataAsynParam1 = new DataAsynParam(); + dataAsynParam1.setStartDateTime(startDateTime1); + this.minutesDataBacthSysc(dataAsynParam1); + startDateTime1 = startDateTime1.minusDays(1); + + } + } +} diff --git a/influx-data/influx-target/src/main/java/com/njcn/influx/controller/OracleToInfluxDBController.java b/influx-data/influx-target/src/main/java/com/njcn/influx/controller/OracleToInfluxDBController.java index 98db4b6..86dd392 100644 --- a/influx-data/influx-target/src/main/java/com/njcn/influx/controller/OracleToInfluxDBController.java +++ b/influx-data/influx-target/src/main/java/com/njcn/influx/controller/OracleToInfluxDBController.java @@ -1,10 +1,13 @@ package com.njcn.influx.controller; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.extra.spring.SpringUtil; +import com.njcn.influx.bo.param.TableEnum; import com.njcn.influx.service.InfluxDBBaseService; import com.njcn.influx.service.OracleToInfluxDBService; +import com.njcn.influx.service.PqsOnlineratePOService; import com.njcn.oracle.bo.param.DataAsynParam; import com.njcn.oracle.bo.param.MigrationParam; import com.njcn.oracle.mybatis.service.IReplenishMybatisService; @@ -16,10 +19,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.lang.reflect.Method; import java.time.LocalDate; @@ -44,6 +44,8 @@ import java.util.stream.Stream; public class OracleToInfluxDBController { private final OracleToInfluxDBService oracleToInfluxDBService; + + private final PqsOnlineratePOService pqsOnlineratePOService; @PostMapping("/dataSync") @ApiOperation("数据同步") @ApiImplicitParam(name = "dataAsynParam", value = "数据同步参数", required = true) @@ -54,6 +56,30 @@ public class OracleToInfluxDBController { return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); } + @GetMapping("/dataSyncHours") + @ApiOperation("数据同步") + public Boolean dataSyncHours(@RequestParam("startDateTime") String startDateTime,@RequestParam("endDateTime") String endDateTime) { + DataAsynParam dataAsynParam = new DataAsynParam(); + dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATETIME_PATTERN)); + dataAsynParam.setEndDateTime(LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATETIME_PATTERN)); + oracleToInfluxDBService.AsyncData(dataAsynParam); + + return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); + } + + @GetMapping("/onlinerateSync") + @ApiOperation("onlinerate表数据同步") + public Boolean onlinerateSync(@RequestParam("startDateTime") String startDateTime,@RequestParam("endDateTime") String endDateTime) { + DataAsynParam dataAsynParam = new DataAsynParam(); + dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATETIME_PATTERN)); + dataAsynParam.setEndDateTime(LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATETIME_PATTERN)); + pqsOnlineratePOService.AsyncData(dataAsynParam); + + + + return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); + } + } 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 800fcc4..92dc95f 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 @@ -4,6 +4,7 @@ import com.njcn.influx.bo.param.TableEnum; import com.njcn.influx.service.OracleEventDetailToMysqlService; import com.njcn.influx.service.OracleMonitorStatusToMysqlService; import com.njcn.influx.service.OracleToInfluxDBService; +import com.njcn.influx.service.PqsOnlineratePOService; import com.njcn.oracle.bo.param.DataAsynParam; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -33,6 +34,8 @@ public class OracleToInfluxDBJob { private final OracleEventDetailToMysqlService oracleEventDetailToMysqlService; private final OracleMonitorStatusToMysqlService oracleMonitorStatusToMysqlService; + + private final PqsOnlineratePOService pqsOnlineratePOService; /*@Scheduled(cron="0 5 0 * * ?") public void execute() { DataAsynParam dataAsynParam = new DataAsynParam(); @@ -63,13 +66,24 @@ public class OracleToInfluxDBJob { dataAsynParam.setExcuteType(2); oracleToInfluxDBService.hourseDataBacthSysc(dataAsynParam); } + //每10分钟执行一次pqOnlinerate表同步 + @Scheduled(cron="0 0/10 * * * ?") + public void pqOnlinerate() { + DataAsynParam dataAsynParam = new DataAsynParam(); + // 获取当前时间 + LocalDateTime now = LocalDateTime.now(); + + dataAsynParam.setStartDateTime(now); + pqsOnlineratePOService.minutesDataBacthSysc(dataAsynParam); + } + /** * 每小时同步oracle数据库暂态事件 * @date 2024/3/5 */ - @Scheduled(cron="0 30 * * * ?") + @Scheduled(cron="0 0/1 * * * ?") public void executeEvent() { // 获取当前时间 LocalDateTime now = LocalDateTime.now();