diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java index 2d9a4aa..edede22 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniRecommendMajorController.java @@ -5,10 +5,14 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.AssertUtils; import org.jeecg.modules.mini.service.MiniTestCulturalService; import org.jeecg.modules.web.dto.ArtCalculateInvestmentDTO; import org.jeecg.modules.web.vo.QueryCalculateInvestmentVO; +import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.service.IYxCalculationMajorService; @@ -38,7 +42,17 @@ public class MiniRecommendMajorController { @Resource MiniTestCulturalService testCulturalService; - + @ApiOperation(value = "文化分测算") + @GetMapping(value = "/testCultural") + public Result testCultural(QueryRecommendMajorVO queryRecommendMajorVO) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //根据 院校代码,获取 院校的招生专业,计算各专业的录取分数 + String schoolCode = queryRecommendMajorVO.getSchoolCode(); + String year = queryRecommendMajorVO.getYear(); + AssertUtils.notNull(loginUser, "未获取到登录信息"); + AssertUtils.notNull(year, "请选择年份"); + return Result.OK(testCulturalService.testCultural(schoolCode, year)); + } @ApiOperation(value = "投档分测算") @GetMapping("/calculateInvestment")