From 3141eaa72b0765ccdc769c55e81d75387f28919f Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 4 Jun 2024 10:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/influx/config/IdMappingCache.java | 17 +++++++++-------- .../OracleMonitorStatusToMysqlServiceImpl.java | 4 ++-- .../impl/OracleToInfluxDBServiceImpl.java | 8 ++++---- .../impl/PqsOnlineratePOServiceImpl.java | 4 ++-- .../com/njcn/mysql/job/OracleToMysqlDBJob.java | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) 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 f3d61e7..2870d5b 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 @@ -30,26 +30,27 @@ public class IdMappingCache { private PqLineBakService pqLineBakService; @Autowired private IPqDeviceBakService pqDeviceBakService; - public static Map IdMapping = new HashMap<>(); + public static Map DevIdMapping = new HashMap<>(); + public static Map LineIdMapping = 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 ); + String lineId = row.getLineId(); + LineIdMapping.put(lineId,id ); } List list = pqDeviceBakService.list(); for (PqDeviceBak row : list) { String id = row.getId(); - String dev_id = row.getDevId()+""; - IdMapping.put(dev_id,id ); + String devId = row.getDevId()+""; + DevIdMapping.put(devId,id ); } } - public String getDataById(String id) { - return IdMapping.get(id); - } +// public String getDataById(String id) { +// return IdMapping.get(id); +// } } diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleMonitorStatusToMysqlServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleMonitorStatusToMysqlServiceImpl.java index 85af82f..8cdad72 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleMonitorStatusToMysqlServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleMonitorStatusToMysqlServiceImpl.java @@ -57,10 +57,10 @@ public class OracleMonitorStatusToMysqlServiceImpl implements OracleMonitorStatu List tempList = new ArrayList<>(); pqDevices.stream().forEach(temp->{ String id =""; - if (!IdMappingCache.IdMapping.containsKey(temp.getDevIndex()+"")){ + if (!IdMappingCache.DevIdMapping.containsKey(temp.getDevIndex()+"")){ return; }else { - id=IdMappingCache.IdMapping.get(temp.getDevIndex()+""); + id=IdMappingCache.DevIdMapping.get(temp.getDevIndex()+""); } pqDeviceMysqlService.update(new LambdaUpdateWrapper() .set(PqDeviceMysql::getRunFlag,temp.getDevFlag()) 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 3e2ed4c..1804152 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 @@ -128,11 +128,11 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { Field id = obj.getClass().getDeclaredField("lineid"); id.setAccessible(true); //暴力访问id String id1 = id.get(obj).toString(); - if (!IdMappingCache.IdMapping.containsKey(id1)){ + if (!IdMappingCache.LineIdMapping.containsKey(id1)){ log.info(tableName+"表---Oralcet数据同步到InfluxDB未找mysql中到lineid匹配的lineid"+id1); iterator.remove(); }else { - id.set(obj, IdMappingCache.IdMapping.get(id1)); + id.set(obj, IdMappingCache.LineIdMapping.get(id1)); } }catch (Exception e){ e.printStackTrace(); @@ -266,11 +266,11 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService { Field id = obj.getClass().getDeclaredField("lineid"); id.setAccessible(true); //暴力访问id String id1 = id.get(obj).toString(); - if (!IdMappingCache.IdMapping.containsKey(id1)){ + if (!IdMappingCache.LineIdMapping.containsKey(id1)){ log.info(tableName+"表---Oralcet数据同步到InfluxDB未找mysql中到lineid匹配的lineid"+id1); iterator.remove(); }else { - id.set(obj, IdMappingCache.IdMapping.get(id1)); + id.set(obj, IdMappingCache.LineIdMapping.get(id1)); } }catch (Exception e){ e.printStackTrace(); 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 index cd7ffd2..8e7d720 100644 --- 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 @@ -51,10 +51,10 @@ public class PqsOnlineratePOServiceImpl extends ServiceImpl { PqsOnlinerateMysql pqsOnlinerateMysql = new PqsOnlinerateMysql(); - if (!IdMappingCache.IdMapping.containsKey(temp.getDevIndex()+"")){ + if (!IdMappingCache.DevIdMapping.containsKey(temp.getDevIndex()+"")){ return; }else { - pqsOnlinerateMysql.setDevIndex(IdMappingCache.IdMapping.get(temp.getDevIndex()+"")); + pqsOnlinerateMysql.setDevIndex(IdMappingCache.DevIdMapping.get(temp.getDevIndex()+"")); } pqsOnlinerateMysql.setTimeId(temp.getTimeid()); pqsOnlinerateMysql.setOnlineMin(temp.getOnlinemin()); 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 74b63cb..cc7c4e6 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 @@ -33,7 +33,7 @@ public class OracleToMysqlDBJob { @Scheduled(cron="0 0 7 * * ?") public void executeEvent() { // 获取当前时间 - String date = DateUtil.format(LocalDateTime.now(), DatePattern.NORM_DATE_PATTERN); + String date = DateUtil.format(LocalDateTime.now().minusDays(1), DatePattern.NORM_DATE_PATTERN); System.out.println("-----------------------------------------------------------------------"); oracleToMysqlService.insertDayHarmRateV(date,date); oracleToMysqlService.insertPqsIntegrity(date,date);