代码调整

This commit is contained in:
xy
2024-06-04 10:30:25 +08:00
parent ad8fcd8d33
commit 3141eaa72b
5 changed files with 18 additions and 17 deletions

View File

@@ -30,26 +30,27 @@ public class IdMappingCache {
private PqLineBakService pqLineBakService; private PqLineBakService pqLineBakService;
@Autowired @Autowired
private IPqDeviceBakService pqDeviceBakService; private IPqDeviceBakService pqDeviceBakService;
public static Map<String, String> IdMapping = new HashMap<>(); public static Map<String, String> DevIdMapping = new HashMap<>();
public static Map<String, String> LineIdMapping = new HashMap<>();
@PostConstruct @PostConstruct
public void init() { public void init() {
List<PqLineBak> resultList = pqLineBakService.list(); List<PqLineBak> resultList = pqLineBakService.list();
for (PqLineBak row : resultList) { for (PqLineBak row : resultList) {
String id = row.getId(); String id = row.getId();
String line_id = row.getLineId(); String lineId = row.getLineId();
IdMapping.put(line_id,id ); LineIdMapping.put(lineId,id );
} }
List<PqDeviceBak> list = pqDeviceBakService.list(); List<PqDeviceBak> list = pqDeviceBakService.list();
for (PqDeviceBak row : list) { for (PqDeviceBak row : list) {
String id = row.getId(); String id = row.getId();
String dev_id = row.getDevId()+""; String devId = row.getDevId()+"";
IdMapping.put(dev_id,id ); DevIdMapping.put(devId,id );
} }
} }
public String getDataById(String id) { // public String getDataById(String id) {
return IdMapping.get(id); // return IdMapping.get(id);
} // }
} }

View File

@@ -57,10 +57,10 @@ public class OracleMonitorStatusToMysqlServiceImpl implements OracleMonitorStatu
List<PqDeviceMysql> tempList = new ArrayList<>(); List<PqDeviceMysql> tempList = new ArrayList<>();
pqDevices.stream().forEach(temp->{ pqDevices.stream().forEach(temp->{
String id =""; String id ="";
if (!IdMappingCache.IdMapping.containsKey(temp.getDevIndex()+"")){ if (!IdMappingCache.DevIdMapping.containsKey(temp.getDevIndex()+"")){
return; return;
}else { }else {
id=IdMappingCache.IdMapping.get(temp.getDevIndex()+""); id=IdMappingCache.DevIdMapping.get(temp.getDevIndex()+"");
} }
pqDeviceMysqlService.update(new LambdaUpdateWrapper<PqDeviceMysql>() pqDeviceMysqlService.update(new LambdaUpdateWrapper<PqDeviceMysql>()
.set(PqDeviceMysql::getRunFlag,temp.getDevFlag()) .set(PqDeviceMysql::getRunFlag,temp.getDevFlag())

View File

@@ -128,11 +128,11 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
Field id = obj.getClass().getDeclaredField("lineid"); Field id = obj.getClass().getDeclaredField("lineid");
id.setAccessible(true); //暴力访问id id.setAccessible(true); //暴力访问id
String id1 = id.get(obj).toString(); 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); log.info(tableName+"表---Oralcet数据同步到InfluxDB未找mysql中到lineid匹配的lineid"+id1);
iterator.remove(); iterator.remove();
}else { }else {
id.set(obj, IdMappingCache.IdMapping.get(id1)); id.set(obj, IdMappingCache.LineIdMapping.get(id1));
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
@@ -266,11 +266,11 @@ public class OracleToInfluxDBServiceImpl implements OracleToInfluxDBService {
Field id = obj.getClass().getDeclaredField("lineid"); Field id = obj.getClass().getDeclaredField("lineid");
id.setAccessible(true); //暴力访问id id.setAccessible(true); //暴力访问id
String id1 = id.get(obj).toString(); 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); log.info(tableName+"表---Oralcet数据同步到InfluxDB未找mysql中到lineid匹配的lineid"+id1);
iterator.remove(); iterator.remove();
}else { }else {
id.set(obj, IdMappingCache.IdMapping.get(id1)); id.set(obj, IdMappingCache.LineIdMapping.get(id1));
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();

View File

@@ -51,10 +51,10 @@ public class PqsOnlineratePOServiceImpl extends ServiceImpl<PqsOnlineratePOMappe
list.stream().forEach(temp -> { list.stream().forEach(temp -> {
PqsOnlinerateMysql pqsOnlinerateMysql = new PqsOnlinerateMysql(); PqsOnlinerateMysql pqsOnlinerateMysql = new PqsOnlinerateMysql();
if (!IdMappingCache.IdMapping.containsKey(temp.getDevIndex()+"")){ if (!IdMappingCache.DevIdMapping.containsKey(temp.getDevIndex()+"")){
return; return;
}else { }else {
pqsOnlinerateMysql.setDevIndex(IdMappingCache.IdMapping.get(temp.getDevIndex()+"")); pqsOnlinerateMysql.setDevIndex(IdMappingCache.DevIdMapping.get(temp.getDevIndex()+""));
} }
pqsOnlinerateMysql.setTimeId(temp.getTimeid()); pqsOnlinerateMysql.setTimeId(temp.getTimeid());
pqsOnlinerateMysql.setOnlineMin(temp.getOnlinemin()); pqsOnlinerateMysql.setOnlineMin(temp.getOnlinemin());

View File

@@ -33,7 +33,7 @@ public class OracleToMysqlDBJob {
@Scheduled(cron="0 0 7 * * ?") @Scheduled(cron="0 0 7 * * ?")
public void executeEvent() { 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("-----------------------------------------------------------------------"); System.out.println("-----------------------------------------------------------------------");
oracleToMysqlService.insertDayHarmRateV(date,date); oracleToMysqlService.insertDayHarmRateV(date,date);
oracleToMysqlService.insertPqsIntegrity(date,date); oracleToMysqlService.insertPqsIntegrity(date,date);