Commit 8932cc7c by 李传峰

book_group_qrcode 对接新es

parent df59b9f6
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<pcloud-book-elasticsearch-api.version>1.0.1-SNAPSHOT</pcloud-book-elasticsearch-api.version> <pcloud-book-elasticsearch-api.version>2.0.1-SNAPSHOT</pcloud-book-elasticsearch-api.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -2,7 +2,7 @@ package com.pcloud.book.consumer.book.elasticsearch; ...@@ -2,7 +2,7 @@ package com.pcloud.book.consumer.book.elasticsearch;
import com.pcloud.book.elasticsearch7.entity.Es7Book; import com.pcloud.book.elasticsearch7.entity.Es7Book;
import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto; import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
import com.pcloud.book.elasticsearch7.search.facade.PlatformBookSearchFacade; import com.pcloud.book.elasticsearch7.search.service.PlatformBookSearchService;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.universe.commons.paging.Pagination; import com.pcloud.universe.commons.paging.Pagination;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -22,11 +22,11 @@ public class BookElasticSearchConsr { ...@@ -22,11 +22,11 @@ public class BookElasticSearchConsr {
private final Logger logger = LoggerFactory.getLogger(getClass()); private final Logger logger = LoggerFactory.getLogger(getClass());
@Autowired @Autowired
private PlatformBookSearchFacade platformBookSearchFacade; private PlatformBookSearchService platformBookSearchService;
public Pagination<Es7Book> search(PlatformSearchDto dto) { public Pagination<Es7Book> search(PlatformSearchDto dto) {
try { try {
ResponseDto<Pagination<Es7Book>> r = platformBookSearchFacade.search(dto); ResponseDto<Pagination<Es7Book>> r = platformBookSearchService.search(dto);
return r.getData(); return r.getData();
} catch (Exception e) { } catch (Exception e) {
logger.error("platform book es search exception.", e); logger.error("platform book es search exception.", e);
......
...@@ -9,12 +9,6 @@ import java.util.List; ...@@ -9,12 +9,6 @@ import java.util.List;
public interface ESBookGroupQrcodeBiz { public interface ESBookGroupQrcodeBiz {
/** /**
* 初始化数据-将数据从 MySQL 导入到 Elasticsearch 中
*/
void initData();
/**
* 通过微信群ID(xxx@chatroom)获取ES中的群信息 * 通过微信群ID(xxx@chatroom)获取ES中的群信息
* *
* @param wxGroupIds 微信群ID * @param wxGroupIds 微信群ID
......
...@@ -24,7 +24,6 @@ public class ESBookGroupQrcodeFacadeImpl { ...@@ -24,7 +24,6 @@ public class ESBookGroupQrcodeFacadeImpl {
@ApiOperation("初始化数据") @ApiOperation("初始化数据")
@RequestMapping(value = "init",method = RequestMethod.GET) @RequestMapping(value = "init",method = RequestMethod.GET)
public ResponseDto<?> initData(){ public ResponseDto<?> initData(){
esBookGroupQrcodeBiz.initData();
return new ResponseDto<>(); return new ResponseDto<>();
} }
......
package com.pcloud.book.es.repository;
import com.pcloud.book.es.entity.ESBookGroupQrcode;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
/**
* @author guiq
*/
public interface BookGroupQrcodeRepository extends ElasticsearchRepository<ESBookGroupQrcode,Long> {
}
...@@ -2,16 +2,11 @@ package com.pcloud.book.es.service.impl; ...@@ -2,16 +2,11 @@ package com.pcloud.book.es.service.impl;
import com.pcloud.book.es.biz.ESBookGroupQrcodeBiz; import com.pcloud.book.es.biz.ESBookGroupQrcodeBiz;
import com.pcloud.book.es.dto.ESBookGroupQrcodeDTO; import com.pcloud.book.es.dto.ESBookGroupQrcodeDTO;
import com.pcloud.book.es.repository.BookGroupQrcodeRepository;
import com.pcloud.book.es.service.ESBookGroupQrcodeService; import com.pcloud.book.es.service.ESBookGroupQrcodeService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
...@@ -22,8 +17,6 @@ public class ESBookGroupQrcodeServiceImpl implements ESBookGroupQrcodeService { ...@@ -22,8 +17,6 @@ public class ESBookGroupQrcodeServiceImpl implements ESBookGroupQrcodeService {
@Autowired @Autowired
private ElasticsearchTemplate elasticsearchTemplate; private ElasticsearchTemplate elasticsearchTemplate;
@Autowired @Autowired
private BookGroupQrcodeRepository bookGroupQrcodeRepository;
@Autowired
private ESBookGroupQrcodeBiz esBookGroupQrcodeBiz; private ESBookGroupQrcodeBiz esBookGroupQrcodeBiz;
......
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