Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -9,6 +9,7 @@ import javax.annotation.PostConstruct;
 
 import org.elasticsearch.index.query.BoolQueryBuilder;
 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;
@@ -106,6 +107,29 @@ public class ESOrgUsrService {
     	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>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -436,7 +436,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 					OrgUsr orgUsr = new OrgUsr();
 					orgUsr.setSequenceNbr(-1L);
 					orgUsr.setBizOrgName(alertCalled.getUnitInvolved());
-					eSOrgUsrService.saveAlertCalledToES(orgUsr);
+					eSOrgUsrService.saveAlertCalledToESNew(orgUsr);
 				}