Godfather-Bots/autoresponder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'release-1.3.1' into develop

Browse Source 
release-1.3.1
This commit is contained in:
Mark Struchkov 2019-02-07 18:00:58 +03:00
commit 086c14e9d6
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>org.sadtech.autoresponder</groupId> <groupId>org.sadtech.autoresponder</groupId>
<artifactId>autoresponder</artifactId> <artifactId>autoresponder</artifactId>
<version>1.4.0-SNAPSHOT</version> <version>1.3.1-RELEASE</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>
<plugins> <plugins>

7
src/main/java/org/sadtech/autoresponder/Autoresponder.java
View File

@ -17,6 +17,7 @@ public class Autoresponder {
public static final Logger log = Logger.getLogger(Autoresponder.class); public static final Logger log = Logger.getLogger(Autoresponder.class);
private UnitService unitService; private UnitService unitService;
private PersonService personService;
public PersonService getPersonService() { public PersonService getPersonService() {
return personService; return personService;
@ -26,8 +27,6 @@ public class Autoresponder {
this.personService = personService; this.personService = personService;
} }
private PersonService personService;
public Autoresponder(UnitService unitService, PersonService personService) { public Autoresponder(UnitService unitService, PersonService personService) {
this.unitService = unitService; this.unitService = unitService;
this.personService = personService; this.personService = personService;
@ -67,15 +66,12 @@ public class Autoresponder {
UnitPriorityComparator unitPriorityComparator = new UnitPriorityComparator(); UnitPriorityComparator unitPriorityComparator = new UnitPriorityComparator();
Optional<Unit> patternUnits = nextUnits.stream().filter(nextUnit -> nextUnit.getPattern() != null).filter(nextUnit -> patternReg(nextUnit, message)).max(unitPriorityComparator); Optional<Unit> patternUnits = nextUnits.stream().filter(nextUnit -> nextUnit.getPattern() != null).filter(nextUnit -> patternReg(nextUnit, message)).max(unitPriorityComparator);
if (!patternUnits.isPresent()) {
patternUnits = nextUnits.stream().filter(nextUnit -> (textPercentageMatch(nextUnit, new HashSet<>(Collections.singleton(message))) == 100.0)).max(unitPriorityComparator);
if (!patternUnits.isPresent()) { if (!patternUnits.isPresent()) {
Parser parser = new Parser(); Parser parser = new Parser();
parser.setText(message); parser.setText(message);
parser.parse(); parser.parse();
patternUnits = nextUnits.stream().filter(nextUnit -> textPercentageMatch(nextUnit, parser.getWords()) >= nextUnit.getMatchThreshold()).max(unitPriorityComparator); patternUnits = nextUnits.stream().filter(nextUnit -> textPercentageMatch(nextUnit, parser.getWords()) >= nextUnit.getMatchThreshold()).max(unitPriorityComparator);
} }
}
if (!patternUnits.isPresent()) { if (!patternUnits.isPresent()) {
patternUnits = nextUnits.stream().filter(nextUnit -> (nextUnit.getPattern() == null && nextUnit.getKeyWords() == null)).max(unitPriorityComparator); patternUnits = nextUnits.stream().filter(nextUnit -> (nextUnit.getPattern() == null && nextUnit.getKeyWords() == null)).max(unitPriorityComparator);
@ -100,6 +96,7 @@ public class Autoresponder {
if (unit.getKeyWords() != null) { if (unit.getKeyWords() != null) {
Set<String> temp = new HashSet<>(unit.getKeyWords()); Set<String> temp = new HashSet<>(unit.getKeyWords());
temp.retainAll(words); temp.retainAll(words);
log.info("Юнит: " + unit.getClass().getSimpleName());
log.info("Ключевые слова юнита: " + unit.getKeyWords() + " (" + unit.getKeyWords().size() + ")"); log.info("Ключевые слова юнита: " + unit.getKeyWords() + " (" + unit.getKeyWords().size() + ")");
log.info("Ключевые слова от пользователя: " + words); log.info("Ключевые слова от пользователя: " + words);
log.info("Пересечение: " + temp + " (" + temp.size() + ")"); log.info("Пересечение: " + temp + " (" + temp.size() + ")");

2
src/main/java/org/sadtech/autoresponder/service/UnitService.java
View File

@ -1,9 +1,7 @@
package org.sadtech.autoresponder.service; package org.sadtech.autoresponder.service;
import org.sadtech.autoresponder.entity.Unit; import org.sadtech.autoresponder.entity.Unit;
import org.sadtech.autoresponder.repository.UnitRepository;
import java.util.List;
import java.util.Set; import java.util.Set;
public interface UnitService { public interface UnitService {

2
src/main/java/org/sadtech/autoresponder/service/impl/UnitServiceImpl.java
View File

@ -5,8 +5,6 @@ import org.sadtech.autoresponder.entity.Unit;
import org.sadtech.autoresponder.repository.UnitRepository; import org.sadtech.autoresponder.repository.UnitRepository;
import org.sadtech.autoresponder.service.UnitService; import org.sadtech.autoresponder.service.UnitService;
import java.util.ArrayList;
import java.util.List;
import java.util.Set; import java.util.Set;
public class UnitServiceImpl implements UnitService { public class UnitServiceImpl implements UnitService {