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 6ce38ab..a9045c5 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
@@ -47,7 +47,7 @@ public class OracleToInfluxDBJob {
}*/
//每小时03分钟时执行上一个小时的数据同步
- @Scheduled(cron="0 3 * * * ?")
+ @Scheduled(cron="0/10 0 * * * ?")
public void executeHours() {
DataAsynParam dataAsynParam = new DataAsynParam();
// 获取当前时间
diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/PqLineDetail.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/PqLineDetail.java
new file mode 100644
index 0000000..0c80261
--- /dev/null
+++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/PqLineDetail.java
@@ -0,0 +1,180 @@
+package com.njcn.mysql.bo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ *
+ *
+ *
+ * @author wr
+ * @since 2024-06-05
+ */
+@Getter
+@Setter
+@TableName("pq_line_detail")
+public class PqLineDetail {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 监测点序号
+ */
+ private String id;
+
+ /**
+ * 线路号（在同一台设备中的监测点号）
+ */
+ private Integer num;
+
+ /**
+ * PT一次变比
+ */
+ private Float pt1;
+
+ /**
+ * PT二次变比
+ */
+ private Float pt2;
+
+ /**
+ * CT一次变比
+ */
+ private Float ct1;
+
+ /**
+ * CT二次变比
+ */
+ private Float ct2;
+
+ /**
+ * 设备容量
+ */
+ private Float devCapacity;
+
+ /**
+ * 短路容量
+ */
+ private Float shortCapacity;
+
+ /**
+ * 基准容量
+ */
+ private Float standardCapacity;
+
+ /**
+ * 协议容量
+ */
+ private Float dealCapacity;
+
+ /**
+ * 接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)
+ */
+ private Boolean ptType;
+
+ /**
+ * 测量间隔（1-10分钟）
+ */
+ private Integer timeInterval;
+
+ /**
+ * 干扰源类型,字典表
+ */
+ private String loadType;
+
+ /**
+ * 行业类型，字典表
+ */
+ private String businessType;
+
+ /**
+ * 网公司谐波监测平台标志(0-否;1-是)，默认否
+ */
+ private Boolean monitorFlag;
+
+ /**
+ * 电网标志（0-电网侧；1-非电网侧）
+ */
+ private Boolean powerFlag;
+
+ /**
+ * 国网谐波监测平台监测点号
+ */
+ private String monitorId;
+
+ /**
+ * 监测点对象名称
+ */
+ private String objName;
+
+ /**
+ * 人为干预是否参与统计（0：不参与，1：参与）默认参与统计
+ */
+ private Boolean statFlag;
+
+ /**
+ * 终端等级，关联字典表
+ */
+ private String lineGrade;
+
+ /**
+ * 电网侧变电站
+ */
+ private String powerSubstationName;
+
+ /**
+ * 分类等级
+ */
+ private String calssificationGrade;
+
+ /**
+ * 上级变电站
+ */
+ private String superiorsSubstation;
+
+ /**
+ * 挂接线路
+ */
+ private String hangLine;
+
+ /**
+ * 用户联系人
+ */
+ private String owner;
+
+ /**
+ * 联系人职务
+ */
+ private String ownerDuty;
+
+ /**
+ * 联系人号码
+ */
+ private String ownerTel;
+
+ private String remark;
+
+ /**
+ * 主接线图路径
+ */
+ private String wiringDiagram;
+
+ /**
+ * 监测点接线相别（0，单相,1，三相，默认三相）
+ */
+ private Boolean ptPhaseType;
+
+ /**
+ * 监测点实际安装位置
+ */
+ private String actualArea;
+
+ /**
+ * 监测点运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
+ */
+ private Boolean runFlag;
+
+
+}
diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java
index 7c3123b..35a863c 100644
--- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java
+++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java
@@ -81,4 +81,12 @@ public interface OracleDataService {
* @return
*/
List getDayInHarmV(String time);
+
+
+ /**
+ * 查询oracle中PQ_Line数据
+ * @param
+ * @return
+ */
+ List getLineList();
}
diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java
index 38c9a40..13d6d52 100644
--- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java
+++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java
@@ -28,6 +28,7 @@ public class OracleDataServiceImpl implements OracleDataService {
private final DayPltMapper dayPltMapper;
private final DayFlickerMapper dayFlickerMapper;
private final DayInharmVMapper dayInharmVMapper;
+ private final LineMapper lineMapper;
@@ -108,4 +109,9 @@ public class OracleDataServiceImpl implements OracleDataService {
lambdaQueryWrapper.apply("TIMEID = to_date({0},'yyyy-mm-dd')",time);
return dayInharmVMapper.selectList(lambdaQueryWrapper);
}
+
+ @Override
+ public List getLineList() {
+ return lineMapper.selectList(new LambdaQueryWrapper<>());
+ }
}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java
index 3270ba9..134e6a9 100644
--- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java
@@ -139,16 +139,4 @@ public class OracleToMysqlController {
}
- public static void main(String[] args) {
- RStatDataPltD user = new RStatDataPltD();
- user.setPlt(1101111.0f);
- try {
- MaxValueProcessor.process(user);
- System.out.println(user.getPlt());
- } catch (Exception e) {
- System.out.println("Validation failed: " + e.getMessage());
- }
- }
-
-
}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java
index cc7c4e6..cf677fc 100644
--- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java
@@ -34,7 +34,7 @@ public class OracleToMysqlDBJob {
public void executeEvent() {
// 获取当前时间
String date = DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN);
- System.out.println("-----------------------------------------------------------------------");
+ System.out.println("-----------------------------day表同步------------------------------------------");
oracleToMysqlService.insertDayHarmRateV(date,date);
oracleToMysqlService.insertPqsIntegrity(date,date);
oracleToMysqlService.insertDayV(date,date);
@@ -46,7 +46,14 @@ public class OracleToMysqlDBJob {
oracleToMysqlService.insertPlt(date,date);
oracleToMysqlService.insertFlicker(date,date);
oracleToMysqlService.insertInHarmV(date,date);
- System.out.println("-----------------------------------------------------------------------\n");
+ System.out.println("--------------------------------------------------------------------------------\n");
}
+ @Scheduled(cron="0 0/10 * * * ?")
+ public void executeLineRunFlag() {
+ // 获取当前时间
+ System.out.println("--------------------------------监测点运行状态同步------------------------------------");
+ oracleToMysqlService.LineRunFlag();
+ System.out.println("-----------------------------------------------------------------------------------\n");
+ }
}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/PqLineDetailMapper.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/PqLineDetailMapper.java
new file mode 100644
index 0000000..fe5b28a
--- /dev/null
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/PqLineDetailMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.mysql.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.mysql.bo.po.PqLineDetail;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author wr
+ * @since 2024-06-05
+ */
+public interface PqLineDetailMapper extends MppBaseMapper {
+
+}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/mapping/PqLineDetailMapper.xml b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/mapping/PqLineDetailMapper.xml
new file mode 100644
index 0000000..b0aa839
--- /dev/null
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/mapper/mapping/PqLineDetailMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/IPqLineDetailService.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/IPqLineDetailService.java
new file mode 100644
index 0000000..97f3206
--- /dev/null
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/IPqLineDetailService.java
@@ -0,0 +1,16 @@
+package com.njcn.mysql.service;
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.mysql.bo.po.PqLineDetail;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author wr
+ * @since 2024-06-05
+ */
+public interface IPqLineDetailService extends IMppService {
+
+}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/OracleToMysqlService.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/OracleToMysqlService.java
index f607772..9741da4 100644
--- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/OracleToMysqlService.java
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/OracleToMysqlService.java
@@ -77,4 +77,11 @@ public interface OracleToMysqlService {
* @param endTime
*/
void insertInHarmV(String startTime, String endTime);
+
+ /**
+ * @Description: 监测团运行状态同步
+ * @param
+ * @Author: wr
+ */
+ void LineRunFlag();
}
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java
index f119039..33f9699 100644
--- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java
@@ -2,6 +2,7 @@ package com.njcn.mysql.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.njcn.mysql.bo.enums.TargetEnum;
import com.njcn.mysql.bo.po.*;
import com.njcn.mysql.service.*;
@@ -37,6 +38,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService {
private final IRStatDataPltDService statDataPltDService;
private final IRStatDataFlickerDService statDataFlickerDService;
private final IRStatDataInharmVDService statDataInharmVDService;
+ private final IPqLineDetailService pqLineDetailService;
@Override
@@ -521,6 +523,30 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService {
});
}
+ @Override
+ public void LineRunFlag() {
+ List bakList = pqLineBakService.list();
+ //lineId:Oracle监测点ID id:Mysql监测点ID
+ Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId));
+ //获取oracle监测点接口
+ List list = oracleDataService.getLineList();
+ if(CollUtil.isNotEmpty(list)){
+ list.forEach(data->{
+ if (ObjUtil.isNotNull(oracleRelationMysql.get(data.getLineIndex()))) {
+ if(ObjUtil.isNotNull(data.getStatus())){
+ //mysql监测id
+ pqLineDetailService.update(new LambdaUpdateWrapper()
+ .set(PqLineDetail::getRunFlag, data.getStatus())
+ .eq(PqLineDetail::getId, oracleRelationMysql.get(data.getLineIndex()))
+ );
+ }
+
+ }
+ });
+ }
+
+ }
+
public RStatDataHarmrateVD getData1(DayHarmrateV data, Map oracleRelationMysql, String valueType) {
ZoneId zoneId = ZoneId.systemDefault();
RStatDataHarmrateVD po1 = new RStatDataHarmrateVD();
diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/PqLineDetailServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/PqLineDetailServiceImpl.java
new file mode 100644
index 0000000..c4b36c2
--- /dev/null
+++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/PqLineDetailServiceImpl.java
@@ -0,0 +1,22 @@
+package com.njcn.mysql.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.mysql.bo.po.PqLineDetail;
+import com.njcn.mysql.mapper.PqLineDetailMapper;
+import com.njcn.mysql.service.IPqLineDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author wr
+ * @since 2024-06-05
+ */
+@Service
+@DS("target")
+public class PqLineDetailServiceImpl extends MppServiceImpl implements IPqLineDetailService {
+
+}
diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/Line.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/Line.java
new file mode 100644
index 0000000..2f9e774
--- /dev/null
+++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/Line.java
@@ -0,0 +1,76 @@
+package com.njcn.oracle.bo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+/**
+ * 线路信息表
+ * */
+@Data
+@TableName("PQ_LINE")
+public class Line {
+
+ @TableField("LINE_INDEX")
+ private String lineIndex;
+
+ @TableField("SUB_INDEX")
+ private String subIndex;
+
+ @TableField("GD_INDEX")
+ private String gdIndex;
+
+ @TableField("SUBV_INDEX")
+ private String subvIndex;
+
+ @TableField( "DEV_INDEX")
+ private String devIndex;
+
+ @TableField( "NAME")
+ private String name;
+
+ @TableField("PT1")
+ private Float pt1;
+
+ @TableField("PT2")
+ private Float pt2;
+
+ @TableField("CT1")
+ private Float ct1;
+
+ @TableField("ct2")
+ private Float ct2;
+
+ //设备容量
+ @TableField("DEVCMP")
+ private Float devcMp;
+
+ //短路容量
+ @TableField("DLCMP")
+ private Float dlcMp;
+
+ //基准容量
+ @TableField("JZCMP")
+ private Float jzcMp;
+
+ //协议容量
+ @TableField("XYCMP")
+ private Float xycMp;
+
+ @TableField("SUBV_NO")
+ private Integer subVNo;
+
+
+ @TableField("SCALE")
+ private String scale;
+
+ @TableField("SUBV_NAME")
+ private String subvName;
+
+ //监测点状态(0：投运；1：退运)
+ @TableField("STATUS")
+ private Integer status;
+
+
+}
diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/LineMapper.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/LineMapper.java
new file mode 100644
index 0000000..4955fef
--- /dev/null
+++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/LineMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.oracle.mapper;
+
+import com.njcn.oracle.bo.po.Line;
+import com.njcn.oracle.mybatis.mapper.BatchBaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author hongawen
+ * @since 2023-12-28
+ */
+public interface LineMapper extends BatchBaseMapper {
+
+}
diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/mapping/LineMapper.xml b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/mapping/LineMapper.xml
new file mode 100644
index 0000000..1bdee06
--- /dev/null
+++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/mapper/mapping/LineMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+