111

dntd-common/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.dky</groupId>
-        <artifactId>dntd-model-tool1</artifactId>
+        <artifactId>dntd-model-tool</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

dntd-model-coolheat/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.dky</groupId>
-        <artifactId>dntd-model-tool1</artifactId>
+        <artifactId>dntd-model-tool</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

dntd-model-heatboiler/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.dky</groupId>
-        <artifactId>dntd-model-tool1</artifactId>
+        <artifactId>dntd-model-tool</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

dntd-model-heatboiler/src/main/java/com/dky/calculate/HeatBoilerModel.java

@@ -103,7 +103,7 @@ public class HeatBoilerModel {
      */
     public static double calculateOperatingIncome(HeatboilerSpec heatboilerSpec, Heatboiler heatboiler , OriginalDevice originalDevice,Double currentYearOperatingCost) {
         //运行收益=年运行费用-上年运行费用（即原设备运行费用）
-        return currentYearOperatingCost - originalDevice.getPreviousYearOperatingCost();
+        return currentYearOperatingCost - originalDevice.getLastYearFee();
 
     }
 

dntd-model-madekiln/pom.xml

@@ -3,7 +3,7 @@
          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>
+        <artifactId>dntd-model-tool</artifactId>
         <groupId>com.dky</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

dntd-modelI/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.dky</groupId>
-        <artifactId>dntd-model-tool1</artifactId>
+        <artifactId>dntd-model-tool</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

dntd-tool/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.dky</groupId>
-        <artifactId>dntd-model-tool1</artifactId>
+        <artifactId>dntd-model-tool</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.dky</groupId>
-    <artifactId>dntd-model-tool1</artifactId>
+    <artifactId>dntd-model-tool</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
@@ -35,23 +35,23 @@
     <build>
         <plugins>
             <!-- 代码混淆插件 -->
-            <plugin>
-                <groupId>com.dwp</groupId>
-                <artifactId>obfuscation</artifactId>
-                <version>1.0.0</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>obfuscation</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <basePath>${basedir}</basePath>
-                    <classPath>${basedir}/target/classes</classPath>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.dwp</groupId>-->
+<!--                <artifactId>obfuscation</artifactId>-->
+<!--                <version>1.0.0</version>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <phase>compile</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>obfuscation</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--                <configuration>-->
+<!--                    <basePath>${basedir}</basePath>-->
+<!--                    <classPath>${basedir}/target/classes</classPath>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
         </plugins>
         <resources>
             <resource>