Skip to content

A
amos-boot-biz
Commit 1e313eda authored by suhuiguang's avatar suhuiguang
Browse files
Options

1切换到60平台

parent 66914147
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 124 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java
View file @ 1e313eda
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.LinkedHashSet; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.LinkedList; import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import java.util.List; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import java.util.Set; import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository;
import javax.annotation.PostConstruct;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.FuzzyQueryBuilder; import org.elasticsearch.index.query.FuzzyQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto; import java.util.LinkedHashSet;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import java.util.List;
import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository; import java.util.Set;
/** /**
*
* <pre> * <pre>
* 警情信息ES检索服务 * 警情信息ES检索服务
* </pre> * </pre>
...@@ -37,110 +29,99 @@ import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository; ...@@ -37,110 +29,99 @@ import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository;
public class ESOrgUsrService { public class ESOrgUsrService {
@Autowired @Autowired
private ElasticsearchRestTemplate elasticsearchTemplate;
@Autowired
private ESOrgUsrDtoRepository esOrgUsrDtoRepository; private ESOrgUsrDtoRepository esOrgUsrDtoRepository;
@Autowired @Autowired
private OrgUsrServiceImpl orgUsrServiceImpl; private OrgUsrServiceImpl orgUsrServiceImpl;
@PostConstruct public void init() throws Exception {
public void init() throws Exception
{
// elasticsearchTemplate.deleteIndex(ESOrgUsrDto.class); // elasticsearchTemplate.deleteIndex(ESOrgUsrDto.class);
// elasticsearchTemplate.createIndex(ESOrgUsrDto.class); // elasticsearchTemplate.createIndex(ESOrgUsrDto.class);
// elasticsearchTemplate.putMapping(ESOrgUsrDto.class); // elasticsearchTemplate.putMapping(ESOrgUsrDto.class);
//初始化ES，重建索引 //初始化ES，重建索引
initEs(); initEs();
} }
/** /**
* 重建索引 * 重建索引
*/ */
public Boolean initEs() throws Exception { public Boolean initEs() throws Exception {
esOrgUsrDtoRepository.deleteAll(); esOrgUsrDtoRepository.deleteAll();
//获取所有单位 //获取所有单位
QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>(); QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
wrapper.in("biz_org_type", "DEPARTMENT","COMPANY"); wrapper.in("biz_org_type", "DEPARTMENT", "COMPANY");
wrapper.eq("is_delete", 0); wrapper.eq("is_delete", 0);
List<OrgUsr> list = orgUsrServiceImpl.list(wrapper); List<OrgUsr> list = orgUsrServiceImpl.list(wrapper);
saveAll(list); saveAll(list);
return true; return true;
} }
/** /**
*
* <pre> * <pre>
* 批量保存 * 批量保存
* </pre> * </pre>
* *
* @param list 警情信息列表 * @param list 警情信息列表
*/ */
public void saveAll( List<OrgUsr> orgUsrs) throws Exception{ public void saveAll(List<OrgUsr> orgUsrs) throws Exception {
if (!ValidationUtil.isEmpty(orgUsrs)) if (!ValidationUtil.isEmpty(orgUsrs)) {
{ for (OrgUsr orgUsr : orgUsrs) {
for (OrgUsr orgUsr : orgUsrs) this.saveAlertCalledToES(orgUsr);
{ }
this.saveAlertCalledToES(orgUsr); }
}
}
} }
public ESOrgUsrDto saveAlertCalledToES(OrgUsr orgUsr) throws Exception public ESOrgUsrDto saveAlertCalledToES(OrgUsr orgUsr) throws Exception {
{ ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto(); String seqStr = String.valueOf(orgUsr.getSequenceNbr());
String seqStr = String.valueOf(orgUsr.getSequenceNbr()); try {
try { Long seq = Long.parseLong(seqStr);
Long seq = Long.parseLong(seqStr); esOrgUsrDto.setSequenceNbr(seq);
esOrgUsrDto.setSequenceNbr(seq); esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName()); esOrgUsrDtoRepository.save(esOrgUsrDto);
esOrgUsrDtoRepository.save(esOrgUsrDto); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); }
} return esOrgUsrDto;
return esOrgUsrDto;
} }
public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception {
{ ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto(); String seqStr = String.valueOf(orgUsr.getSequenceNbr());
String seqStr = String.valueOf(orgUsr.getSequenceNbr()); try {
try { Long seq = Long.parseLong(seqStr);
Long seq = Long.parseLong(seqStr); esOrgUsrDto.setSequenceNbr(seq);
esOrgUsrDto.setSequenceNbr(seq); MatchQueryBuilder queryBuilder = null;
MatchQueryBuilder queryBuilder =null; //设置模糊搜索
//设置模糊搜索 if (orgUsr.getBizOrgName() != null) {
if(orgUsr.getBizOrgName()!=null) { queryBuilder = QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName());
queryBuilder =QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName()); }
} Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder); if (!search.iterator().hasNext()) {
if(!search.iterator().hasNext()) { esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName()); esOrgUsrDtoRepository.save(esOrgUsrDto);
esOrgUsrDtoRepository.save(esOrgUsrDto); }
} } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); }
} return esOrgUsrDto;
return esOrgUsrDto; }
}
/** /**
*
* <pre> * <pre>
* 从ES库批量删除 * 从ES库批量删除
* </pre> * </pre>
*/ */
public Boolean deleteById(Long sequenceNbr) throws Exception{ public Boolean deleteById(Long sequenceNbr) throws Exception {
if (esOrgUsrDtoRepository.existsById(sequenceNbr)) { if (esOrgUsrDtoRepository.existsById(sequenceNbr)) {
esOrgUsrDtoRepository.deleteById(sequenceNbr); esOrgUsrDtoRepository.deleteById(sequenceNbr);
} }
return true; return true;
...@@ -148,28 +129,25 @@ public class ESOrgUsrService { ...@@ -148,28 +129,25 @@ public class ESOrgUsrService {
/** /**
* 根据关键字查询文档，关键字 * 根据关键字查询文档，关键字
*
*/ */
@SuppressWarnings({ "rawtypes" }) @SuppressWarnings({"rawtypes"})
public Set<ESOrgUsrDto> queryByKeys(String name) public Set<ESOrgUsrDto> queryByKeys(String name) {
{ //创建builder
//创建builder FuzzyQueryBuilder queryBuilder = null;
FuzzyQueryBuilder queryBuilder =null;
//设置模糊搜索 //设置模糊搜索
if(name!=null) { if (name != null) {
queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name); queryBuilder = QueryBuilders.fuzzyQuery("bizOrgName", name);
} }
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder); Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
Set<ESOrgUsrDto> list = new LinkedHashSet<>(); Set<ESOrgUsrDto> list = new LinkedHashSet<>();
search.forEach(esOrgUsrDto->{ search.forEach(esOrgUsrDto -> {
list.add(esOrgUsrDto); list.add(esOrgUsrDto);
}); });
return list; return list;
} }
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/JCSRunnner.java 0 → 100644
View file @ 1e313eda
package com.yeejoin.amos.boot.module.jcs.biz.config;
import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
import java.sql.SQLOutput;
/**
* @author DELL
*/
@Component
public class JCSRunnner implements ApplicationRunner {
@Autowired
ESOrgUsrService esOrgUsrService;
@Override
public void run(ApplicationArguments args) throws Exception {
System.out.println("开始初始化ES");
esOrgUsrService.init();
}
}
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ 1e313eda
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.3.20:3307/autosys_business_v4.0.0.1?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.6.60:3306/xiy_amos_satety_business?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3 spring.datasource.hikari.minimum-idle= 3
...@@ -13,9 +13,10 @@ spring.datasource.hikari.connection-timeout= 60000 ...@@ -13,9 +13,10 @@ spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1 spring.datasource.hikari.connection-test-query= SELECT 1
# \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740 # \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
fileserver_domain=http://39.98.246.31:8888/ fileserver_domain=http://39.98.45.134:9000/
eureka.instance.hostname= 172.16.11.20 eureka.instance.ip-address= 172.16.3.20
eureka.instance.hostname= 172.16.3.135
eureka.instance.prefer-ip-address = true eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/ eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
...@@ -28,9 +29,9 @@ security.appKeyApp=studio_normalapp_3056965 ...@@ -28,9 +29,9 @@ security.appKeyApp=studio_normalapp_3056965
#redis #redis
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.11.20 spring.redis.host=172.16.6.60
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234560 spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1 spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10 spring.redis.lettuce.pool.max-idle=10
...@@ -40,10 +41,10 @@ spring.redis.expire.time=300 ...@@ -40,10 +41,10 @@ spring.redis.expire.time=300
## emqx ## emqx
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.11.33:1883 emqx.broker=tcp://172.16.6.60:2883
emqx.user-name=admin emqx.user-name=super
emqx.password=public emqx.password=a123456
mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt mqtt.scene.host=mqtt://172.16.6.60:8083/mqtt
mqtt.client.product.id=mqtt mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000 spring.mqtt.completionTimeout=3000
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 1e313eda
## DB properties: ## DB properties:
spring.datasource.url=jdbc:mysql://172.16.3.20:3307/amos-jcs-biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8 spring.datasource.url=jdbc:mysql://172.16.6.60:3306/xiy_amos_jcs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=123456 spring.datasource.password=root_123
## eureka properties: ## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.11.20:10001/eureka/ eureka.client.serviceUrl.defaultZone=http://172.16.3.135:10001/eureka/
## redis properties: ## redis properties:
spring.redis.database=1 spring.redis.database=1
spring.redis.host=172.16.11.20 spring.redis.host=172.16.6.60
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=1234560 spring.redis.password=yeejoin@2020
## ES properties: ## ES properties:
biz.elasticsearch.address=172.16.10.66 biz.elasticsearch.address=172.16.3.135
spring.data.elasticsearch.cluster-name=elasticsearch spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
...@@ -20,7 +21,7 @@ spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200 ...@@ -20,7 +21,7 @@ spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
## emqx properties: ## emqx properties:
emqx.clean-session=true emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]} emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.85:1883 emqx.broker=tcp://172.16.6.60:1883
emqx.user-name=super emqx.user-name=super
emqx.password=a123456 emqx.password=a123456
...@@ -28,10 +29,10 @@ emqx.password=a123456 ...@@ -28,10 +29,10 @@ emqx.password=a123456
rule.definition.load=false rule.definition.load=false
rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=jcs rule.definition.default-agency=jcs
rule.definition.localIp=172.16.10.66 rule.definition.localIp=172.16.3.135
## mongodb properties: ## mongodb properties:
spring.data.mongodb.uri=mongodb://172.16.10.66:27017/command_db spring.data.mongodb.uri=mongodb://172.16.6.60:27017/command_db
## file properties: ## file properties:
file.url=http://39.98.45.134:9000/ 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