Prechádzať zdrojové kódy

生成酒店项目报告自测bug修复

lixing 3 rokov pred
rodič
commit
e155198893

+ 5 - 11
pom.xml

@@ -68,19 +68,13 @@
         <dependency>
             <groupId>com.persagy</groupId>
             <artifactId>integrated-config-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
-        <!-- 日志 -->
-<!--        <dependency>-->
-<!--            <groupId>com.persagy</groupId>-->
-<!--            <artifactId>integrated-log-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
+         日志
+        <dependency>
+            <groupId>com.persagy</groupId>
+            <artifactId>integrated-log-spring-boot-starter</artifactId>
+        </dependency>
 
         <!-- feign -->
         <dependency>

+ 0 - 114
pom_integrate.xml

@@ -1,114 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.persagy</groupId>
-        <artifactId>apm-package</artifactId>
-        <version>3.0.0</version>
-    </parent>
-
-    <artifactId>energy-report</artifactId>
-    <version>1.0.0</version>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>integrated</id>
-            <name>releases Repository</name>
-            <url>http://47.93.132.139:8081/nexus/content/repositories/integrated/</url>
-        </repository>
-        <repository>
-            <id>persagy</id>
-            <name>persagy Repository</name>
-            <url>http://47.93.132.139:8081/nexus/content/repositories/persagy/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- 项目启动 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>apm-server</artifactId>
-        </dependency>
-        <!-- apm 工具包 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>apm-common</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.persagy</groupId>
-                    <artifactId>integrated-redis-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- lang -->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
-
-        <!-- gson json,java对象互转 -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
-        <!-- 配置中心(包含注册中心) -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-config-client</artifactId>
-        </dependency>
-
-        <!-- 日志 -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-log-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- feign -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-ribbon-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- swagger -->
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>integrated-swagger2-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!--jep -->
-        <dependency>
-            <groupId>org.scijava</groupId>
-            <artifactId>jep</artifactId>
-            <version>2.4.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>apm-mybatis</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.baomidou</groupId>
-                    <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-</project>

+ 1 - 0
src/main/java/com/persagy/apm/energy/report/monthly/detail/hotel/project/model/ConvertReportHotelProjectDetailTool.java

@@ -61,6 +61,7 @@ public interface ConvertReportHotelProjectDetailTool {
      * @author lixing
      * @version V1.0 2021-06-07 09:42:59
      */
+    @Mapping(target = "publicAreaPowerUsage", source = "publicPowerUsage")
     ReportHotelProjectDetail convertAddDto2Entity(AddReportHotelProjectDetailDTO addReportHotelProjectDetailDTO);
 
     /**

+ 0 - 18
src/main/resources/log4j.properties

@@ -1,18 +0,0 @@
-log4j.rootLogger=INFO,ConsoleAppender,RollingLogFileAppender
-
-#输出到文件
-log4j.appender.RollingLogFileAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.RollingLogFileAppender.Threshold=INFO
-log4j.appender.RollingLogFileAppender.File=../logs/energy-report/log.log
-log4j.appender.RollingLogFileAppender.Append=true
-log4j.appender.RollingLogFileAppender.MaxFileSize=20MB
-log4j.appender.RollingLogFileAppender.MaxBackupIndex=100
-log4j.appender.RollingLogFileAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.RollingLogFileAppender.layout.ConversionPattern=%d{yyy MMM dd HH:mm:ss}:%-5p %l - %m%n
-#输出到控制台
-log4j.appender.ConsoleAppender=org.apache.log4j.ConsoleAppender
-log4j.appender.ConsoleAppender.Threshold=INFO
-log4j.appender.ConsoleAppender.ImmediateFlush=true
-log4j.appender.ConsoleAppender.Target=System.out
-log4j.appender.ConsoleAppender.layout=org.apache.log4j.PatternLayout
-log4j.appender.ConsoleAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH\:mm\:ss}:%-5p %l - %m%n