林颖晨 1 year ago
parent c916ff0469
commit cf53b0403c
  1. 2
      dntd-common/pom.xml
  2. 2
      dntd-model-coolheat/pom.xml
  3. 2
      dntd-model-heatboiler/pom.xml
  4. 2
      dntd-model-heatboiler/src/main/java/com/dky/calculate/HeatBoilerModel.java
  5. 2
      dntd-model-madekiln/pom.xml
  6. 2
      dntd-modelI/pom.xml
  7. 2
      dntd-tool/pom.xml
  8. 36
      pom.xml

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

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

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

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

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>dntd-model-tool1</artifactId> <artifactId>dntd-model-tool</artifactId>
<groupId>com.dky</groupId> <groupId>com.dky</groupId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>

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

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

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

Loading…
Cancel
Save