Skip to content

石磊 / cihai

Go to a project
Commit 10d7f02d by 侯昆
Options

修改命名和包

1 parent 0d7a1a14
Inline Side-by-side
Showing 7 changed files with 21 additions and 25 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipUtilBean.java → serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipWordUtilBean.java
...@@ -20,6 +20,9 @@ import com.dookay.cihai.core.aip.consts.DepPostTagConst; ...@@ -20,6 +20,9 @@ import com.dookay.cihai.core.aip.consts.DepPostTagConst;
import com.dookay.cihai.core.aip.consts.DeprelConst; import com.dookay.cihai.core.aip.consts.DeprelConst;
import com.dookay.cihai.core.aip.consts.LexerNeConst; import com.dookay.cihai.core.aip.consts.LexerNeConst;
import com.dookay.cihai.core.aip.consts.LexerPosConst; import com.dookay.cihai.core.aip.consts.LexerPosConst;
import com.dookay.cihai.core.aip.model.DepParserItem;
import com.dookay.cihai.core.aip.model.LexerItem;
import com.dookay.cihai.core.aip.model.WordRelation;
import com.dookay.coral.common.core.exception.ServiceException; import com.dookay.coral.common.core.exception.ServiceException;
import com.dookay.coral.common.core.utils.lang.CollectionUtils; import com.dookay.coral.common.core.utils.lang.CollectionUtils;
import com.dookay.coral.common.core.utils.lang.StringUtils; import com.dookay.coral.common.core.utils.lang.StringUtils;
...@@ -47,7 +50,7 @@ import java.util.stream.Collectors; ...@@ -47,7 +50,7 @@ import java.util.stream.Collectors;
*/ */
@Component @Component
@Slf4j @Slf4j
public final class AipUtilBean { public final class AipWordUtilBean {
private static final ConcurrentHashMap<String, Double> SCORE_MAP = new ConcurrentHashMap<>(); private static final ConcurrentHashMap<String, Double> SCORE_MAP = new ConcurrentHashMap<>();
...@@ -64,7 +67,7 @@ public final class AipUtilBean { ...@@ -64,7 +67,7 @@ public final class AipUtilBean {
private final StringRedisTemplate template; private final StringRedisTemplate template;
@Autowired @Autowired
public AipUtilBean(AipNlp aipNlp, StringRedisTemplate template) { public AipWordUtilBean(AipNlp aipNlp, StringRedisTemplate template) {
this.aipNlp = aipNlp; this.aipNlp = aipNlp;
this.template = template; this.template = template;
} }
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/DepParserItem.java → serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/model/DepParserItem.java
package com.dookay.cihai.core.aip; package com.dookay.cihai.core.aip.model;
/***************************************** /*****************************************
* * * *
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/LexerItem.java → serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/model/LexerItem.java
package com.dookay.cihai.core.aip; package com.dookay.cihai.core.aip.model;
/***************************************** /*****************************************
* * * *
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/WordRelation.java → serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/model/WordRelation.java
package com.dookay.cihai.core.aip; package com.dookay.cihai.core.aip.model;
/***************************************** /*****************************************
* * * *
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/WordSequence.java → serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/model/WordSequence.java
package com.dookay.cihai.core.aip; package com.dookay.cihai.core.aip.model;
/***************************************** /*****************************************
* * * *
......
serverside/cihai-core/src/test/java/com/dookay/cihai/core/BaiduTest.java
...@@ -14,13 +14,9 @@ package com.dookay.cihai.core; ...@@ -14,13 +14,9 @@ package com.dookay.cihai.core;
* * * *
****************************************/ ****************************************/
import com.alibaba.fastjson.JSON; import com.dookay.cihai.core.aip.AipWordUtilBean;
import com.dookay.cihai.core.aip.AipUtilBean; import com.dookay.cihai.core.aip.model.WordRelation;
import com.dookay.cihai.core.aip.WordRelation; import com.dookay.cihai.core.aip.model.WordSequence;
import com.dookay.cihai.core.aip.WordSequence;
import jdk.nashorn.internal.ir.annotations.Immutable;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -31,7 +27,6 @@ import org.springframework.util.FileCopyUtils; ...@@ -31,7 +27,6 @@ import org.springframework.util.FileCopyUtils;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -41,7 +36,7 @@ import java.util.stream.Collectors; ...@@ -41,7 +36,7 @@ import java.util.stream.Collectors;
public class BaiduTest extends CihaiCoreApplicationTests { public class BaiduTest extends CihaiCoreApplicationTests {
@Autowired @Autowired
private AipUtilBean aipUtilBean; private AipWordUtilBean aipWordUtilBean;
@Test @Test
public void testQuery() throws Exception { public void testQuery() throws Exception {
...@@ -53,11 +48,11 @@ public class BaiduTest extends CihaiCoreApplicationTests { ...@@ -53,11 +48,11 @@ public class BaiduTest extends CihaiCoreApplicationTests {
String expectResult = "十九大"; String expectResult = "十九大";
String keyword1 = aipUtilBean.extractQueryKeyword(text1); String keyword1 = aipWordUtilBean.extractQueryKeyword(text1);
String keyword2 = aipUtilBean.extractQueryKeyword(text2); String keyword2 = aipWordUtilBean.extractQueryKeyword(text2);
// String keyword3 = aipUtilBean.extractQueryKeyword(text3); // String keyword3 = aipUtilBean.extractQueryKeyword(text3);
// String keyword4 = aipUtilBean.extractQueryKeyword(text4); // String keyword4 = aipUtilBean.extractQueryKeyword(text4);
String keyword5 = aipUtilBean.extractQueryKeyword(text5); String keyword5 = aipWordUtilBean.extractQueryKeyword(text5);
Assert.assertEquals(expectResult, keyword1); Assert.assertEquals(expectResult, keyword1);
Assert.assertEquals(expectResult, keyword2); Assert.assertEquals(expectResult, keyword2);
// Assert.assertEquals(expectResult, keyword3); // Assert.assertEquals(expectResult, keyword3);
...@@ -76,9 +71,9 @@ public class BaiduTest extends CihaiCoreApplicationTests { ...@@ -76,9 +71,9 @@ public class BaiduTest extends CihaiCoreApplicationTests {
File file = resource.getFile(); File file = resource.getFile();
FileReader reader = new FileReader(file); FileReader reader = new FileReader(file);
String text = FileCopyUtils.copyToString(reader); String text = FileCopyUtils.copyToString(reader);
List<String> list = aipUtilBean.extractKeyWords("中国共产党第十九次全国代表大会", text, 15); List<String> list = aipWordUtilBean.extractKeyWords("中国共产党第十九次全国代表大会", text, 15);
List<WordSequence> wordSequences = list.stream().map(l -> new WordSequence(list.indexOf(l), l)).collect(Collectors.toList()); List<WordSequence> wordSequences = list.stream().map(l -> new WordSequence(list.indexOf(l), l)).collect(Collectors.toList());
List<WordRelation> wordRelations = aipUtilBean.generateWordsMap(list); List<WordRelation> wordRelations = aipWordUtilBean.generateWordsMap(list);
System.out.println(wordSequences); System.out.println(wordSequences);
System.out.println(wordRelations); System.out.println(wordRelations);
System.out.println(wordRelations.size()); System.out.println(wordRelations.size());
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
...@@ -14,12 +14,10 @@ ...@@ -14,12 +14,10 @@
package com.dookay.cihai.wechat.controller; package com.dookay.cihai.wechat.controller;
import com.dookay.cihai.core.aip.AipUtilBean; import com.dookay.cihai.core.aip.AipWordUtilBean;
import com.dookay.cihai.core.theme.domain.ThemeDomain; import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.query.ThemeQuery; import com.dookay.cihai.core.theme.query.ThemeQuery;
import com.dookay.cihai.core.theme.service.IThemeService; import com.dookay.cihai.core.theme.service.IThemeService;
import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.cihai.core.word.query.WordQuery;
import com.dookay.cihai.core.word.service.IWordService; import com.dookay.cihai.core.word.service.IWordService;
import com.dookay.coral.common.web.controller.BaseController; import com.dookay.coral.common.web.controller.BaseController;
import com.dookay.coral.common.web.response.JsonResult; import com.dookay.coral.common.web.response.JsonResult;
...@@ -45,7 +43,7 @@ public class HomeController extends BaseController { ...@@ -45,7 +43,7 @@ public class HomeController extends BaseController {
private IThemeService themeService; private IThemeService themeService;
@Autowired @Autowired
private AipUtilBean aipUtilBean; private AipWordUtilBean aipWordUtilBean;
/** /**
* @author 石磊 * @author 石磊
...@@ -68,7 +66,7 @@ public class HomeController extends BaseController { ...@@ -68,7 +66,7 @@ public class HomeController extends BaseController {
public JsonResult search(String keyword) { public JsonResult search(String keyword) {
System.out.println("进入搜索"); System.out.println("进入搜索");
try { try {
String result = aipUtilBean.extractQueryKeyword(keyword); String result = aipWordUtilBean.extractQueryKeyword(keyword);
ThemeQuery query = new ThemeQuery(); ThemeQuery query = new ThemeQuery();
query.setKeyword(keyword); query.setKeyword(keyword);
ThemeDomain themeDomain = themeService.getFirst(query); ThemeDomain themeDomain = themeService.getFirst(query);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!