From e414c2eb234515e07e4f041e1dc80c7589fbf41a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 21 Jul 2023 15:51:51 +0800
Subject: [PATCH] fix: 导出数据均值多算0
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 4
screen-api/src/main/resources/application-cjl.yml | 132 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 3632a25..e0df6e8 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -266,7 +266,7 @@
if(map.containsKey(k)){
Object o = map.get(k).get(sensor);
timeValueMap.put(c,Objects.nonNull(o)?Double.valueOf(o.toString()):0);
- if(Objects.nonNull(o)){
+ if(Objects.nonNull(o)&& (!Double.valueOf(o.toString()).equals(0d))){
doubleArrayList.add(Double.valueOf(o.toString()));
}
}else {
@@ -395,7 +395,7 @@
if(map.containsKey(k)){
Object o = map.get(k).get(sensor);
num = Objects.nonNull(o)?Double.valueOf(o.toString()):0d;
- if(Objects.nonNull(num)){
+ if(Objects.nonNull(num)&& !num.equals(0d)){
ArrayList<Double> doubleArrayList = Objects.isNull(listMap.get(numCount+"_"+sensorMap.get(sensor)))?new ArrayList<>():listMap.get(numCount+"_"+sensorMap.get(sensor));
doubleArrayList.add(num);
listMap.put(numCount+"_"+sensorMap.get(sensor),doubleArrayList);
diff --git a/screen-api/src/main/resources/application-cjl.yml b/screen-api/src/main/resources/application-cjl.yml
new file mode 100644
index 0000000..0eb8c80
--- /dev/null
+++ b/screen-api/src/main/resources/application-cjl.yml
@@ -0,0 +1,132 @@
+server:
+ port: 8081
+ tomcat:
+ uri-encoding: UTF-8
+ #���������������
+ min-spare-threads: 500
+ #���������������
+ max-threads: 2500
+ #���������������
+ max-connections: 6500
+ #������������������������
+ accept-count: 1000
+spring:
+ profiles:
+ active: dev
+ include: bulletin, specialCity, announcement
+ application:
+ name: screen-api
+ redis:
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
+ port: 6379
+ password: QX_moral_2023
+ timeout: 30000
+ jedis:
+ pool:
+ max-active: 256
+ max-wait: 30000
+ max-idle: 64
+ min-idle: 32
+ lettuce:
+ pool:
+ max-active: 256
+ max-idle: 64
+ max-wait: 30000
+ min-idle: 32
+ tokenRedis:
+ host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com
+ port: 6379
+ password: QX_moral_2023
+ timeout: 30000
+ database: 15
+ pool:
+ max-active: 256
+ max-wait: 30000
+ max-idle: 64
+ min-idle: 32
+
+ datasource:
+ minIdle: 1
+ time-between-eviction-runs-millis: 60000
+ max-active: 20
+ test-while-idle: true
+ validation-query: select 'x'
+ filters: stat
+ type: com.alibaba.druid.pool.DruidDataSource
+ max-wait: 60000
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o13.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: QX_moral_2023
+ test-on-borrow: false
+ sql-script-encoding: utf-8
+ pool-prepared-statements: true
+ min-evictable-idle-time-millis: 300000
+ initial-size: 1
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ max-conn-lifetime-millis: 20
+ test-on-return: false
+
+ servlet:
+ multipart:
+ enabled: true
+ max-file-size: 2MB
+ max-request-size: 2MB
+
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml
+ global-config:
+ db-config:
+ id-type: auto
+ field-strategy: NOT_EMPTY
+ db-type: MYSQL
+ configuration:
+ map-underscore-to-camel-case: true
+ call-setters-on-nulls: true
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+kafka:
+ listener:
+ ack-mode: manual_immediate
+ consumer:
+ auto:
+ commit:
+ interval: 100
+ offset:
+ reset: latest
+ concurrency: 3
+ enable:
+ auto:
+ commit: false
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ session:
+ timeout: 6000
+ zookeeper:
+ connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
+ producer:
+ batch:
+ size: 4096
+ buffer:
+ memory: 40960
+ linger: 1
+ retries: 0
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
+ groupId:
+ second-data: Dev_SecondsDataGroup
+ cruiser-data: Dev_CruiserDataGroup
+mvc:
+ interceptor:
+ exclude:
+ - /login
+ - /swagger-ui.html
+ - /swagger-resources/**
+ - /swagger-ui.html/**
+ - /webjars/**
+ - /verificationCode/**
+ - /static/**
+
+AES:
+ KEY:
+ AD42F7787B035B7580000EF93BE20BAD
+TOKEN:
+ KEY:
+ foh3wi2ooghiCh5
\ No newline at end of file
--
Gitblit v1.8.0