From 43df2815222c8c753319a8244ff61bee1318f3c4 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 1 Mar 2024 16:21:31 +0800 Subject: [PATCH] =?UTF-8?q?1.eventDetail=E6=95=B0=E6=8D=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/influx/bo/po/DictData.java | 43 ++++++ .../influx/bo/po/OracleRmpEventDetailPO.java | 4 +- .../njcn/influx/bo/po/RmpEventDetailPO.java | 4 +- .../mapper/OracleRmpEventDetailPOMapper.java | 6 +- .../influx/mapper/RmpEventDetailPOMapper.java | 7 +- .../mapping/OracleRmpEventDetailPOMapper.xml | 20 +++ .../mapper/mapping/RmpEventDetailPOMapper.xml | 13 ++ .../OracleEventDetailToMysqlService.java | 8 +- .../OracleEventDetailToMysqlServiceImpl.java | 133 ++++++++++++++++-- .../njcn/influx/job/OracleToInfluxDBJob.java | 25 ++-- 10 files changed, 225 insertions(+), 38 deletions(-) create mode 100644 influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/DictData.java create mode 100644 influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/OracleRmpEventDetailPOMapper.xml create mode 100644 influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/RmpEventDetailPOMapper.xml diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/DictData.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/DictData.java new file mode 100644 index 0000000..ca5e022 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/DictData.java @@ -0,0 +1,43 @@ +package com.njcn.influx.bo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * + * @author hongawen + * @since 2021-12-13 + */ +@Data +public class DictData { + + private static final long serialVersionUID = 1L; + + /** + * 字典数据表Id + */ + private String id; + + /** + * 字典类型表Id + */ + private String typeId; + + /** + * 名称 + */ + private String name; + + /** + * 编码 + */ + private String code; + + /** + * 与高级算法内部Id描述对应； + */ + private Integer algoDescribe; + + + +} diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java index 09f740c..f56a27e 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java @@ -81,13 +81,13 @@ public class OracleRmpEventDetailPO implements Serializable { * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0 */ @TableField(value = "FILEFLAG") - private Boolean fileFlag; + private Integer fileFlag; /** * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0 */ @TableField(value = "DEALFLAG") - private Boolean dealFlag; + private Integer dealFlag; /** * 处理结果第一条事件发生时间(读comtra文件获取) diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java index 71333c6..50b3787 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java @@ -82,13 +82,13 @@ public class RmpEventDetailPO implements Serializable { * 波形文件是否从装置招到本地(0：未招，1：已招)默认值为0 */ @TableField(value = "file_flag") - private Boolean fileFlag; + private Integer fileFlag; /** * 特征值计算标志（0，未处理；1，已处理; 2，已处理，无结果;3，计算失败）默认值为0 */ @TableField(value = "deal_flag") - private Boolean dealFlag; + private Integer dealFlag; /** * 处理结果第一条事件发生时间(读comtra文件获取) diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/OracleRmpEventDetailPOMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/OracleRmpEventDetailPOMapper.java index e7e185b..81e47f3 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/OracleRmpEventDetailPOMapper.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/OracleRmpEventDetailPOMapper.java @@ -2,8 +2,11 @@ package com.njcn.influx.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.influx.base.InfluxDbBaseMapper; +import com.njcn.influx.bo.po.DictData; import com.njcn.influx.bo.po.OracleRmpEventDetailPO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * data-migration @@ -14,4 +17,5 @@ import com.njcn.influx.bo.po.OracleRmpEventDetailPO; @DS("master") public interface OracleRmpEventDetailPOMapper extends BaseMapper { + List selectByDicCodeList(@Param("code") String code); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/RmpEventDetailPOMapper.java b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/RmpEventDetailPOMapper.java index 4af84af..36457cc 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/RmpEventDetailPOMapper.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/RmpEventDetailPOMapper.java @@ -2,9 +2,11 @@ package com.njcn.influx.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.influx.base.InfluxDbBaseMapper; -import com.njcn.influx.bo.po.OracleRmpEventDetailPO; +import com.njcn.influx.bo.po.DictData; import com.njcn.influx.bo.po.RmpEventDetailPO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * data-migration @@ -15,4 +17,5 @@ import com.njcn.influx.bo.po.RmpEventDetailPO; @DS("target") public interface RmpEventDetailPOMapper extends BaseMapper { + List selectByDicCodeList(@Param("code") String code); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/OracleRmpEventDetailPOMapper.xml b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/OracleRmpEventDetailPOMapper.xml new file mode 100644 index 0000000..e9608c7 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/OracleRmpEventDetailPOMapper.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/RmpEventDetailPOMapper.xml b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/RmpEventDetailPOMapper.xml new file mode 100644 index 0000000..ffcd154 --- /dev/null +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/mapper/mapping/RmpEventDetailPOMapper.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleEventDetailToMysqlService.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleEventDetailToMysqlService.java index 976cbab..fda22d0 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleEventDetailToMysqlService.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/OracleEventDetailToMysqlService.java @@ -1,6 +1,8 @@ package com.njcn.influx.service; -import java.time.LocalDate; +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.influx.bo.po.RmpEventDetailPO; + import java.time.LocalDateTime; /** @@ -9,9 +11,7 @@ import java.time.LocalDateTime; * @author cdf * @date 2024/2/19 */ -public interface OracleEventDetailToMysqlService { - - +public interface OracleEventDetailToMysqlService extends IService { void eventBatch(LocalDateTime start, LocalDateTime end); } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java index fbed0f2..2b4936a 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java @@ -1,9 +1,11 @@ package com.njcn.influx.service.impl; -import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.njcn.influx.bo.po.OracleRmpEventDetailPO; -import com.njcn.influx.bo.po.RmpEventDetailPO; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.influx.bo.po.*; import com.njcn.influx.mapper.OracleRmpEventDetailPOMapper; import com.njcn.influx.mapper.RmpEventDetailPOMapper; import com.njcn.influx.service.OracleEventDetailToMysqlService; @@ -12,7 +14,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * data-migration @@ -22,7 +28,8 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class OracleEventDetailToMysqlServiceImpl implements OracleEventDetailToMysqlService { +@DS("target") +public class OracleEventDetailToMysqlServiceImpl extends ServiceImpl implements OracleEventDetailToMysqlService { private final PqLineBakService pqLineBakService; @@ -30,21 +37,117 @@ public class OracleEventDetailToMysqlServiceImpl implements OracleEventDetailToM private final RmpEventDetailPOMapper rmpEventDetailPOMapper; - - - + /** + * 每小时执行一次该方法 + * 1.读取Oracle中暂态事件表信息(PQS_EVENTDETAIL) + * 2.读取Mysql中pq_line_bak表获取Oracle和Mysql中监测点关系 + * 3.读取Mysql中r_mp_event_detail + */ @Override public void eventBatch(LocalDateTime start, LocalDateTime end){ + List list = pqLineBakService.list(); + //lineId:Oracle监测点ID id:Mysql监测点ID + Map oracleRelationMysql = list.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); + //获取Oracle字典 暂降类型：12 暂降原因：13 + List oracleReason= oracleRmpEventDetailPOMapper.selectByDicCodeList("13"); + List oracleType= oracleRmpEventDetailPOMapper.selectByDicCodeList("12"); + //获取Mysql字典 + List eventType = rmpEventDetailPOMapper.selectByDicCodeList("Event_Statis"); + List mysqlReason = rmpEventDetailPOMapper.selectByDicCodeList("Event_Reason"); + List mysqlType = rmpEventDetailPOMapper.selectByDicCodeList("Event_Type"); + //字典类型 + Map mapReason = getRelationList(oracleReason, mysqlReason); + Map mapType = getRelationList(oracleType, mysqlType); + + List poList=new ArrayList<>(); List oracleRmpEventDetailPOList = oracleRmpEventDetailPOMapper.selectList(new LambdaQueryWrapper().between(OracleRmpEventDetailPO::getStartTime,start,end)); - - - List poList = BeanUtil.copyToList(oracleRmpEventDetailPOList, RmpEventDetailPO.class); - - - - - System.out.println("55555"); + RmpEventDetailPO po; + for (OracleRmpEventDetailPO oracleDetail : oracleRmpEventDetailPOList) { + if(oracleRelationMysql.containsKey(oracleDetail.getMeasurementPointId())){ + String mysqlLineID = oracleRelationMysql.get(oracleDetail.getMeasurementPointId()); + po=new RmpEventDetailPO(); + po.setMeasurementPointId(mysqlLineID); + po.setEventType(eventTypeId(oracleDetail.getEventType(),eventType)); + po.setAdvanceReason(getDicId(oracleDetail.getAdvanceReason(),mapReason)); + po.setAdvanceType(getDicId(oracleDetail.getAdvanceType(),mapType)); + po.setEventassIndex(oracleDetail.getEventassIndex()); + po.setDqTime(oracleDetail.getDqTime()); + po.setDealTime(oracleDetail.getDealTime()); + po.setNum(oracleDetail.getNum()); + po.setFileFlag(oracleDetail.getFileFlag()); + po.setDealFlag(oracleDetail.getDealFlag()); + po.setFirstTime(oracleDetail.getFirstTime()); + po.setFirstType(oracleDetail.getFirstType()); + po.setFirstMs(oracleDetail.getFirstMs()); + po.setEnergy(oracleDetail.getEnergy()); + po.setSeverity(oracleDetail.getSeverity()); + po.setSagsource(oracleDetail.getSagsource()); + po.setStartTime(oracleDetail.getStartTime()); + po.setDuration(oracleDetail.getDuration()); + po.setFeatureAmplitude(oracleDetail.getFeatureAmplitude()); + po.setPhase(oracleDetail.getPhase()); + po.setEventDescribe(oracleDetail.getEventDescribe()); + po.setWavePath(oracleDetail.getWavePath()); + po.setTransientValue(oracleDetail.getTransientValue()); + poList.add(po); + } + } + if(CollUtil.isNotEmpty(poList)){ + this.remove(new LambdaQueryWrapper().between(RmpEventDetailPO::getStartTime, start, end)); + this.saveBatch(poList,500); + } } + + //获取暂降类型id + private String eventTypeId(String eventType, List eventTypeList){ + String code=""; + //事件类型（0：扰动，1：暂降，2：暂升，3：中断，4：其他，5：录波） + if("0".equals(eventType)){ + code="Disturbance"; + } + if("1".equals(eventType)){ + code="Voltage_Dip"; + } + if("2".equals(eventType)){ + code="Voltage_Rise"; + } + if("3".equals(eventType)){ + code="Short_Interruptions"; + } + if("4".equals(eventType)){ + code="Other"; + } + if("5".equals(eventType)){ + code="Recording_Wave"; + } + String finalCode = code; + DictData dictData = eventTypeList.stream().filter(x -> finalCode.equals(x.getCode())).findFirst().get(); + if(ObjectUtil.isNotNull(dictData)){ + return dictData.getId(); + } + return ""; + } + + //类型匹配 + private Map getRelationList(List oracleReason,List mysqlReason){ + Map map=new HashMap<>(); + for (DictData dictData : oracleReason) { + for (DictData data : mysqlReason) { + if(dictData.getAlgoDescribe()==data.getAlgoDescribe()){ + map.put(dictData.getId(),data.getId()); + } + } + } + return map; + } + + private String getDicId(String dicReason,Map map){ + if(map.containsKey(dicReason)){ + return map.get(dicReason); + } + return ""; + } + } 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 070d93e..fee17dd 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 @@ -3,6 +3,7 @@ package com.njcn.influx.job; import com.njcn.influx.bo.param.TableEnum; import com.njcn.influx.service.OracleEventDetailToMysqlService; import com.njcn.influx.service.OracleToInfluxDBService; +import com.njcn.influx.service.impl.OracleEventDetailToMysqlServiceImpl; import com.njcn.oracle.bo.param.DataAsynParam; import com.njcn.oracle.bo.param.ServiceTypeEnum; import lombok.RequiredArgsConstructor; @@ -64,16 +65,16 @@ public class OracleToInfluxDBJob { } - /* @Scheduled(cron="0 55 23 * * ?") - public void executeEvent() { - DataAsynParam dataAsynParam = new DataAsynParam(); - // 获取当前时间 - LocalDateTime end = LocalDateTime.now(); - - // 减去24时 - LocalDateTime begin = end.minusHours(24); - - - oracleEventDetailToMysqlService.eventBatch(begin,end); - }*/ +// @Scheduled(cron="0 55 23 * * ?") +// public void executeEvent() { +// // 获取当前时间 +// LocalDateTime now = LocalDateTime.now(); +// // 减去一个小时 +// LocalDateTime oneHourAgo = now.minusHours(1); +// // 将分钟和秒设置为0 +// LocalDateTime result = oneHourAgo.truncatedTo(ChronoUnit.HOURS); +// // 加上59分钟59秒 +// LocalDateTime modifiedResult = result.plusMinutes(59).plusSeconds(59); +// oracleEventDetailToMysqlService.eventBatch(result,modifiedResult); +// } }