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

76-edit-and-delete-rule #77

Merged
romanov73 merged 4 commits from 76-edit-and-delete-rule into master 2022-10-24 17:05:16 +04:00
Conversation 1 Commits 4 Files Changed 7 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f7338f34c9 - Show all commits

18
src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
View File

@ -2,16 +2,21 @@ package ru.ulstu.extractor.rule.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.*; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
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.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import ru.ulstu.extractor.rule.model.AddRuleForm; import ru.ulstu.extractor.rule.model.AddRuleForm;
import ru.ulstu.extractor.rule.repository.RuleRepository;
import ru.ulstu.extractor.rule.service.AntecedentValueService; import ru.ulstu.extractor.rule.service.AntecedentValueService;
import ru.ulstu.extractor.rule.service.RuleService; import ru.ulstu.extractor.rule.service.RuleService;
import ru.ulstu.extractor.ts.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import static ru.ulstu.extractor.core.Route.*; import static ru.ulstu.extractor.core.Route.ADD_RULE;
import static ru.ulstu.extractor.core.Route.DELETE_RULE;
import static ru.ulstu.extractor.core.Route.LIST_RULE;
@Controller @Controller
@ApiIgnore @ApiIgnore
@ -19,15 +24,13 @@ public class RuleController {
private final RuleService ruleService; private final RuleService ruleService;
private final AntecedentValueService antecedentValueService; private final AntecedentValueService antecedentValueService;
private final TimeSeriesService timeSeriesService; private final TimeSeriesService timeSeriesService;
private final RuleRepository ruleRepository;
public RuleController(RuleService ruleService, public RuleController(RuleService ruleService,
AntecedentValueService antecedentValueService, AntecedentValueService antecedentValueService,
TimeSeriesService timeSeriesService, RuleRepository ruleRepository) { TimeSeriesService timeSeriesService) {
this.ruleService = ruleService; this.ruleService = ruleService;
this.antecedentValueService = antecedentValueService; this.antecedentValueService = antecedentValueService;
this.timeSeriesService = timeSeriesService; this.timeSeriesService = timeSeriesService;
this.ruleRepository = ruleRepository;
} }
@GetMapping(LIST_RULE) @GetMapping(LIST_RULE)
@ -52,8 +55,7 @@ public class RuleController {
@GetMapping(DELETE_RULE) @GetMapping(DELETE_RULE)
public String deleteRule(Model model, @RequestParam Integer id) { public String deleteRule(Model model, @RequestParam Integer id) {
ruleRepository.deleteById(id); ruleService.deleteById(id);
model.addAttribute("rule", ruleRepository.findAll());
return "redirect:/" + LIST_RULE; return "redirect:/" + LIST_RULE;
} }
} }

4
src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
View File

@ -56,4 +56,8 @@ public class RuleService {
.orElseThrow(() -> new RuntimeException("Правило не найдено"))) .orElseThrow(() -> new RuntimeException("Правило не найдено")))
: new AddRuleForm(); : new AddRuleForm();
} }
public void deleteById(Integer id) {
ruleRepository.deleteById(id);
}
} }