From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 3 +
screen-manage/src/main/resources/application-dev.yml | 12 +++---
screen-api/src/main/resources/application-dev.yml | 12 +++---
screen-job/src/main/resources/application-dev.yml | 12 +++---
screen-job/src/main/resources/application-qa.yml | 12 +++---
screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java | 6 ++-
screen-manage/src/main/resources/application-qa.yml | 20 +++++-----
7 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
index ac5f16e..d5682c1 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ExcelServiceImpl.java
@@ -382,8 +382,10 @@
if (Double.parseDouble(CO)<4){
count++;
}
- if (Double.parseDouble(O8)<160){
- count++;
+ if (!O8.equals("--")) {
+ if (Double.parseDouble(O8) < 160) {
+ count++;
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 1328f06..c7379dc 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -181,6 +181,9 @@
datas.put("dataTime", time);
} else {
datas = queryLastDataByMac(mac);
+ if (ObjectUtils.isEmpty(datas)){
+ return null;
+ }
}
//������������������
Map<String, Object> result = new HashMap<>();
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index ae6cbd3..8619aca 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -17,9 +17,9 @@
application:
name: screen-api
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -34,9 +34,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
database: 15
pool:
@@ -54,9 +54,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
- password: moral_qx_12345
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
diff --git a/screen-job/src/main/resources/application-dev.yml b/screen-job/src/main/resources/application-dev.yml
index e2c1c34..9bb131f 100644
--- a/screen-job/src/main/resources/application-dev.yml
+++ b/screen-job/src/main/resources/application-dev.yml
@@ -18,9 +18,9 @@
application:
name: screen-job
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
- password: moral_qx_12345
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
diff --git a/screen-job/src/main/resources/application-qa.yml b/screen-job/src/main/resources/application-qa.yml
index 415d569..d1dde95 100644
--- a/screen-job/src/main/resources/application-qa.yml
+++ b/screen-job/src/main/resources/application-qa.yml
@@ -18,9 +18,9 @@
application:
name: screen-job
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
database: 14
pool:
@@ -56,8 +56,8 @@
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: moral_123456
+ username: moral_qx
+ password: moral_qx_12345
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
diff --git a/screen-manage/src/main/resources/application-dev.yml b/screen-manage/src/main/resources/application-dev.yml
index 9e9ca36..4a67e48 100644
--- a/screen-manage/src/main/resources/application-dev.yml
+++ b/screen-manage/src/main/resources/application-dev.yml
@@ -18,9 +18,9 @@
application:
name: screen-manage
redis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1xdlb9wfc6zt0msp.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msp05.redis.rds.aliyuncs.com
port: 6379
- password: moral_qx_12345
+ password: QX_moral_2023
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk05.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: moral_qx
- password: moral_qx_12345
+ password: QX_moral_2023
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
diff --git a/screen-manage/src/main/resources/application-qa.yml b/screen-manage/src/main/resources/application-qa.yml
index 20c8564..1d3f861 100644
--- a/screen-manage/src/main/resources/application-qa.yml
+++ b/screen-manage/src/main/resources/application-qa.yml
@@ -18,9 +18,9 @@
application:
name: screen-manage
redis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
jedis:
pool:
@@ -35,9 +35,9 @@
max-wait: 30000
min-idle: 32
tokenRedis:
- host: r-bp1hez4g7rkqjswpaypd1.redis.rds.aliyuncs.com
+ host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
port: 6379
- password: moral_123456
+ password: moral_qx_12345
timeout: 30000
database: 14
pool:
@@ -55,9 +55,9 @@
filters: stat
type: com.alibaba.druid.pool.DruidDataSource
max-wait: 60000
- url: jdbc:mysql://172.16.44.71:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: moral_123456
+ url: jdbc:mysql://rm-bp1pr3rx9m3fnkwsk8o2.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: moral_qx
+ password: moral_qx_12345
test-on-borrow: false
sql-script-encoding: utf-8
pool-prepared-statements: true
@@ -92,11 +92,11 @@
enable:
auto:
commit: false
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
session:
timeout: 6000
zookeeper:
- connect: 47.99.145.48:2181,47.111.116.38:2181,47.111.124.159:2181
+ connect: 172.16.44.65:2181,172.16.44.67:2181,172.16.44.66:2181
producer:
batch:
size: 4096
@@ -104,7 +104,7 @@
memory: 40960
linger: 1
retries: 0
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
+ servers: 172.16.44.65:9092,172.16.44.67:9092,172.16.44.66:9092
groupId:
insert: Dev_insert
state: Dev_state
--
Gitblit v1.8.0