From 4c98df7616e6e21c199e021b0500738122b18cd7 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 11 Apr 2024 10:50:01 +0800 Subject: [PATCH] =?UTF-8?q?2024-04-11=2010:50:00=20=E7=AA=91=E7=82=89?= =?UTF-8?q?=E5=88=B6=E9=80=A0=E6=A8=A1=E5=9E=8B=E8=B0=83=E7=94=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dky/calculate/MaterialKilnScheme.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java b/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java index 25093dd..6eb87e8 100644 --- a/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java +++ b/dntd-model-materialkiln/src/main/java/com/dky/calculate/MaterialKilnScheme.java @@ -12,6 +12,10 @@ import java.util.stream.Collectors; public class MaterialKilnScheme { + // 建筑行业编码 + static final String[] PROPERTY_1 = new String[]{"3100","31B0","3140","3150","31C0"}; + // 黑色金属矿采选业 行业编码 + static final String[] PROPERTY_2 = new String[]{"3200","32A0","3250"}; public static List calSchemeByTechType(Double workArea, List sysDeviceHeatSceneList) { // 对技术类型下的设备list按照单台设备工作容积进行排序 @@ -43,10 +47,7 @@ public class MaterialKilnScheme { } public static List getSchemeList(String userIndustry, Double needTemp, List sysDeviceHeatSceneList) { - // 建筑行业编码 - String[] property1 = ConfigReader.getPropertyByFile("industry_codes1", "IndustryCode.properties").split(","); - // 黑色金属矿采选业 行业编码 - String[] property2 = ConfigReader.getPropertyByFile("industry_codes2", "IndustryCode.properties").split(","); + Map map = new HashMap<>(); List sceneDevicesList = new ArrayList<>(); @@ -75,11 +76,11 @@ public class MaterialKilnScheme { }); // 判断用户行业是否属于建筑 - if (new HashSet<>(Arrays.asList(property1)).contains(userIndustry)){ + if (new HashSet<>(Arrays.asList(PROPERTY_1)).contains(userIndustry)){ sceneDevicesList = (List) map.get(DeviceSubType.Material_Kiln.getDesc()); } else { // 判断用户行业是否属于黑色金属矿采选业 - if (new HashSet<>(Arrays.asList(property2)).contains(userIndustry)) { + if (new HashSet<>(Arrays.asList(PROPERTY_2)).contains(userIndustry)) { 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()){