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;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import javax.annotation.PostConstruct;
import org.elasticsearch.index.query.BoolQueryBuilder;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository;
import org.elasticsearch.index.query.FuzzyQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
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.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 com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
/**
*
* <pre>
* 警情信息ES检索服务
* </pre>
......@@ -37,110 +29,99 @@ import com.yeejoin.amos.boot.module.common.biz.dao.ESOrgUsrDtoRepository;
public class ESOrgUsrService {
@Autowired
private ElasticsearchRestTemplate elasticsearchTemplate;
@Autowired
private ESOrgUsrDtoRepository esOrgUsrDtoRepository;
@Autowired
private OrgUsrServiceImpl orgUsrServiceImpl;
@PostConstruct
public void init() throws Exception
{
private OrgUsrServiceImpl orgUsrServiceImpl;
public void init() throws Exception {
// elasticsearchTemplate.deleteIndex(ESOrgUsrDto.class);
// elasticsearchTemplate.createIndex(ESOrgUsrDto.class);
// elasticsearchTemplate.putMapping(ESOrgUsrDto.class);
//初始化ES，重建索引
initEs();
}
//初始化ES，重建索引
initEs();
}
/**
* 重建索引
*/
public Boolean initEs() throws Exception {
esOrgUsrDtoRepository.deleteAll();
//获取所有单位
QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
wrapper.in("biz_org_type", "DEPARTMENT","COMPANY");
wrapper.eq("is_delete", 0);
List<OrgUsr> list = orgUsrServiceImpl.list(wrapper);
saveAll(list);
esOrgUsrDtoRepository.deleteAll();
//获取所有单位
QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
wrapper.in("biz_org_type", "DEPARTMENT", "COMPANY");
wrapper.eq("is_delete", 0);
List<OrgUsr> list = orgUsrServiceImpl.list(wrapper);
saveAll(list);
return true;
}
/**
*
* <pre>
* 批量保存
* </pre>
*
* @param list 警情信息列表
*/
public void saveAll( List<OrgUsr> orgUsrs) throws Exception{
if (!ValidationUtil.isEmpty(orgUsrs))
{
for (OrgUsr orgUsr : orgUsrs)
{
this.saveAlertCalledToES(orgUsr);
}
}
public void saveAll(List<OrgUsr> orgUsrs) throws Exception {
if (!ValidationUtil.isEmpty(orgUsrs)) {
for (OrgUsr orgUsr : orgUsrs) {
this.saveAlertCalledToES(orgUsr);
}
}
}
public ESOrgUsrDto saveAlertCalledToES(OrgUsr orgUsr) throws Exception
{
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
String seqStr = String.valueOf(orgUsr.getSequenceNbr());
try {
Long seq = Long.parseLong(seqStr);
esOrgUsrDto.setSequenceNbr(seq);
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDtoRepository.save(esOrgUsrDto);
} catch (Exception e) {
e.printStackTrace();
}
return esOrgUsrDto;
public ESOrgUsrDto saveAlertCalledToES(OrgUsr orgUsr) throws Exception {
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
String seqStr = String.valueOf(orgUsr.getSequenceNbr());
try {
Long seq = Long.parseLong(seqStr);
esOrgUsrDto.setSequenceNbr(seq);
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDtoRepository.save(esOrgUsrDto);
} catch (Exception e) {
e.printStackTrace();
}
return esOrgUsrDto;
}
public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception
{
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
String seqStr = String.valueOf(orgUsr.getSequenceNbr());
try {
Long seq = Long.parseLong(seqStr);
esOrgUsrDto.setSequenceNbr(seq);
MatchQueryBuilder queryBuilder =null;
//设置模糊搜索
if(orgUsr.getBizOrgName()!=null) {
queryBuilder =QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName());
}
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
if(!search.iterator().hasNext()) {
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDtoRepository.save(esOrgUsrDto);
}
} catch (Exception e) {
e.printStackTrace();
}
return esOrgUsrDto;
}
public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception {
ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
String seqStr = String.valueOf(orgUsr.getSequenceNbr());
try {
Long seq = Long.parseLong(seqStr);
esOrgUsrDto.setSequenceNbr(seq);
MatchQueryBuilder queryBuilder = null;
//设置模糊搜索
if (orgUsr.getBizOrgName() != null) {
queryBuilder = QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName());
}
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
if (!search.iterator().hasNext()) {
esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
esOrgUsrDtoRepository.save(esOrgUsrDto);
}
} catch (Exception e) {
e.printStackTrace();
}
return esOrgUsrDto;
}
/**
*
* <pre>
* 从ES库批量删除
* </pre>
*/
public Boolean deleteById(Long sequenceNbr) throws Exception{
if (esOrgUsrDtoRepository.existsById(sequenceNbr)) {
esOrgUsrDtoRepository.deleteById(sequenceNbr);
public Boolean deleteById(Long sequenceNbr) throws Exception {
if (esOrgUsrDtoRepository.existsById(sequenceNbr)) {
esOrgUsrDtoRepository.deleteById(sequenceNbr);
}
return true;
......@@ -148,28 +129,25 @@ public class ESOrgUsrService {
/**
* 根据关键字查询文档，关键字
*
*/
@SuppressWarnings({ "rawtypes" })
public Set<ESOrgUsrDto> queryByKeys(String name)
{
//创建builder
FuzzyQueryBuilder queryBuilder =null;
@SuppressWarnings({"rawtypes"})
public Set<ESOrgUsrDto> queryByKeys(String name) {
//创建builder
FuzzyQueryBuilder queryBuilder = null;
//设置模糊搜索
if(name!=null) {
queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name);
}
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
if (name != null) {
queryBuilder = QueryBuilders.fuzzyQuery("bizOrgName", name);
}
Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
Set<ESOrgUsrDto> list = new LinkedHashSet<>();
search.forEach(esOrgUsrDto->{
list.add(esOrgUsrDto);
});
search.forEach(esOrgUsrDto -> {
list.add(esOrgUsrDto);
});
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.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.password=123456
spring.datasource.password=root_123
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3
......@@ -13,9 +13,10 @@ spring.datasource.hikari.connection-timeout= 60000
spring.datasource.hikari.connection-test-query= SELECT 1
# \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.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
......@@ -28,9 +29,9 @@ security.appKeyApp=studio_normalapp_3056965
#redis
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.host=172.16.6.60
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-wait=-1
spring.redis.lettuce.pool.max-idle=10
......@@ -40,10 +41,10 @@ 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.11.33:1883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://172.16.11.33:8083/mqtt
emqx.broker=tcp://172.16.6.60:2883
emqx.user-name=super
emqx.password=a123456
mqtt.scene.host=mqtt://172.16.6.60:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 1e313eda
## 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.password=123456
spring.datasource.password=root_123
## 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:
spring.redis.database=1
spring.redis.host=172.16.11.20
spring.redis.host=172.16.6.60
spring.redis.port=6379
spring.redis.password=1234560
spring.redis.password=yeejoin@2020
## 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-nodes=${biz.elasticsearch.address}:9300
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.clean-session=true
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.password=a123456
......@@ -28,10 +29,10 @@ emqx.password=a123456
rule.definition.load=false
rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=jcs
rule.definition.localIp=172.16.10.66
rule.definition.localIp=172.16.3.135
## 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.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