Commit c011ddbe authored by chenzhao's avatar chenzhao

修改配置文件中emqx的配置

parent b827bf80
......@@ -12,7 +12,7 @@ import lombok.Getter;
@AllArgsConstructor
public enum SubscribeTopicEnum {
MAINTENANCE_TOPIC("maintenance/date/update");
MAINTENANCE_TOPIC("$share/AMOS-EQUIPMANAGE/maintenance/date/update");
private String topic;
}
......@@ -589,71 +589,49 @@
<select id="getLocation" resultType="Map">
SELECT
*
FROM
(
(
SELECT
stand_code AS location,
longitude,
latitude
FROM
jc_airport_stand
WHERE
is_delete = 0
)
UNION ALL
(
SELECT
tt.location AS location,
tt.longitude AS longitude,
tt.latitude AS latitude
FROM
(
SELECT
CASE
WHEN field_code = 'companyLocation' THEN
field_value
END AS location,
CASE
WHEN field_code = 'longitude' THEN
field_value
END AS longitude,
CASE
WHEN field_code = 'latitude' THEN
field_value
END AS latitude
FROM
cb_dynamic_form_instance
WHERE
group_code = '244'
) tt
WHERE
tt.location IS NOT NULL
)
UNION ALL
(
SELECT
address AS location,
coordinate_x AS longitude,
coordinate_y AS latitude
FROM
jc_alert_called
WHERE
is_delete = 0
) UNION all (
SELECT
address_desc AS location,
longitude,
latitude
FROM
cb_key_site
WHERE
is_delete=0
)
) hh
SELECT
*
FROM
(
( SELECT stand_code AS location, longitude, latitude FROM jc_airport_stand WHERE is_delete = 0 ORDER BY rec_date DESC) UNION ALL
(
SELECT
tt.location AS location,
tt.longitude AS longitude,
tt.latitude AS latitude
FROM
(
SELECT
CASE
WHEN
field_code = 'companyLocation' THEN
field_value
END AS location,
CASE
WHEN field_code = 'longitude' THEN
field_value
END AS longitude,
CASE
WHEN field_code = 'latitude' THEN
field_value
END AS latitude
FROM
cb_dynamic_form_instance
WHERE
group_code = '244' ORDER BY rec_date DESC
) tt
WHERE
tt.location IS NOT NULL
) UNION ALL
( SELECT address AS location, coordinate_x AS longitude, coordinate_y AS latitude FROM jc_alert_called WHERE is_delete = 0 ORDER BY rec_date DESC) UNION ALL
( SELECT address_desc AS location, longitude, latitude FROM cb_key_site WHERE is_delete = 0 )
) hh
WHERE
hh.location IS NOT NULL
AND hh.location != '' GROUP by hh.hh.location
</select>
......
......@@ -28,6 +28,7 @@ import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 力量调派发送信息记录表服务实现类
......@@ -108,6 +109,8 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
public void savePowerTransferLog( AlertCallePowerTransferRo alertCallePowerTransferRo, List<String> persons) {
String powerTransType = alertCallePowerTransferRo.getPowerTransType();
AlertCalled alertCalled = iAlertCalledService.getById(alertCallePowerTransferRo.getSequenceNbr());
//对接受人员去重
persons = persons.stream().distinct().collect(Collectors.toList());
String personName = "";
if (persons.size() > 0) {
personName = StringUtils.join(persons.toArray(),",");
......
......@@ -87,9 +87,12 @@ spring.redis.cluster.retry-interval=1500
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.35:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
mqtt.scene.host=mqtt://172.16.3.35:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
......
......@@ -37,22 +37,50 @@ amos.system.user.product=STUDIO_APP_WEB
#redis
spring.redis.database=1
spring.redis.host=172.16.10.211
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
#redis
#redis 基础配置
spring.redis.database=0
# 连接超时时长ms
spring.redis.timeout=10000
spring.redis.password=
# 连接池最大连接数(使用负值表示没有限制)
spring.redis.lettuce.pool.max-active=3
# 连接池中的最小空闲连接
spring.redis.lettuce.pool.min-idle=2
# 连接池中的最大空闲连接
spring.redis.lettuce.pool.max-idle=3
# 连接池最大阻塞等待时间(使用负值表示没有限制)
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=30000
#在关闭客户端连接之前等待任务处理完成的最长时间,在这之后,无论任务是否执行完成,都会被执行器关闭,默认100ms
spring.redis.lettuce.shutdown-timeout=100
#单机集群判断 cluster集群 single单机
spring.redis.mode=cluster
#redis 单机配置
#spring.redis.host=172.16.11.20
#spring.redis.port=6379
#集群配置
spring.redis.cluster.nodes=172.16.3.41:6381,172.16.3.41:6002
spring.redis.cluster.max-redirects=3
spring.redis.cluster.scan-interval=1000
spring.redis.cluster.read-mode=SLAVE
spring.redis.cluster.retry-attempts=3
spring.redis.cluster.failed-attempts=3
spring.redis.cluster.slave-connection-pool-size=64
spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
spring.redis.expire.time=300
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=admin
emqx.password=public
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
mqtt.scene.host=mqtt://172.16.10.211:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
......
......@@ -81,9 +81,12 @@ spring.redis.redissonUrl=172.16.11.20:6379
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.35:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
mqtt.scene.host=mqtt://172.16.3.35:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
......
......@@ -76,9 +76,12 @@ params.isPush=false
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
#文件服务器地址
file.url=http://39.98.45.134:9000/
......@@ -51,9 +51,12 @@ params.isPush=false
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://11.11.16.1:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
#文件服务器地址
file.url=http://11.11.16.1:9000/
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.3.41:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=123456
spring.datasource.password=Yeejoin@2020
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.3.6:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
#redis 基础配置
spring.redis.database=0
......@@ -39,20 +39,23 @@ spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
spring.data.elasticsearch.repositories.enabled=true
spring.elasticsearch.rest.uris=http://127.0.0.1:9201,http://127.0.0.1:9202,http://127.0.0.1:9203
spring.data.elasticsearch.client.reactive.connection-timeout=3000
spring.data.elasticsearch.client.reactive.socket-timeout=3000
## ES properties:
biz.elasticsearch.address=172.16.10.211
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= 123456
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.6:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
## 规则配置 properties:
rule.definition.load=false
......
## DB properties:
spring.datasource.url=jdbc:mysql://172.16.11.201:3306/dl_amos_common_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.11.201:10001/eureka/
eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/
#redis 基础配置
spring.redis.database=0
# 连接超时时长ms
spring.redis.timeout=10000
spring.redis.password=
# 连接池最大连接数(使用负值表示没有限制)
spring.redis.lettuce.pool.max-active=3
# 连接池中的最小空闲连接
spring.redis.lettuce.pool.min-idle=2
# 连接池中的最大空闲连接
spring.redis.lettuce.pool.max-idle=3
# 连接池最大阻塞等待时间(使用负值表示没有限制)
spring.redis.lettuce.pool.max-wait=-1
#在关闭客户端连接之前等待任务处理完成的最长时间,在这之后,无论任务是否执行完成,都会被执行器关闭,默认100ms
spring.redis.lettuce.shutdown-timeout=100
#单机集群判断 cluster集群 single单机
spring.redis.mode=cluster
#集群配置
spring.redis.cluster.nodes=172.16.3.41:6381,172.16.3.41:6002
spring.redis.cluster.max-redirects=3
spring.redis.cluster.scan-interval=1000
spring.redis.cluster.read-mode=SLAVE
spring.redis.cluster.retry-attempts=3
spring.redis.cluster.failed-attempts=3
spring.redis.cluster.slave-connection-pool-size=64
spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
## redis properties:danger/list
spring.redis.database=1
spring.redis.host=172.16.11.201
spring.redis.port=6379
spring.redis.password=1234560
## ES properties:
spring.data.elasticsearch.repositories.enabled=true
spring.elasticsearch.rest.uris=http://127.0.0.1:9201,http://127.0.0.1:9202,http://127.0.0.1:9203
spring.data.elasticsearch.client.reactive.connection-timeout=3000
spring.data.elasticsearch.client.reactive.socket-timeout=3000
biz.elasticsearch.address=172.16.10.211
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= 123456
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.201:1883
emqx.user-name=admin
emqx.password=public
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
## ???? properties:
rule.definition.load=false
......
......@@ -47,9 +47,12 @@ elasticsearch.password= 123456
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.6:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
## 规则配置 properties:
rule.definition.load=false
......
......@@ -91,10 +91,12 @@ elasticsearch.password= 123456
#emqx v4.0
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.66:1883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
#DIY
diy-config.report.record-data=true
......
......@@ -50,10 +50,12 @@ elasticsearch.password= 123456
#emqx v4.0
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.18:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
#DIY
diy-config.report.record-data=false
......
......@@ -79,10 +79,12 @@ elasticsearch.password= 123456
#emqx v4.0
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.66:1883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
#DIY
diy-config.report.record-data=true
......
......@@ -123,11 +123,13 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=a123456
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
......
......@@ -88,11 +88,13 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
fire-rescue=12321
spring.liveBeansView.mbeanDomain=312321
......
......@@ -113,11 +113,13 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=a123456
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
......
......@@ -80,10 +80,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
\ No newline at end of file
......@@ -52,10 +52,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=admin
emqx.password=public
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
\ No newline at end of file
......@@ -71,10 +71,11 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://172.16.11.33:1883
emqx.user-name=admin
emqx.password=public
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
\ No newline at end of file
......@@ -112,10 +112,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://172.16.10.211:9000/
\ No newline at end of file
......@@ -108,10 +108,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-3578
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://39.98.45.134:9000/
\ No newline at end of file
......@@ -117,10 +117,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
file.url=http://172.16.10.211:9000/
\ No newline at end of file
......@@ -94,11 +94,12 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=a123456
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
rule.definition.localIp=172.16.3.89
file.url=http://39.98.45.134:9000/
......
......@@ -20,8 +20,6 @@ amos.system.user.product=STUDIO_APP_WEB
#redis 配置
## redis properties:danger/list
spring.redis.database=1
spring.redis.host=172.16.10.211
spring.redis.port=6379
......@@ -32,7 +30,8 @@ spring.redis.jedis.pool.max-idle=10
spring.redis.jedis.pool.min-idle=0
spring.redis.timeout=1000
#巡检计划定时任务
jobs.cron = 0 0/1 22-23 * * ?
#jobs.cron = 0 0/1 22-23 * * ?
jobs.cron = 0 0/5 * * * ?
#jpush 推送配置项
params.isPush = false
......@@ -54,13 +53,15 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.user-name=super
emqx.password=a123456
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
## rule.definition.localIp=172.16.10.211
file.url=http://39.98.45.134:9000/
supervision.person.charger.role=Person_charge_unit_fire_protection_supervision_inspection
......
......@@ -79,11 +79,13 @@ linux.img.path = /
## emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}-1
emqx.broker=tcp://39.98.45.134:1883
emqx.user-name=super
emqx.password=a123456
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.211:2883
emqx.clean-user-name=super
emqx.clean-password=a123456
emqx.max-inflight=1000
emqx.keep-alive-interval=10
rule.definition.localIp=172.16.3.89
file.url=http://39.98.45.134:9000/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment