|
@@ -7,8 +7,10 @@ import cn.iselab.mooctest.site.common.web.ErrorResult;
|
|
|
import cn.iselab.mooctest.site.common.web.ResponseMessage;
|
|
import cn.iselab.mooctest.site.common.web.ResponseMessage;
|
|
|
import cn.iselab.mooctest.site.common.web.StatusCode;
|
|
import cn.iselab.mooctest.site.common.web.StatusCode;
|
|
|
import cn.iselab.mooctest.site.common.web.SuccessResult;
|
|
import cn.iselab.mooctest.site.common.web.SuccessResult;
|
|
|
|
|
+import cn.iselab.mooctest.site.models.Case;
|
|
|
import cn.iselab.mooctest.site.models.Task;
|
|
import cn.iselab.mooctest.site.models.Task;
|
|
|
import cn.iselab.mooctest.site.models.fromKibug.*;
|
|
import cn.iselab.mooctest.site.models.fromKibug.*;
|
|
|
|
|
+import cn.iselab.mooctest.site.service.CaseService;
|
|
|
import cn.iselab.mooctest.site.service.TaskService;
|
|
import cn.iselab.mooctest.site.service.TaskService;
|
|
|
import cn.iselab.mooctest.site.service.fromKibug.ScoreRuleService;
|
|
import cn.iselab.mooctest.site.service.fromKibug.ScoreRuleService;
|
|
|
import cn.iselab.mooctest.site.web.data.fromKibug.CaseListItemVO;
|
|
import cn.iselab.mooctest.site.web.data.fromKibug.CaseListItemVO;
|
|
@@ -33,6 +35,8 @@ public class ScoreRuleController {
|
|
|
private ScoreRuleService scoreRuleService;
|
|
private ScoreRuleService scoreRuleService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private TaskService taskService;
|
|
private TaskService taskService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private CaseService caseService;
|
|
|
|
|
|
|
|
@RequestMapping(value= UrlConstants.API_KIBUG+"scoreRule", method = RequestMethod.GET)
|
|
@RequestMapping(value= UrlConstants.API_KIBUG+"scoreRule", method = RequestMethod.GET)
|
|
|
public Map<String, Object> get(@RequestParam(name = "taskId") Long taskId,
|
|
public Map<String, Object> get(@RequestParam(name = "taskId") Long taskId,
|
|
@@ -65,13 +69,20 @@ public class ScoreRuleController {
|
|
|
@PathVariable @NotNull Long taskId,
|
|
@PathVariable @NotNull Long taskId,
|
|
|
@RequestBody ScoreRuleVO vo) throws Exception {
|
|
@RequestBody ScoreRuleVO vo) throws Exception {
|
|
|
vo.validate();
|
|
vo.validate();
|
|
|
- Task task = taskService.getTask(taskId);
|
|
|
|
|
- switch(task.getSubsiteId().intValue()){
|
|
|
|
|
|
|
+ Case ca=caseService.getCaseById(vo.getCaseId());
|
|
|
|
|
+ //Task task = taskService.getTask(taskId);
|
|
|
|
|
+ switch (ca.getSubjectId().intValue()){
|
|
|
case (int) SubsiteConstants.DEV_SUBSITE_ID:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
|
|
case (int) SubsiteConstants.DEV_SUBSITE_ID:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
|
|
|
case (int) SubsiteConstants.KIKBUG_SUBSITE_ID:
|
|
case (int) SubsiteConstants.KIKBUG_SUBSITE_ID:
|
|
|
case (int) SubsiteConstants.KIJAM_SUBSITE_ID:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
|
|
case (int) SubsiteConstants.KIJAM_SUBSITE_ID:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
|
|
|
default :return new ErrorResult(StatusCode.PARAMETER_ERROR);
|
|
default :return new ErrorResult(StatusCode.PARAMETER_ERROR);
|
|
|
}
|
|
}
|
|
|
|
|
+// switch(task.getSubsiteId().intValue()){
|
|
|
|
|
+// case (int) SubsiteConstants.DEV_SUBSITE_ID:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
|
|
|
|
|
+// case (int) SubsiteConstants.KIKBUG_SUBSITE_ID:
|
|
|
|
|
+// case (int) SubsiteConstants.KIJAM_SUBSITE_ID:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
|
|
|
|
|
+// default :return new ErrorResult(StatusCode.PARAMETER_ERROR);
|
|
|
|
|
+// }
|
|
|
return SuccessResult.ok();
|
|
return SuccessResult.ok();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|