From 7fab05a1f99113309ba8375f77bbcabfe351b8ac Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Wed, 24 Jan 2024 10:36:11 +0800
Subject: [PATCH] 2024-01-24 10:35:06

---
 .../{Overall.java => OverCollHeatAll.java}    | 12 ++++-----
 .../java/com/dky/entity/Construction.java     | 27 +++++++++++++++++++
 .../java/com/dky/entity/OriginalDevice.java   |  2 ++
 dntd-tool/pom.xml                             |  6 +++++
 .../java/com/dky/generate/CoolHeatSence.java  | 26 ++++++++++++++++++
 5 files changed, 67 insertions(+), 6 deletions(-)
 rename dntd-model-coolheat/src/main/java/com/dky/calculate/{Overall.java => OverCollHeatAll.java} (88%)
 create mode 100644 dntd-model-coolheat/src/main/java/com/dky/entity/Construction.java
 create mode 100644 dntd-tool/src/main/java/com/dky/generate/CoolHeatSence.java

diff --git a/dntd-model-coolheat/src/main/java/com/dky/calculate/Overall.java b/dntd-model-coolheat/src/main/java/com/dky/calculate/OverCollHeatAll.java
similarity index 88%
rename from dntd-model-coolheat/src/main/java/com/dky/calculate/Overall.java
rename to dntd-model-coolheat/src/main/java/com/dky/calculate/OverCollHeatAll.java
index 95788d3..5c618c7 100644
--- a/dntd-model-coolheat/src/main/java/com/dky/calculate/Overall.java
+++ b/dntd-model-coolheat/src/main/java/com/dky/calculate/OverCollHeatAll.java
@@ -1,7 +1,7 @@
 package com.dky.calculate;
 
 
-public class Overall {
+public class OverCollHeatAll {
 
 
     /**
@@ -36,11 +36,11 @@ public class Overall {
     /**
      * 年总费用（万元）
      * @param deviceNum 电锅炉设备台数
-     * @param devicePrice 单台电设备价格
-     * @param useYears 使用年限
-     * @param devicePower 单台电锅炉的功率
-     * @param days 年采暖（供冷）时间(天)
-     * @param laborCost 电替代设备人工费用成本
+     * @param devicePrice 单台电设备价格 非表中参数
+     * @param useYears 使用年限 非表中参数
+     * @param devicePower 单台电锅炉的功率 非表中参数
+     * @param days 年采暖（供冷）时间(天) 基础入参
+     * @param laborCost 电替代设备人工费用成本 非表中参数
      * @return
      */
     public Double getYearCost(Integer deviceNum,
diff --git a/dntd-model-coolheat/src/main/java/com/dky/entity/Construction.java b/dntd-model-coolheat/src/main/java/com/dky/entity/Construction.java
new file mode 100644
index 0000000..747e4f6
--- /dev/null
+++ b/dntd-model-coolheat/src/main/java/com/dky/entity/Construction.java
@@ -0,0 +1,27 @@
+package com.dky.entity;
+
+
+public class Construction {
+
+    // 建筑类型（1机关，2医院，3学校，4商业办公楼，5酒店，6其他）
+    private Integer constrType;
+
+    // 建筑面积(平方米)
+    private Double floor;
+
+    public Integer getConstrType() {
+        return constrType;
+    }
+
+    public void setConstrType(Integer constrType) {
+        this.constrType = constrType;
+    }
+
+    public Double getFloor() {
+        return floor;
+    }
+
+    public void setFloor(Double floor) {
+        this.floor = floor;
+    }
+}
diff --git a/dntd-model-coolheat/src/main/java/com/dky/entity/OriginalDevice.java b/dntd-model-coolheat/src/main/java/com/dky/entity/OriginalDevice.java
index 345ef0b..57ca7c2 100644
--- a/dntd-model-coolheat/src/main/java/com/dky/entity/OriginalDevice.java
+++ b/dntd-model-coolheat/src/main/java/com/dky/entity/OriginalDevice.java
@@ -16,6 +16,8 @@ public class OriginalDevice {
     // 原设备的人工费用（万元）
     private Double oldDaborCost;
 
+
+
     public String getDeviceType() {
         return deviceType;
     }
diff --git a/dntd-tool/pom.xml b/dntd-tool/pom.xml
index 0432288..13c7095 100644
--- a/dntd-tool/pom.xml
+++ b/dntd-tool/pom.xml
@@ -43,6 +43,12 @@
             <artifactId>dntd-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.dky</groupId>
+            <artifactId>dntd-model-coolheat</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/dntd-tool/src/main/java/com/dky/generate/CoolHeatSence.java b/dntd-tool/src/main/java/com/dky/generate/CoolHeatSence.java
new file mode 100644
index 0000000..3892556
--- /dev/null
+++ b/dntd-tool/src/main/java/com/dky/generate/CoolHeatSence.java
@@ -0,0 +1,26 @@
+package com.dky.generate;
+
+
+import cn.hutool.json.JSONObject;
+import com.dky.calculate.OverCollHeatAll;
+import com.dky.entity.Construction;
+import com.dky.entity.CoolHeat;
+import com.dky.modelI.DntdModelI;
+
+public class CoolHeatSence implements DntdModelI {
+
+
+    @Override
+    public JSONObject createReport(JSONObject jsonObject) {
+
+        JSONObject jsonReport = new JSONObject();
+        CoolHeat coolHeat = jsonObject.toBean(CoolHeat.class);
+        Construction construction = jsonObject.toBean(Construction.class);
+        OverCollHeatAll overCollHeatAll = new OverCollHeatAll();
+        overCollHeatAll.investment(construction.getFloor(), coolHeat.getHeatArea(), coolHeat.getDevPrice());
+        // overCollHeatAll.getRunCost(coolHeat.getOriginalDevice().getQuantity(), coolHeat.getNeedPower(), coolHeat.g)
+
+        return null;
+    }
+
+}