romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

WIP: страницы для правил #62

Closed
Ghost wants to merge 132 commits from master into 61-rules-pages
pull from: master
merge into: romanov73:61-rules-pages
Conversation 0 Commits 132 Files Changed 146 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14c17284bd - Show all commits

8
src/main/java/ru/ulstu/extractor/recommendation/controller/RecommendationController.java → src/main/java/ru/ulstu/extractor/assessment/controller/AssessmentController.java
View File

@ -1,11 +1,11 @@
package ru.ulstu.extractor.recommendation.controller; package ru.ulstu.extractor.assessment.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.extractor.assessment.model.FilterBranchForm;
import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.branch.service.BranchService;
import ru.ulstu.extractor.recommendation.model.FilterBranchForm;
import ru.ulstu.extractor.rule.service.FuzzyInferenceService; import ru.ulstu.extractor.rule.service.FuzzyInferenceService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
@ -15,11 +15,11 @@ import static ru.ulstu.extractor.core.Route.ASSESSMENTS;
@Controller @Controller
@ApiIgnore @ApiIgnore
public class RecommendationController { public class AssessmentController {
private final FuzzyInferenceService fuzzyInferenceService; private final FuzzyInferenceService fuzzyInferenceService;
private final BranchService branchService; private final BranchService branchService;
public RecommendationController(FuzzyInferenceService fuzzyInferenceService, public AssessmentController(FuzzyInferenceService fuzzyInferenceService,
BranchService branchService) { BranchService branchService) {
this.fuzzyInferenceService = fuzzyInferenceService; this.fuzzyInferenceService = fuzzyInferenceService;
this.branchService = branchService; this.branchService = branchService;

2
src/main/java/ru/ulstu/extractor/recommendation/model/Assessment.java → src/main/java/ru/ulstu/extractor/assessment/model/Assessment.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.recommendation.model; package ru.ulstu.extractor.assessment.model;
import ru.ulstu.extractor.ts.model.TimeSeriesType; import ru.ulstu.extractor.ts.model.TimeSeriesType;

2
src/main/java/ru/ulstu/extractor/recommendation/model/FilterBranchForm.java → src/main/java/ru/ulstu/extractor/assessment/model/FilterBranchForm.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.recommendation.model; package ru.ulstu.extractor.assessment.model;
public class FilterBranchForm { public class FilterBranchForm {
private Integer branchId; private Integer branchId;