yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2025-06-23 19:46:34 +08:00
parent b8a746c60f
commit 2ca26f4c5d
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -121,6 +121,10 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/yx/yxHistoryScoreBatch/conversionScoreBatch","anon");//计算批次线 filterChainDefinitionMap.put("/yx/yxHistoryScoreBatch/conversionScoreBatch","anon");//计算批次线
filterChainDefinitionMap.put("/yx/yxHistoryScoreControlLine/list","anon");//省控线列表 filterChainDefinitionMap.put("/yx/yxHistoryScoreControlLine/list","anon");//省控线列表
filterChainDefinitionMap.put("/mini/school/search","anon");//院校查询
filterChainDefinitionMap.put("/mini/major/miniMajorList","anon");//院校查询
/*filterChainDefinitionMap.put("/art/recommendMajor/page","anon"); /*filterChainDefinitionMap.put("/art/recommendMajor/page","anon");
filterChainDefinitionMap.put("/art/recommendMajor/list","anon");*/ filterChainDefinitionMap.put("/art/recommendMajor/list","anon");*/
// 配置不会被拦截的链接 顺序判断 // 配置不会被拦截的链接 顺序判断

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
View File

@ -56,6 +56,9 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
@Override @Override
public Map<String,YxHistoryMajorEnroll> getDataGroupBySchoolCodeAndMaxYear(String professionalCategory,List<String> schoolCodeList) { public Map<String,YxHistoryMajorEnroll> getDataGroupBySchoolCodeAndMaxYear(String professionalCategory,List<String> schoolCodeList) {
if (StringUtils.isBlank(professionalCategory)) {
return new HashMap<>();
}
List<YxHistoryMajorEnroll> list = baseMapper.getDataGroupBySchoolCodeAndMaxYear(professionalCategory,schoolCodeList); List<YxHistoryMajorEnroll> list = baseMapper.getDataGroupBySchoolCodeAndMaxYear(professionalCategory,schoolCodeList);
Map<String,YxHistoryMajorEnroll> dataMaps=new LinkedHashMap<>(); Map<String,YxHistoryMajorEnroll> dataMaps=new LinkedHashMap<>();
for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) { for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java
View File

@ -66,13 +66,17 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) { if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {
queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(","))); queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(",")));
} }
YxUserScore currentUserScore = yxUserScoreService.getActiveCurrentUserScore(); YxUserScore currentUserScore = null;
String professionalCategory = currentUserScore.getProfessionalCategory();//专业类别 String professionalCategory = null;
try {
currentUserScore = yxUserScoreService.getActiveCurrentUserScore();
professionalCategory = currentUserScore.getProfessionalCategory();//专业类别
String professionalCategoryChildren = currentUserScore.getProfessionalCategoryChildren();//子类 String professionalCategoryChildren = currentUserScore.getProfessionalCategoryChildren();//子类
List<String> pCategoryChildrenList = ScoreUtil.checkProfessionalCategoryToChildrenList(professionalCategoryChildren); List<String> pCategoryChildrenList = ScoreUtil.checkProfessionalCategoryToChildrenList(professionalCategoryChildren);
queryRecommendMajorVO.setCognitioPolyclinic(currentUserScore.getCognitioPolyclinic()); queryRecommendMajorVO.setCognitioPolyclinic(currentUserScore.getCognitioPolyclinic());
queryRecommendMajorVO.setProfessionalCategory(professionalCategory); queryRecommendMajorVO.setProfessionalCategory(professionalCategory);
queryRecommendMajorVO.setPCategoryChildrenList(pCategoryChildrenList); queryRecommendMajorVO.setPCategoryChildrenList(pCategoryChildrenList);
}catch (Exception e){}
if (StringUtils.isNotBlank(queryRecommendMajorVO.getMajorCode())) { if (StringUtils.isNotBlank(queryRecommendMajorVO.getMajorCode())) {
dtoPage = baseMapper.miniSchoolSearchSm(page, queryRecommendMajorVO); dtoPage = baseMapper.miniSchoolSearchSm(page, queryRecommendMajorVO);
}else{ }else{
@ -92,8 +96,7 @@ public class YxSchoolServiceImpl extends ServiceImpl<YxSchoolMapper, YxSchool> i
List<YxSchoolMajor> xkList = yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper); List<YxSchoolMajor> xkList = yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper);
Set<String> schoolCodeSet = xkList.stream().map(YxSchoolMajor::getSchoolCode).collect(Collectors.toSet()); Set<String> schoolCodeSet = xkList.stream().map(YxSchoolMajor::getSchoolCode).collect(Collectors.toSet());
//获取 院校的招生数量 //获取 院校的招生数量
Map<String, Integer> planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(currentUserScore.getProfessionalCategory(), schoolCodeList); Map<String, Integer> planNumMap = yxSchoolMajorService.getSchoolMajorPlanSumByTypeAndCode(professionalCategory, schoolCodeList);
Set<String> tagsList; Set<String> tagsList;
long startTime = new Date().getTime(); long startTime = new Date().getTime();
Integer planNum=0; Integer planNum=0;