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

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