From e6ad2e2f3f414b714c6ab0974161cad27aebbe0b Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Tue, 23 Jan 2024 16:31:41 +0800
Subject: [PATCH] 111222

---
 .idea/encodings.xml                           |  2 ++
 .idea/misc.xml                                |  2 +-
 dntd-model-coolheat/pom.xml                   | 20 +++++++++++++++++++
 .../java/com/dky/calculate/RequireDevice.java |  4 ++--
 dntd-tool/pom.xml                             |  2 +-
 .../com/dky/generate/HeatBoilerSence.java     |  2 +-
 pom.xml                                       |  1 +
 7 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 dntd-model-coolheat/pom.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 1ad1b7f..6fccb6f 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,6 +5,8 @@
     <file url="file://$PROJECT_DIR$/dntd-common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dntd-model-buildsence/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dntd-model-buildsence/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dntd-model-coolheat/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dntd-model-coolheat/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dntd-model-heatboiler/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dntd-model-heatboiler/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dntd-model-traffic/src/main/java" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f20ecff..047c615 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,7 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/dntd-model-coolheat/pom.xml b/dntd-model-coolheat/pom.xml
new file mode 100644
index 0000000..38ee88f
--- /dev/null
+++ b/dntd-model-coolheat/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>dntd-model-tool1</artifactId>
+        <groupId>com.dky</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>dntd-model-coolheat</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/dntd-model-heatboiler/src/main/java/com/dky/calculate/RequireDevice.java b/dntd-model-heatboiler/src/main/java/com/dky/calculate/RequireDevice.java
index f77b282..3599f39 100644
--- a/dntd-model-heatboiler/src/main/java/com/dky/calculate/RequireDevice.java
+++ b/dntd-model-heatboiler/src/main/java/com/dky/calculate/RequireDevice.java
@@ -23,7 +23,7 @@ public class RequireDevice {
                 matchedDevices.add(new MatchedDevice(spec, count));
                 if (count > 0) {
                     DevPrice price = priceList.stream()
-                            .filter(p -> p.getId() == spec.getId())
+                            .filter(p -> p.getId().equals(spec.getId()))
                             .findFirst()
                             .orElse(null);
 
@@ -38,7 +38,7 @@ public class RequireDevice {
                         matchedDevices.add(new MatchedDevice(deviceList.get(i), 1));
                         int finalI = i;
                         DevPrice price = priceList.stream()
-                                .filter(p -> p.getId() == deviceList.get(finalI).getId())
+                                .filter(p -> p.getId().equals(deviceList.get(finalI).getId()))
                                 .findFirst()
                                 .orElse(null);
 
diff --git a/dntd-tool/pom.xml b/dntd-tool/pom.xml
index 67d4846..7ef0014 100644
--- a/dntd-tool/pom.xml
+++ b/dntd-tool/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.source>8</maven.compiler.source>z
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/dntd-tool/src/main/java/com/dky/generate/HeatBoilerSence.java b/dntd-tool/src/main/java/com/dky/generate/HeatBoilerSence.java
index 3809025..0fcc5bc 100644
--- a/dntd-tool/src/main/java/com/dky/generate/HeatBoilerSence.java
+++ b/dntd-tool/src/main/java/com/dky/generate/HeatBoilerSence.java
@@ -47,7 +47,7 @@ public class HeatBoilerSence implements DntdModelI {
         //单位（元/台、元/套）
         String unit = "";
         Set<String> devTypeSet = new HashSet<>();
-       /* for (MatchedDevice matchedDevice : matchedDeviceResult.getMatchedDevices()) {
+       /* for (MatchedDevice : matchedDeviceResult.getMatchedDevices()) {
             devTypeSet.add(matchedDevice.getDevSpec().getDevType());
             deviceSpec = deviceSpec + matchedDevice.getDevSpec().getDevType() + ":"+matchedDevice.getDevSpec().getCapacity()+"蒸吨、";
             deviceNum = deviceNum + matchedDevice.getCount() + "台/"+matchedDevice.getDevSpec().getDevType()+";";
diff --git a/pom.xml b/pom.xml
index 5a09f68..0d9ada6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,7 @@
         <module>dntd-model-heatboiler</module>
         <module>dntd-modelI</module>
         <module>dntd-common</module>
+        <module>dntd-model-coolheat</module>
     </modules>
 
     <properties>