From 639bcfe3ed7114260ee285ba2cede34d56e2bf47 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Mon, 25 Mar 2024 09:45:47 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-25=2009:47:00=20=E5=86=B6=E9=87=91?=
 =?UTF-8?q?=E7=94=B5=E7=AA=91=E7=82=89=E6=A8=A1=E5=9E=8B=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dky/utils/ConfigReader.java | 15 +++++++++++++++
 .../src/main/java/calculate/MetalKilnScheme.java  |  9 ++-------
 ...delCode.properties => IndustryCode.properties} |  0
 .../com/dky/stirtpar/StirparModelCalculate.java   |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)
 rename dntd-model-metalkiln/src/main/resources/{modelCode.properties => IndustryCode.properties} (100%)

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<SysDeviceHeatScene> getSchemeList(String userIndustry, Double needTemp, List<SysDeviceHeatScene> sysDeviceHeatSceneList) {
         // 黑色金属矿采选业 行业编码
-        String property = ConfigReader.getProperty("industry_code");
+        String property = ConfigReader.getPropertyByFile("industry_code", "IndustryCode.properties");
         Map<String, Object> map = new HashMap<>();
         List<SysDeviceHeatScene> 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<SysDeviceHeatScene>) 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;
     }