修改数据

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/ESOrgUsrDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
 import lombok.Data;
-import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
@@ -15,15 +14,14 @@ import org.springframework.data.elasticsearch.annotations.Mapping;
  *
  */
 @Data
-@Document(indexName = "orgdw", type = "_doc", shards = 1, replicas = 0)
+@Document(indexName = "org", type = "_doc", shards = 1, replicas = 0)
 public class ESOrgUsrDto {
 
     /**部门主键 */
     @Id
     private Long sequenceNbr;
     
-    
-    @Field(type = FieldType.Text, searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
+    @Field(type = FieldType.Text,analyzer="ik_max_word",searchAnalyzer="ik_max_word")
     private String bizOrgName;
     
    

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -302,7 +302,7 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getList", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配", notes = "根据名称模糊匹配")
-    public ResponseModel<SearchHits<ESOrgUsrDto>> selectById(HttpServletRequest request, String name) throws Exception {
+    public ResponseModel<List<ESOrgUsrDto>> selectById(HttpServletRequest request, String name) throws Exception {
        return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
     }
     
@@ -316,7 +316,7 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/getListdata", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配单位", notes = "根据名称模糊匹配单位")
     public ResponseModel<List<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
-       return ResponseHelper.buildResponse(iOrgUsrService.selectByIddata(name));
+       return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
     }
     
     

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/dao/ESOrgUsrDtoRepository.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.common.biz.dao;
 
 import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -13,8 +12,8 @@ import org.springframework.stereotype.Repository;
  *
  */
 @Repository
-public interface ESOrgUsrDtoRepository extends PagingAndSortingRepository<ESOrgUsrDto, Long> {
-
+public interface ESOrgUsrDtoRepository extends ElasticsearchRepository<ESOrgUsrDto, Long> {
 
+	
    
 }

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

@@ -5,6 +5,8 @@ import java.util.LinkedList;
 import java.util.List;
 import javax.annotation.PostConstruct;
 
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +45,10 @@ public class ESOrgUsrService {
 	@PostConstruct
 	public void init() throws Exception
 	{
-		//初始化ES，重建索引
+//		elasticsearchTemplate.deleteIndex(ESOrgUsrDto.class);
+//        elasticsearchTemplate.createIndex(ESOrgUsrDto.class);
+//	    elasticsearchTemplate.putMapping(ESOrgUsrDto.class);
+	 //初始化ES，重建索引
 		initEs();
 	}
 
@@ -52,7 +57,6 @@ public class ESOrgUsrService {
      */
     public Boolean initEs() throws Exception {
     	 esOrgUsrDtoRepository.deleteAll();
-       
     	//获取所有单位
     	  QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
     	  
@@ -115,30 +119,22 @@ public class ESOrgUsrService {
      *
      */
     @SuppressWarnings({ "rawtypes" })
-	public SearchHits<ESOrgUsrDto> queryByKeys(String name)
+	public List<ESOrgUsrDto> queryByKeys(String name)
     {
     	 //创建builder
-    	QueryBuilder queryBuilder =null;
+    	FuzzyQueryBuilder queryBuilder =null;
         //设置模糊搜索
         if(name!=null) {
-         queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name);
+         
+        	queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name);
        }
-        
-        
-        NativeSearchQueryBuilder queryBuilder1 = new NativeSearchQueryBuilder()
-                 .withQuery(queryBuilder);
-
-        
-        SearchHits<ESOrgUsrDto> searchHits =elasticsearchTemplate.search(queryBuilder1.build(), ESOrgUsrDto.class);
-        
-        
-//        Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
-//        List<ESOrgUsrDto> list = new LinkedList<>();
-//			search.forEach(esOrgUsrDto->{				
-//				list.add(esOrgUsrDto);
-//			});
+         Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
+        List<ESOrgUsrDto> list = new LinkedList<>();
+			search.forEach(esOrgUsrDto->{				
+				list.add(esOrgUsrDto);
+			});
 			
-        return searchHits;
+        return list;
 
     }