From f1f702f03e617ac8b49ea5fe484b41885ea83f0c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 16:52:05 +0800
Subject: [PATCH] screen-manage 删除local配置文件
---
/dev/null | 119 ---------------------------------------
screen-common/src/main/java/com/moral/util/UnitConvertUtils.java | 2
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 24 +++++--
3 files changed, 17 insertions(+), 128 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
index c0660bb..ac723f2 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -29,7 +29,7 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup3")
+ @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup998")
public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String, String> message = (Map<String, String>) JSON.parse(messageStr);
@@ -46,11 +46,14 @@
List<Sensor> sensors = device.getVersion().getSensors();//������������������������������
for (Sensor sensor : sensors) {
String code = sensor.getCode();
+ String showUnit = sensor.getShowUnit();
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
+ String unit = sensor.getUnit();
+ String sourceData = message.get(code);
//������������
//������������
- if (!unitKey.equals(showUnitKey)) {
+ if (!unitKey.equals(showUnitKey)) {//������������������������������������������������������������
String formula = sensor.getFormula();
//������sensor���������������������������������������������
if (ObjectUtils.isEmpty(formula)) {
@@ -61,13 +64,18 @@
}
}
//������������
- UnitConvertUtils.calculate(message.get(code),formula);
+ String resultData = UnitConvertUtils.calculate(message.get(code), formula);
+ if (resultData != null) {
+ resultData+=showUnit;
+ }else{//���������������������������null���������������������������������������������������������������
+ resultData = sourceData+unit;
+ }
+ resultMessgae.put(sensor.getCode(), resultData);
+ } else {
+ //������������
+ sourceData += showUnit;
+ resultMessgae.put(sensor.getCode(), sourceData);
}
- //������������
- String showUnit = sensor.getShowUnit();
- String value = message.get(code);
- value += showUnit;
- resultMessgae.put(sensor.getCode(), value);
}
resultMessgae.put("DataTime", message.get("DataTime"));
socket.sendMessage(JSON.toJSONString(resultMessgae));
diff --git a/screen-api/src/main/resources/application-local.yml b/screen-api/src/main/resources/application-local.yml
deleted file mode 100644
index 23c69e1..0000000
--- a/screen-api/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-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
- application:
- name: screen-manage
- redis:
- host: r-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
- port: 6379
- password: moral_123456
- 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-bp1xdlb9wfc6zt0msppd.redis.rds.aliyuncs.com
- port: 6379
- password: moral_123456
- 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-bp1pr3rx9m3fnkwsk8o.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: moral_123456
- 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
-
-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:
- offset:
- reset: latest
- concurrency: 3
- enable:
- auto:
- commit: false
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
- session:
- timeout: 6000
- zookeeper:
- connect: 47.99.145.48:2181,47.111.116.38:2181,47.111.124.159:2181
- producer:
- batch:
- size: 4096
- buffer:
- memory: 40960
- linger: 1
- retries: 0
- servers: 47.99.145.48:9092,47.111.116.38:9092,47.111.124.159:9092
-mvc:
- interceptor:
- exclude:
- - /login
- - /swagger-ui.html
- - /swagger-resources/**
- - /swagger-ui.html/**
- - /webjars/**
- - /verificationCode/**
-
-AES:
- KEY:
- AD42F7787B035B7580000EF93BE20BAD
-TOKEN:
- KEY:
- foh3wi2ooghiCh5
\ No newline at end of file
diff --git a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
index 5bdf91f..7d918da 100644
--- a/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
+++ b/screen-common/src/main/java/com/moral/util/UnitConvertUtils.java
@@ -31,7 +31,7 @@
*/
public static String calculate(String value, String formula) {
if(ObjectUtils.isEmpty(formula))
- return value;
+ return null;
ScriptEngine jse = new ScriptEngineManager().getEngineByName("JavaScript");
formula = formula.replaceAll("\\{0\\}", value);
Double result = null;
--
Gitblit v1.8.0