Commit 7146b2b5 authored by suhuiguang's avatar suhuiguang

1.共享主题

parent 98ac9848
...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO ...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic ## ??????????????topic
amos.operation.log=/amos/operation/log amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.agency.code=tzs amos.agency.code=tzs
## ?????orgCode ## ?????orgCode
......
...@@ -7,6 +7,7 @@ import org.mybatis.spring.annotation.MapperScan; ...@@ -7,6 +7,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -54,6 +55,9 @@ public class AmosCylinderApplication { ...@@ -54,6 +55,9 @@ public class AmosCylinderApplication {
@Autowired @Autowired
private FillingRecordSyncListener fillingRecordSyncListener; private FillingRecordSyncListener fillingRecordSyncListener;
@Value("${spring.application.name}")
private String applicationName;
public static void main(String[] args) throws UnknownHostException { public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext context = SpringApplication.run(AmosCylinderApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(AmosCylinderApplication.class, args);
...@@ -74,8 +78,15 @@ public class AmosCylinderApplication { ...@@ -74,8 +78,15 @@ public class AmosCylinderApplication {
*/ */
@Bean @Bean
public void initMqtt() throws Exception { public void initMqtt() throws Exception {
emqKeeper.subscript(buildShareTopic(), 2, fillingRecordSyncListener);
}
emqKeeper.subscript("/tzs/sync/fillingRecord", 2, fillingRecordSyncListener); /**
* 构建共享主题,分布式部署时,不会重复收到消息
* @return 共享主题
*/
private String buildShareTopic(){
return "$share/" + applicationName + "/tzs/sync/fillingRecord";
} }
// @Bean // @Bean
......
...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO ...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic ## ??????????????topic
amos.operation.log=/amos/operation/log amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.agency.code=tzs amos.agency.code=tzs
## ?????orgCode ## ?????orgCode
......
...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO ...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic ## ??????????????topic
amos.operation.log=/amos/operation/log amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.agency.code=tzs amos.agency.code=tzs
## ?????orgCode ## ?????orgCode
......
...@@ -11,6 +11,7 @@ import org.mybatis.spring.annotation.MapperScan; ...@@ -11,6 +11,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -72,6 +73,9 @@ public class AmosTcmApplication { ...@@ -72,6 +73,9 @@ public class AmosTcmApplication {
@Autowired @Autowired
private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener; private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener;
@Value("${spring.application.name}")
private String applicationName;
public static void main(String[] args) throws UnknownHostException { public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext context = SpringApplication.run(AmosTcmApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(AmosTcmApplication.class, args);
...@@ -92,14 +96,23 @@ public class AmosTcmApplication { ...@@ -92,14 +96,23 @@ public class AmosTcmApplication {
*/ */
@Bean @Bean
public void initMqtt() throws Exception { public void initMqtt() throws Exception {
emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener); emqKeeper.subscript(buildShareTopic("/idx/idx_biz_carcyl_unit_inspect"), 2, carcylUnitInspectMqTtlListener);
emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener); emqKeeper.subscript(buildShareTopic("/tm/tz_base_enterprise_info"), 2, baseEnterpriseMqTtlListener);
emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener); emqKeeper.subscript(buildShareTopic("/tz/privilege_company_add_update"), 2, privilegeCompanyUpdateAddListener);
emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener); emqKeeper.subscript(buildShareTopic("/tz/privilege_company_delete"), 2, privilegeCompanyDeleteListener);
} }
@Bean @Bean
public void initToken() { public void initToken() {
startPlatformTokenService.getToken(); startPlatformTokenService.getToken();
} }
/**
* 构建共享主题,分布式部署时,不会重复收到消息
* @return 共享主题
*/
private String buildShareTopic(String topic){
return "$share/" + applicationName + topic;
}
} }
...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO ...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic ## ??????????????topic
amos.operation.log=/amos/operation/log amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.agency.code=tzs amos.agency.code=tzs
## ?????orgCode ## ?????orgCode
......
...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO ...@@ -152,7 +152,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic ## ??????????????topic
amos.operation.log=/amos/operation/log amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.agency.code=tzs amos.agency.code=tzs
## ?????orgCode ## ?????orgCode
......
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