瀏覽代碼

Merge branch 'v2.1.1' of http://39.106.8.246:3003/apm/energy-eq-run-diagnose into v2.1.1

lixing 3 年之前
父節點
當前提交
1937f13a47

+ 1 - 0
pom.xml

@@ -18,6 +18,7 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+
     <repositories>
         <repository>
             <id>integrated</id>

+ 23 - 23
src/main/java/com/persagy/apm/diagnose/maintenance/service/impl/ProjectDataRecordServiceImpl.java

@@ -65,10 +65,10 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
     private String systemCode;
 
     //测试环境  运行状态 上下限值
-    @Value(value = "${energy.eq.run.state.up.limit}")
-    private Double runStateUpLimit;
-    @Value(value = "${energy.eq.run.state.down.limit}")
-    private Double runStateDownLimit;
+//    @Value(value = "${energy.eq.run.state.up.limit}")
+//    private Double runStateUpLimit;
+//    @Value(value = "${energy.eq.run.state.down.limit}")
+//    private Double runStateDownLimit;
 
     //报警分类
     public final static String alarmSplit = "_";
@@ -814,13 +814,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                         String time = dto.getTime();
                         Date getDate = com.persagy.apm.diagnose.utils.DateUtils.str2Date(time, com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
                         if (getDate.compareTo(twoHourDate) > 0) {
-//                            if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-//                                dateList.add(getDate);
-//                            }
-                            //测试 运行状态
-                            if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                            if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                                 dateList.add(getDate);
                             }
+                            //测试 运行状态
+//                            if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                                dateList.add(getDate);
+//                            }
                         }
                     }
                     dateRunDataMap.put(dayDate, dateList);
@@ -892,13 +892,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                             continue;
                         }
                         Date getDate = com.persagy.apm.diagnose.utils.DateUtils.str2Date(dto.getTime(), com.persagy.apm.diagnose.utils.DateUtils.SDFSECOND);
-//                        if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-//                            dateList.add(getDate);
-//                        }
-                        //测试 运行状态
-                        if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                        if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                             dateList.add(getDate);
                         }
+                        //测试 运行状态
+//                        if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                            dateList.add(getDate);
+//                        }
                     }
                     Set<Date> dateSet = new HashSet<>(dateList);
                     dateList.clear();
@@ -925,12 +925,12 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                         continue;
                     }
                     //测试 运行状态
-                    if (dto.getData() < runStateDownLimit || dto.getData() > runStateUpLimit) {
-                        return false;
-                    }
-//                    if (Objects.equals(EnumRunStatusType.Close.getCode(), dto.getData())) {
+//                    if (dto.getData() < runStateDownLimit || dto.getData() > runStateUpLimit) {
 //                        return false;
 //                    }
+                    if (Objects.equals(EnumRunStatusType.Close.getCode(), dto.getData())) {
+                        return false;
+                    }
                 }
             }
         } catch (Exception e) {
@@ -948,13 +948,13 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
                 if (null == dto.getData()) {
                     continue;
                 }
-//                if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
-//                    return dto.getTime();
-//                }
-                //测试 运行状态
-                if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+                if (Objects.equals(EnumRunStatusType.Open.getCode(), dto.getData())) {
                     return dto.getTime();
                 }
+                //测试 运行状态
+//                if (dto.getData() > runStateDownLimit && dto.getData() < runStateUpLimit) {
+//                    return dto.getTime();
+//                }
             }
         } catch (Exception e) {
             e.printStackTrace();

+ 5 - 0
src/main/resources/bootstrap.yml

@@ -22,6 +22,10 @@ spring:
 # 日志管理方式使用集成框架的logback
 logging:
   config: classpath:logback-spring.xml
+  level:
+    com:
+      persagy:
+        apm: DEBUG
 
 EUREKA_CLIENT_DEFAULT_ZONE: http://frame:123456@develop.persagy.com/integrated-eureka/eureka/
 
@@ -29,6 +33,7 @@ mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 
+
 integrated:
   swagger:
     title: energy-eq-run-diagnose 接口文档

+ 3 - 2
src/main/resources/log4j.properties

@@ -5,6 +5,7 @@ log4j.logger.org.springframework=INFO
 log4j.logger.org.apache.axis=INFO
 log4j.logger.org.apache.cxf=INFO
 log4j.logger.com.mchange.v2=INFO
+log4j.logger.com.persagy.apm=DEBUG
 
 #输出到控制台
 log4j.appender.systemOut=org.apache.log4j.ConsoleAppender
@@ -18,10 +19,10 @@ log4j.appender.systemOut.Target=System.out
 log4j.appender.logInfo=org.apache.log4j.RollingFileAppender
 log4j.appender.logInfo.layout=org.apache.log4j.PatternLayout
 log4j.appender.logInfo.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %m%n
-log4j.appender.logInfo.Threshold=INFO
+log4j.appender.logInfo.Threshold=DEBUG
 log4j.appender.logInfo.ImmediateFlush=TRUE
 log4j.appender.logInfo.File = ../logs/energy-eq-run-diagnose/log.log
 #log4j.appender.logInfo.DatePattern=yyyy-MM-dd HH'.log'
 log4j.appender.logInfo.Encoding=UTF-8
-log4j.appender.logInfo.MaxFileSize=5MB
+log4j.appender.logInfo.MaxFileSize=20MB
 log4j.appender.logInfo.MaxBackupIndex=10