Compare commits
No commits in common. "ef496fdd29b6845b8b93e1b25eb2911176de210c" and "37bc7869b1356a13273f983f4d3d46b186ff4a43" have entirely different histories.
ef496fdd29
...
37bc7869b1
|
|
@ -59,9 +59,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionRateSauna(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionRate = calCulStationInfoPgMapper.findPhdfProvisionRateSauna(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionRate = calCulStationInfoMapper.findPhdfProvisionRateSauna(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionRate;
|
||||
|
|
@ -88,9 +88,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionEfficiencySauna(String liveLow, String liveHigh, String quantity, String mdc, String collectLow, String collectHigh, String xeVolume, String nuclideName, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionEfficiency = calCulStationInfoPgMapper.findPhdfProvisionEfficiencySauna(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencySauna(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionEfficiency;
|
||||
|
|
@ -109,9 +109,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
public ProvisionData findPhdProvisionRateSauna(String curDateTime, String pretime, String number, String stationId) {
|
||||
|
||||
ProvisionData provisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionRate = calCulStationInfoPgMapper.findPhdProvisionRateSauna(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionRate = calCulStationInfoMapper.findPhdProvisionRateSauna(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionRate;
|
||||
|
|
@ -138,9 +138,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionEfficiencySauna(String liveLow, String liveHigh, String quantity, String mdc, String collectLow, String collectHigh, String xeVolume, String nuclideName, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySauna(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySauna(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionEfficiency;
|
||||
|
|
@ -159,9 +159,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findMetProvisionSauna(String curDateTime, String pretime, String met, String stationId) {
|
||||
ProvisionData metProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
metProvision = calCulStationInfoPgMapper.findMetProvisionSauna(curDateTime, pretime, met, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
metProvision = calCulStationInfoMapper.findMetProvisionSauna(curDateTime, pretime, met, stationId);
|
||||
}
|
||||
return metProvision;
|
||||
|
|
@ -179,9 +179,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSohProvisionSauna(String curDateTime, String pretime, String soh, String stationId) {
|
||||
ProvisionData sohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sohProvision = calCulStationInfoPgMapper.findSohProvisionSauna(curDateTime, pretime, soh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sohProvision = calCulStationInfoMapper.findSohProvisionSauna(curDateTime, pretime, soh, stationId);
|
||||
}
|
||||
return sohProvision;
|
||||
|
|
@ -198,9 +198,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdProvisionSauna(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdProvision = calCulStationInfoPgMapper.findSphdProvisionSauna(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdProvision = calCulStationInfoMapper.findSphdProvisionSauna(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdProvision;
|
||||
|
|
@ -217,9 +217,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetProvisionSauna(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdMetProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetProvision = calCulStationInfoPgMapper.findSphdMetProvisionSauna(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetProvision = calCulStationInfoMapper.findSphdMetProvisionSauna(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdMetProvision;
|
||||
|
|
@ -239,9 +239,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetSohProvisionSauna(String SPHD_NUM, String MET_NUM, String curDateTime, String pretime, String sphdMetSoh, String stationId) {
|
||||
ProvisionData sphdMetSohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetSohProvision = calCulStationInfoPgMapper.findSphdMetSohProvisionSauna(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetSohProvision = calCulStationInfoMapper.findSphdMetSohProvisionSauna(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
}
|
||||
return sphdMetSohProvision;
|
||||
|
|
@ -259,9 +259,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionRateSpalax(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdfProvisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdfProvisionRate = calCulStationInfoPgMapper.findPhdfProvisionRateSpalax(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdfProvisionRate = calCulStationInfoMapper.findPhdfProvisionRateSpalax(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdfProvisionRate;
|
||||
|
|
@ -285,9 +285,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionEfficiencySpalax(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdfProvisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdfProvisionEfficiency = calCulStationInfoPgMapper.findPhdfProvisionEfficiencySpalax(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencySpalax(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdfProvisionEfficiency;
|
||||
|
|
@ -305,9 +305,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionRateSpalax(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionRate = calCulStationInfoPgMapper.findPhdProvisionRateSpalax(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionRate = calCulStationInfoMapper.findPhdProvisionRateSpalax(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdProvisionRate;
|
||||
|
|
@ -331,9 +331,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionEfficiencySpalax(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySpalax(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySpalax(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdProvisionEfficiency;
|
||||
|
|
@ -351,9 +351,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findMetProvisionSpalax(String curDateTime, String pretime, String met, String stationId) {
|
||||
ProvisionData metProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
metProvision = calCulStationInfoPgMapper.findMetProvisionSpalax(curDateTime, pretime, met, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
metProvision = calCulStationInfoMapper.findMetProvisionSpalax(curDateTime, pretime, met, stationId);
|
||||
}
|
||||
return metProvision;
|
||||
|
|
@ -371,9 +371,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSohProvisionSpalax(String curDateTime, String pretime, String soh, String stationId) {
|
||||
ProvisionData sohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sohProvision = calCulStationInfoPgMapper.findSohProvisionSpalax(curDateTime, pretime, soh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sohProvision = calCulStationInfoMapper.findSohProvisionSpalax(curDateTime, pretime, soh, stationId);
|
||||
}
|
||||
return sohProvision;
|
||||
|
|
@ -390,9 +390,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdProvisionSpalax(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdProvision = calCulStationInfoPgMapper.findSphdProvisionSpalax(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdProvision = calCulStationInfoMapper.findSphdProvisionSpalax(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdProvision;
|
||||
|
|
@ -409,9 +409,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetProvisionSpalax(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdMetProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetProvision = calCulStationInfoPgMapper.findSphdMetProvisionSpalax(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetProvision = calCulStationInfoMapper.findSphdMetProvisionSpalax(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdMetProvision;
|
||||
|
|
@ -431,9 +431,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetSohProvisionSpalax(String SPHD_NUM, String MET_NUM, String curDateTime, String pretime, String sphdMetSoh, String stationId) {
|
||||
ProvisionData sphdMetSohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetSohProvision = calCulStationInfoPgMapper.findSphdMetSohProvisionSpalax(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetSohProvision = calCulStationInfoMapper.findSphdMetSohProvisionSpalax(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
}
|
||||
return sphdMetSohProvision;
|
||||
|
|
@ -451,9 +451,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionRateParticulate(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdfProvisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdfProvisionRate = calCulStationInfoPgMapper.findPhdfProvisionRateParticulate(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdfProvisionRate = calCulStationInfoMapper.findPhdfProvisionRateParticulate(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdfProvisionRate;
|
||||
|
|
@ -476,15 +476,10 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionEfficiencyParticulate(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdfProvisionEfficiency = new ProvisionData();
|
||||
double liveLowVale = Double.parseDouble(liveLow) * 3600;
|
||||
double liveHighValue = Double.parseDouble(liveHigh) * 3600;
|
||||
double collectLowValue = Double.parseDouble(collectLow) / 24;
|
||||
double collectHighValue = Double.parseDouble(collectHigh) / 24;
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdfProvisionEfficiency = calCulStationInfoPgMapper.findPhdfProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencyParticulate(String.valueOf(liveLowVale),
|
||||
String.valueOf(liveHighValue), quantity, String.valueOf(collectLowValue), String.valueOf(collectHighValue), curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdfProvisionEfficiency;
|
||||
}
|
||||
|
|
@ -501,9 +496,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionRateParticulate(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionRate = calCulStationInfoPgMapper.findPhdProvisionRateParticulate(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionRate = calCulStationInfoMapper.findPhdProvisionRateParticulate(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdProvisionRate;
|
||||
|
|
@ -526,9 +521,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionEfficiencyParticulate(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdProvisionEfficiency;
|
||||
|
|
@ -546,9 +541,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findMetProvisionParticulate(String curDateTime, String pretime, String met, String stationId) {
|
||||
ProvisionData metProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
metProvision = calCulStationInfoPgMapper.findMetProvisionParticulate(curDateTime, pretime, met, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
metProvision = calCulStationInfoMapper.findMetProvisionParticulate(curDateTime, pretime, met, stationId);
|
||||
}
|
||||
return metProvision;
|
||||
|
|
@ -566,9 +561,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSohProvisionParticulate(String curDateTime, String pretime, String soh, String stationId) {
|
||||
ProvisionData sohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sohProvision = calCulStationInfoPgMapper.findSohProvisionParticulate(curDateTime, pretime, soh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sohProvision = calCulStationInfoMapper.findSohProvisionParticulate(curDateTime, pretime, soh, stationId);
|
||||
}
|
||||
return sohProvision;
|
||||
|
|
@ -585,9 +580,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdProvisionParticulate(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdProvision = calCulStationInfoPgMapper.findSphdProvisionParticulate(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdProvision = calCulStationInfoMapper.findSphdProvisionParticulate(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdProvision;
|
||||
|
|
@ -604,9 +599,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetProvisionParticulate(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdMetProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetProvision = calCulStationInfoPgMapper.findSphdMetProvisionParticulate(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetProvision = calCulStationInfoMapper.findSphdMetProvisionParticulate(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdMetProvision;
|
||||
|
|
@ -626,9 +621,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdMetSohProvisionParticulate(String SPHD_NUM, String MET_NUM, String curDateTime, String pretime, String sphdMetSoh, String stationId) {
|
||||
ProvisionData sphdMetSohProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdMetSohProvision = calCulStationInfoPgMapper.findSphdMetSohProvisionParticulate(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdMetSohProvision = calCulStationInfoMapper.findSphdMetSohProvisionParticulate(SPHD_NUM, MET_NUM, curDateTime, pretime, sphdMetSoh, stationId);
|
||||
}
|
||||
return sphdMetSohProvision;
|
||||
|
|
@ -641,15 +636,14 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
String result = CollectionUtils.isNotEmpty(detectorIds) ? "YES" : "NO";
|
||||
return result;
|
||||
}
|
||||
|
||||
//endregion
|
||||
//region 新加计算台站类型数据提供率方法
|
||||
@Override
|
||||
public ProvisionData findPhdfProvisionRateSauna2(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionRate = calCulStationInfoPgMapper.findPhdfProvisionRateSauna2(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionRate = calCulStationInfoMapper.findPhdfProvisionRateSauna2(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionRate;
|
||||
|
|
@ -658,9 +652,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionRateSauna2(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionRate = calCulStationInfoPgMapper.findPhdProvisionRateSauna2(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionRate = calCulStationInfoMapper.findPhdProvisionRateSauna2(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionRate;
|
||||
|
|
@ -669,9 +663,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionEfficiencySauna2(String liveLow, String liveHigh, String quantity, String mdc, String collectLow, String collectHigh, String xeVolume, String nuclideName, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData provisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
provisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySauna2(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
provisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySauna2(liveLow, liveHigh, quantity, mdc, collectLow, collectHigh, xeVolume, nuclideName, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return provisionEfficiency;
|
||||
|
|
@ -680,9 +674,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findSphdProvisionSauna2(String curDateTime, String pretime, String stationId) {
|
||||
ProvisionData sphdProvision = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
sphdProvision = calCulStationInfoPgMapper.findSphdProvisionSauna2(curDateTime, pretime, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
sphdProvision = calCulStationInfoMapper.findSphdProvisionSauna2(curDateTime, pretime, stationId);
|
||||
}
|
||||
return sphdProvision;
|
||||
|
|
@ -691,9 +685,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdfProvisionEfficiencySpalaxPLC(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdfProvisionEfficiency = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdfProvisionEfficiency = calCulStationInfoPgMapper.findPhdfProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdfProvisionEfficiency;
|
||||
|
|
@ -702,9 +696,9 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionRateSpalaxPLC(String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionRate = new ProvisionData();
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionRate = calCulStationInfoPgMapper.findPhdProvisionRateSpalaxPLC(curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionRate = calCulStationInfoMapper.findPhdProvisionRateSpalaxPLC(curDateTime, pretime, number, stationId);
|
||||
}
|
||||
return phdProvisionRate;
|
||||
|
|
@ -713,14 +707,14 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
|
|||
@Override
|
||||
public ProvisionData findPhdProvisionEfficiencySpalaxPLC(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String liveQc, String curDateTime, String pretime, String number, String stationId) {
|
||||
ProvisionData phdProvisionEfficiency = new ProvisionData();
|
||||
try {
|
||||
if (databaseType == DbType.POSTGRE_SQL) {
|
||||
phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType == DbType.ORACLE) {
|
||||
phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
System.out.println(e);
|
||||
try{
|
||||
if (databaseType== DbType.POSTGRE_SQL) {
|
||||
phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
} else if (databaseType== DbType.ORACLE) {
|
||||
phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
|
||||
}}
|
||||
catch(Exception e){
|
||||
System.out.println(e);
|
||||
}
|
||||
return phdProvisionEfficiency;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user