xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改findPhdfProvisionEfficiencyParticulate函数参数值

Browse Source
This commit is contained in:
duwenyuan 2025-06-30 10:26:28 +08:00
parent 8010b316b8
commit 9546f610b9
1 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/CalCulStationInfoServiceImpl.java
View File

@ -476,10 +476,15 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
@Override @Override
public ProvisionData findPhdfProvisionEfficiencyParticulate(String liveLow, String liveHigh, String quantity, String collectLow, String collectHigh, String curDateTime, String pretime, String number, String stationId) { 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(); 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); phdfProvisionEfficiency = calCulStationInfoPgMapper.findPhdfProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId);
} else if (databaseType == DbType.ORACLE) { } else if (databaseType == DbType.ORACLE) {
phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencyParticulate(liveLow, liveHigh, quantity, collectLow, collectHigh, curDateTime, pretime, number, stationId); phdfProvisionEfficiency = calCulStationInfoMapper.findPhdfProvisionEfficiencyParticulate(String.valueOf(liveLowVale),
String.valueOf(liveHighValue), quantity, String.valueOf(collectLowValue), String.valueOf(collectHighValue), curDateTime, pretime, number, stationId);
} }
return phdfProvisionEfficiency; return phdfProvisionEfficiency;
} }
@ -636,6 +641,7 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
String result = CollectionUtils.isNotEmpty(detectorIds) ? "YES" : "NO"; String result = CollectionUtils.isNotEmpty(detectorIds) ? "YES" : "NO";
return result; return result;
} }
//endregion //endregion
//region 新加计算台站类型数据提供率方法 //region 新加计算台站类型数据提供率方法
@Override @Override
@ -712,8 +718,8 @@ public class CalCulStationInfoServiceImpl implements ICalCulStationDataService {
phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId); phdProvisionEfficiency = calCulStationInfoPgMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
} else if (databaseType == DbType.ORACLE) { } else if (databaseType == DbType.ORACLE) {
phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId); phdProvisionEfficiency = calCulStationInfoMapper.findPhdProvisionEfficiencySpalaxPLC(liveLow, liveHigh, quantity, collectLow, collectHigh, liveQc, curDateTime, pretime, number, stationId);
}} }
catch(Exception e){ } catch (Exception e) {
System.out.println(e); System.out.println(e);
} }
return phdProvisionEfficiency; return phdProvisionEfficiency;