#23 -- Add run project controller methods
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m48s
All checks were successful
CI fuzzy controller / container-test-job (push) Successful in 1m48s
This commit is contained in:
parent
16aeb1e7e5
commit
a3e59c6461
@ -6,11 +6,12 @@ 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.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import ru.ulstu.fc.project.model.RunProjectForm;
|
import ru.ulstu.fc.project.model.RunProjectForm;
|
||||||
import ru.ulstu.fc.project.service.ProjectRulesService;
|
|
||||||
import ru.ulstu.fc.project.service.ProjectService;
|
import ru.ulstu.fc.project.service.ProjectService;
|
||||||
import ru.ulstu.fc.project.service.ProjectVariableService;
|
import ru.ulstu.fc.project.service.ProjectVariableService;
|
||||||
|
import ru.ulstu.fc.rule.service.FuzzyInferenceService;
|
||||||
import ru.ulstu.fc.user.model.UserRoleConstants;
|
import ru.ulstu.fc.user.model.UserRoleConstants;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
@ -19,14 +20,14 @@ import ru.ulstu.fc.user.model.UserRoleConstants;
|
|||||||
@Secured({UserRoleConstants.ADMIN})
|
@Secured({UserRoleConstants.ADMIN})
|
||||||
public class ProjectRunController {
|
public class ProjectRunController {
|
||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
private final ProjectRulesService projectRulesService;
|
private final FuzzyInferenceService fuzzyInferenceService;
|
||||||
private final ProjectVariableService projectVariableService;
|
private final ProjectVariableService projectVariableService;
|
||||||
|
|
||||||
public ProjectRunController(ProjectService projectService,
|
public ProjectRunController(ProjectService projectService,
|
||||||
ProjectRulesService projectRulesService,
|
FuzzyInferenceService fuzzyInferenceService,
|
||||||
ProjectVariableService projectVariableService) {
|
ProjectVariableService projectVariableService) {
|
||||||
this.projectService = projectService;
|
this.projectService = projectService;
|
||||||
this.projectRulesService = projectRulesService;
|
this.fuzzyInferenceService = fuzzyInferenceService;
|
||||||
this.projectVariableService = projectVariableService;
|
this.projectVariableService = projectVariableService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,4 +38,12 @@ public class ProjectRunController {
|
|||||||
model.addAttribute("variables", projectVariableService.getInputByProjectId(projectId));
|
model.addAttribute("variables", projectVariableService.getInputByProjectId(projectId));
|
||||||
return "project/init";
|
return "project/init";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("run")
|
||||||
|
public String run(RunProjectForm runProjectForm, Model model) {
|
||||||
|
model.addAttribute("response",
|
||||||
|
fuzzyInferenceService.getFuzzyInference(
|
||||||
|
runProjectForm.getVariableValues()));
|
||||||
|
return "project/result";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
package ru.ulstu.fc.project.model;
|
package ru.ulstu.fc.project.model;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class RunProjectForm {
|
public class RunProjectForm {
|
||||||
private Integer projectId;
|
private Integer projectId;
|
||||||
|
private Map<String, Double> variableValues;
|
||||||
|
|
||||||
public Integer getProjectId() {
|
public Integer getProjectId() {
|
||||||
return projectId;
|
return projectId;
|
||||||
@ -10,4 +13,12 @@ public class RunProjectForm {
|
|||||||
public void setProjectId(Integer projectId) {
|
public void setProjectId(Integer projectId) {
|
||||||
this.projectId = projectId;
|
this.projectId = projectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<String, Double> getVariableValues() {
|
||||||
|
return variableValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVariableValues(Map<String, Double> variableValues) {
|
||||||
|
this.variableValues = variableValues;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user