diff --git a/src/main/java/cn/teammodel/controller/frontend/AppraiseController.java b/src/main/java/cn/teammodel/controller/frontend/AppraiseController.java index 3b7b9ac..342c3e5 100644 --- a/src/main/java/cn/teammodel/controller/frontend/AppraiseController.java +++ b/src/main/java/cn/teammodel/controller/frontend/AppraiseController.java @@ -34,18 +34,6 @@ public class AppraiseController { @Resource private EvaluationService evaluationService; - /** - * 获取默认评价树 - * @return - */ - @PostMapping("getDefaultTrees") - @ApiOperation(value = "获取默认评价树", notes = "获取默认评价树") - public R getDefaultTree() { - Appraise appraise = evaluationService.getDefaultTree(); - return R.success(appraise); - } - - @PostMapping("getTrees") @ApiOperation(value = "获取评价树", notes = "获取评价树") public R getEvaluateTree(@RequestBody @Valid GetEvaluateTreeDto getEvaluateTreeDto) { diff --git a/src/main/java/cn/teammodel/repository/AppraiseRepository.java b/src/main/java/cn/teammodel/repository/AppraiseRepository.java index e8f9316..a674f4c 100644 --- a/src/main/java/cn/teammodel/repository/AppraiseRepository.java +++ b/src/main/java/cn/teammodel/repository/AppraiseRepository.java @@ -25,9 +25,6 @@ import java.util.Set; public interface AppraiseRepository extends CosmosRepository { Appraise findBySchoolId(String schoolId, PartitionKey partitionKey); Appraise findAppraiseBySchoolIdAndPeriodIdAndCode(String schoolId, String periodId, String code); - - - Appraise findAppraiseById(String id, PartitionKey partitionKey); /** * 获取模板树 diff --git a/src/main/java/cn/teammodel/service/EvaluationService.java b/src/main/java/cn/teammodel/service/EvaluationService.java index 54bcb54..74d2020 100644 --- a/src/main/java/cn/teammodel/service/EvaluationService.java +++ b/src/main/java/cn/teammodel/service/EvaluationService.java @@ -20,13 +20,6 @@ import java.util.Map; */ public interface EvaluationService { - /** - * 获取默认评价树 - * @return - */ - Appraise getDefaultTree(); - - Appraise getTree(GetEvaluateTreeDto getEvaluateTreeDto); /** diff --git a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java index eebcad0..823dbb3 100644 --- a/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java +++ b/src/main/java/cn/teammodel/service/impl/EvaluationServiceImpl.java @@ -96,29 +96,6 @@ public class EvaluationServiceImpl implements EvaluationService { return appraise; } - /** - * 获取默认的评价树 - * @return - */ - @Override - public Appraise getDefaultTree(){ - Appraise appraise = appraiseRepository.findAppraiseById("default",new PartitionKey(PK.PK_APPRAISE)); - - // 如果传参 period 所在没有 tree 的话,则复制一份模板 tree 给他 (处理节点 id) - if (appraise == null) { - appraise = RepositoryUtil.findOne(appraiseRepository.findTemplateTree(), "获取模板评价树失败"); - if (appraise == null) { - throw new ServiceException("模板评价树不存在"); - } - // refresh - refreshAppraiseTree(appraise); - appraise.setId(null); - appraise = appraiseRepository.save(appraise); - } - - return this.buildTree(appraise); - } - @Override public Appraise getTree(GetEvaluateTreeDto getEvaluateTreeDto) { String periodId = getEvaluateTreeDto.getPeriodId();