diff --git a/dntd-common/src/main/java/com/dky/utils/ConfigReader.java b/dntd-common/src/main/java/com/dky/utils/ConfigReader.java index bbfe9bd..8235c2f 100644 --- a/dntd-common/src/main/java/com/dky/utils/ConfigReader.java +++ b/dntd-common/src/main/java/com/dky/utils/ConfigReader.java @@ -21,4 +21,19 @@ public class ConfigReader { return prop.getProperty(key); } + public static String getPropertyByFile(String key, String fileName) { + InputStream input = ConfigReader.class.getClassLoader().getResourceAsStream(fileName); + if(input!= null) { + try { + prop.load(input); + } catch (IOException e) { + System.out.println("未找到场景配置文件"); + throw new RuntimeException(e); + } + }else { + throw new RuntimeException("Failed to find this file"); + } + return prop.getProperty(key); + } + } \ No newline at end of file diff --git a/dntd-model-metalkiln/src/main/java/calculate/MetalKilnScheme.java b/dntd-model-metalkiln/src/main/java/calculate/MetalKilnScheme.java index 2fe2221..648f9fd 100644 --- a/dntd-model-metalkiln/src/main/java/calculate/MetalKilnScheme.java +++ b/dntd-model-metalkiln/src/main/java/calculate/MetalKilnScheme.java @@ -45,7 +45,7 @@ public class MetalKilnScheme { public static List getSchemeList(String userIndustry, Double needTemp, List sysDeviceHeatSceneList) { // 黑色金属矿采选业 行业编码 - String property = ConfigReader.getProperty("industry_code"); + String property = ConfigReader.getPropertyByFile("industry_code", "IndustryCode.properties"); Map map = new HashMap<>(); List sceneDevicesList = new ArrayList<>(); @@ -73,7 +73,7 @@ public class MetalKilnScheme { map.put(item.getDevTechType(), list); }); - if ("3200".equals(userIndustry)) { + if (userIndustry.equals(property)) { sceneDevicesList = (List) map.get(DeviceSubType.Metal_Kiln_Electric_Arc.getDesc()); } else { if (needTemp >= MetalKinTemps.Metal_Kiln_Direct_Heat_Min_Temp.getTemp() && needTemp <= MetalKinTemps.Metal_Kiln_Direct_Heat_Max_Temp.getTemp()){ @@ -89,9 +89,4 @@ public class MetalKilnScheme { } - public static void main(String[] args) { - String property = ConfigReader.getProperty("industry_code"); - System.out.println(property); - } - } diff --git a/dntd-model-metalkiln/src/main/resources/modelCode.properties b/dntd-model-metalkiln/src/main/resources/IndustryCode.properties similarity index 100% rename from dntd-model-metalkiln/src/main/resources/modelCode.properties rename to dntd-model-metalkiln/src/main/resources/IndustryCode.properties diff --git a/dntd-tool/src/main/java/com/dky/stirtpar/StirparModelCalculate.java b/dntd-tool/src/main/java/com/dky/stirtpar/StirparModelCalculate.java index 9f98c95..360b619 100644 --- a/dntd-tool/src/main/java/com/dky/stirtpar/StirparModelCalculate.java +++ b/dntd-tool/src/main/java/com/dky/stirtpar/StirparModelCalculate.java @@ -81,7 +81,7 @@ public class StirparModelCalculate implements DntdModelI { Double add7 = CalculateUtils.add(add6, b7 * Math.log(T)); Double add8 = CalculateUtils.add(add7, e); - return Math.round(Math.exp(add8) * 100) / 100.0; + return add8; }