|
@@ -82,7 +82,7 @@ public class ScoringRulesController {
|
|
//1 检查是否存在同名平分规则
|
|
//1 检查是否存在同名平分规则
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(vo);
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(vo);
|
|
if (list != null && list.size() > 0) {
|
|
if (list != null && list.size() > 0) {
|
|
- return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称ruleName已存在,请重新命名。");
|
|
|
|
|
|
+ return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称 ruleName 已存在,请重新命名。");
|
|
}
|
|
}
|
|
//2 校验 python 语法错误
|
|
//2 校验 python 语法错误
|
|
String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(), PythonUtil.C, PythonUtil.R, PythonUtil.W);
|
|
String pylint = PythonUtil.pylint(scoringRulesPO.getRuleDetails(), PythonUtil.C, PythonUtil.R, PythonUtil.W);
|
|
@@ -105,14 +105,14 @@ public class ScoringRulesController {
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public ResponseBodyVO<String> fxScoringRules(@RequestBody ScoringRulesParam params) {
|
|
public ResponseBodyVO<String> fxScoringRules(@RequestBody ScoringRulesParam params) {
|
|
if (ObjectUtil.isNull(params.getRulesId())) {
|
|
if (ObjectUtil.isNull(params.getRulesId())) {
|
|
- return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "参数RulesId不能为空,请检查");
|
|
|
|
|
|
+ return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 RulesId 不能为空,请检查","");
|
|
}
|
|
}
|
|
ScoringRulesPO po = scoringRulesService.queryScoringRules(params);
|
|
ScoringRulesPO po = scoringRulesService.queryScoringRules(params);
|
|
params.setShare("1");
|
|
params.setShare("1");
|
|
params.setRuleName(po.getRuleName());
|
|
params.setRuleName(po.getRuleName());
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(params);
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesByRuleName(params);
|
|
if (list != null && list.size() > 0) {
|
|
if (list != null && list.size() > 0) {
|
|
- return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称ruleName已存在,请重新命名");
|
|
|
|
|
|
+ return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "规则名称ruleName已存在,请重新命名","");
|
|
}
|
|
}
|
|
po.setShare("1");
|
|
po.setShare("1");
|
|
scoringRulesService.saveScoringRules(po);
|
|
scoringRulesService.saveScoringRules(po);
|
|
@@ -134,6 +134,6 @@ public class ScoringRulesController {
|
|
ScoringRulesParam params = new ScoringRulesParam();
|
|
ScoringRulesParam params = new ScoringRulesParam();
|
|
params.setShare("0");
|
|
params.setShare("0");
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesList(params);
|
|
List<ScoringRulesPO> list = scoringRulesService.queryScoringRulesList(params);
|
|
- return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, list);
|
|
|
|
|
|
+ return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
|
|
}
|
|
}
|
|
}
|
|
}
|