提交 b3092c0c authored 作者: 马晨俊's avatar 马晨俊

mcj:新增多个与单个规则添加

上级 8cf638f1
...@@ -23,7 +23,9 @@ public class RuleQo { ...@@ -23,7 +23,9 @@ public class RuleQo {
/** /**
* 匹配的文件后缀 * 匹配的文件后缀
*/ */
private List<String> suffix; private List<String> suffixes;
private String suffix;
/** /**
* 适配技术id * 适配技术id
......
...@@ -44,7 +44,7 @@ public class RuleServiceImpl implements RuleService { ...@@ -44,7 +44,7 @@ public class RuleServiceImpl implements RuleService {
private TechnologyService technologyService; private TechnologyService technologyService;
@Override @Override
public void test(){ public void test() {
List<Rule> rules = ruleDao.findAll(); List<Rule> rules = ruleDao.findAll();
for (Rule rule : rules) { for (Rule rule : rules) {
Technology technology = technologyService.findByid(rule.getTechnologyId()); Technology technology = technologyService.findByid(rule.getTechnologyId());
...@@ -52,6 +52,7 @@ public class RuleServiceImpl implements RuleService { ...@@ -52,6 +52,7 @@ public class RuleServiceImpl implements RuleService {
} }
ruleDao.saveAll(rules); ruleDao.saveAll(rules);
} }
/** /**
* 新增规则 * 新增规则
* *
...@@ -60,20 +61,18 @@ public class RuleServiceImpl implements RuleService { ...@@ -60,20 +61,18 @@ public class RuleServiceImpl implements RuleService {
@Override @Override
public void addRule(RuleQo ruleQo) { public void addRule(RuleQo ruleQo) {
for (String suffix : ruleQo.getSuffix()) { Rule rule1 = ruleDao.findByTargetAndSuffixEquals(ruleQo.getTarget(), ruleQo.getSuffix());
Rule rule1 = ruleDao.findByTargetAndSuffixEquals(ruleQo.getTarget(),suffix); if (rule1 != null) {
if(rule1!=null){
return; return;
} }
Rule rule = new Rule(); Rule rule = new Rule();
rule.setTarget(ruleQo.getTarget()); rule.setTarget(ruleQo.getTarget());
rule.setSuffix(suffix); rule.setSuffix(ruleQo.getSuffix());
rule.setTechnologyId(ruleQo.getTechnologyId()); rule.setTechnologyId(ruleQo.getTechnologyId());
rule.setTechnologyName(ruleQo.getTechnologyName()); rule.setTechnologyName(ruleQo.getTechnologyName());
rule.setId(UUIDUtil.getUUID()); rule.setId(UUIDUtil.getUUID());
ruleDao.save(rule); ruleDao.save(rule);
} }
}
/** /**
* 条件查询+分页 * 条件查询+分页
...@@ -115,20 +114,18 @@ public class RuleServiceImpl implements RuleService { ...@@ -115,20 +114,18 @@ public class RuleServiceImpl implements RuleService {
@Override @Override
public void upRule(RuleQo ruleQo) { public void upRule(RuleQo ruleQo) {
for (String suffix : ruleQo.getSuffix()) {
Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget()); Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
if(rule1!=null){ if (rule1 != null) {
return; return;
} }
Rule rule = new Rule(); Rule rule = new Rule();
rule.setTarget(ruleQo.getTarget()); rule.setTarget(ruleQo.getTarget());
rule.setSuffix(suffix); rule.setSuffix(ruleQo.getSuffix());
rule.setTechnologyId(ruleQo.getTechnologyId()); rule.setTechnologyId(ruleQo.getTechnologyId());
rule.setTechnologyName(ruleQo.getTechnologyName()); rule.setTechnologyName(ruleQo.getTechnologyName());
rule.setId(ruleQo.getId()); rule.setId(ruleQo.getId());
ruleDao.save(rule); ruleDao.save(rule);
} }
}
@Override @Override
public void deleteById(String id) { public void deleteById(String id) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论