updates
This commit is contained in:
zhouwentao
parent
880ef5eebc
commit
89d05d03b2
|
|
@ -63,149 +63,8 @@ public class MiniArticleController {
|
|||
@GetMapping(value = "/page")
|
||||
public Result<?> articlePage(QueryArticleVO queryArticleVO) {
|
||||
if (false) {
|
||||
//俄罗斯圣彼得堡国立列斯加夫特体育大学；4+0)
|
||||
String strs = "在考生达到、省统考、高考文化成绩、专业主科、器乐类只招、只招、不招、要求、语文成绩、英语成绩、外语科目、高考文化课成绩、外语单科成绩、建议、只录取、无色盲、色弱者、体育专业、色弱、色盲、体检、体育专项统一测试成绩、身体无残疾、不予录取、男生身高、女生身高";
|
||||
String[] tiquList = strs.split("、");
|
||||
LambdaQueryWrapper<YxSchoolMajor> yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
yxSchoolMajorLambdaQueryWrapper.isNull(YxSchoolMajor::getLimitation);
|
||||
// yxSchoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getId,"1763788787643392003");
|
||||
//yxSchoolMajorLambdaQueryWrapper.last("limit 1,100");
|
||||
List<YxSchoolMajor> list = yxSchoolMajorService.list(yxSchoolMajorLambdaQueryWrapper);
|
||||
String detail = null;
|
||||
String limitation = null;
|
||||
int i = 0;
|
||||
int i1 = 0;
|
||||
List<YxSchoolMajor> updateSchoolMajorList = new ArrayList<>();
|
||||
for (YxSchoolMajor yxSchoolMajor : list) {
|
||||
detail = yxSchoolMajor.getDetail();
|
||||
detail = detail.replace("；", ",").replace("，", ",").replace("。", ",");
|
||||
//过滤
|
||||
detail = detail.replace(" ", "").replace("录取要求详见学校招生章程及艺术类招生简章", "").replace("要求可获得本校本科文凭的同时，还可获法国 RNCP6级证书(等同于法国普通大学学士学位)(不以出国为前提)。", "");
|
||||
limitation = null;
|
||||
for (String s : tiquList) {
|
||||
if (detail.contains(s)) {
|
||||
i = detail.indexOf(s);
|
||||
limitation = detail.substring(i, detail.length() - 1);
|
||||
System.out.println(limitation);
|
||||
break;
|
||||
}
|
||||
}
|
||||
//去除最后一位,符号
|
||||
if (StringUtils.isNotBlank(limitation)) {
|
||||
i1 = limitation.lastIndexOf(",");
|
||||
if (limitation.length() - 1 == i1) {
|
||||
limitation = limitation.substring(0, i1);
|
||||
}
|
||||
yxSchoolMajor.setLimitation(limitation);
|
||||
updateSchoolMajorList.add(yxSchoolMajor);
|
||||
}
|
||||
}
|
||||
yxSchoolMajorService.updateBatchById(updateSchoolMajorList, 100);
|
||||
return Result.OK();
|
||||
}
|
||||
|
||||
if (false) {
|
||||
Map<String, YxSchoolResearchTeaching> maps = new LinkedHashMap<>();
|
||||
YxSchoolResearchTeaching yxSchoolResearchTeaching = null;
|
||||
List<YxSchoolGraduateDegree> schoolGraduateDegreeList = yxSchoolGraduateDegreeService.list();
|
||||
String schoolId = null;//院校id
|
||||
String graduateSchool = null;//研究生院
|
||||
String selfMarking = null;//自划线
|
||||
String degreeNature = null;//学位性质 （专硕/学硕）
|
||||
String disciplineField = null;
|
||||
for (YxSchoolGraduateDegree yxSchoolGraduateDegree : schoolGraduateDegreeList) {
|
||||
schoolId = yxSchoolGraduateDegree.getSchoolId();
|
||||
graduateSchool = yxSchoolGraduateDegree.getGraduateSchool();
|
||||
selfMarking = yxSchoolGraduateDegree.getSelfMarking();
|
||||
disciplineField = yxSchoolGraduateDegree.getDisciplineField();
|
||||
yxSchoolResearchTeaching = maps.getOrDefault(schoolId, new YxSchoolResearchTeaching());
|
||||
yxSchoolResearchTeaching.setSchoolId(yxSchoolGraduateDegree.getSchoolId());
|
||||
degreeNature = yxSchoolGraduateDegree.getDegreeNature();
|
||||
//保存研究生院
|
||||
if (StringUtils.isNotBlank(graduateSchool) && "是".equals(graduateSchool)) {
|
||||
yxSchoolResearchTeaching.setYjsy(1);
|
||||
}
|
||||
//自划线
|
||||
if (StringUtils.isNotBlank(selfMarking) && "是".equals(selfMarking)) {
|
||||
yxSchoolResearchTeaching.setZhx(1);
|
||||
}
|
||||
|
||||
// if ("专硕".equals(degreeNature)) {
|
||||
// yxSchoolResearchTeaching.setProfessionalMasterDegreePoint(yxSchoolResearchTeaching.getProfessionalMasterDegreePoint() + 1);
|
||||
// } else {//学硕
|
||||
// yxSchoolResearchTeaching.setAcademicMasterDegreePoint(yxSchoolResearchTeaching.getAcademicMasterDegreePoint() + 1);
|
||||
// }
|
||||
maps.put(schoolId, yxSchoolResearchTeaching);
|
||||
}
|
||||
Collection<YxSchoolResearchTeaching> values = maps.values();
|
||||
yxSchoolResearchTeachingService.saveBatch(values);
|
||||
return Result.OK();
|
||||
}
|
||||
|
||||
if (true) {
|
||||
yxVolunteerService.removeOldScore(null);
|
||||
}
|
||||
|
||||
if(false){
|
||||
String json = "{\"文*1+专*1\":\"文1专1\",\"文*0.133+专*0.333\":\"文1专1\",\"文*0.04+专*0.175\":\"文3专7\",\"文*0.04+专*0.233\":\"文3专7\",\"文*0.4+专*2.333\":\"文3专7\",\"文*0.04+专*0.35\":\"文3专7\",\"文*0.3+专*0.7\":\"文3专7\",\"文*0.3+专*1.75\":\"文3专7\",\"文*0.3+专*2.625\":\"文3专7\",\"文*0.3+专*1\":\"文3专10\",\"文*0.4+专*1\":\"文4专10\",\"文*0.4+专*0.6\":\"文4专6\",\"文*0.4+专*0.9\":\"文4专6\",\"文*0.4+专*1.125\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.4+专*2.25\":\"文4专6\",\"文*0.053+专*0.15\":\"文4专6\",\"文*0.053+专*0.2\":\"文4专6\",\"文*0.053+专*0.3\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.11673+专*0.133\":\"文4专6\",\"文*0.10969+专*0.133\":\"文4专6\",\"文*0.4+专*1.5\":\"文4专6\",\"文*0.08+专*0.2\":\"文4专6\",\"文*0.8+专*1.2\":\"文4专6\",\"文*0.08+专*0.4\":\"文4专6\",\"文*1.2+专*0.8\":\"文4专6\",\"文*0.5+专*1\":\"文5专10\",\"文*0.5+专*1.25\":\"文5专5\",\"文*0.5+专*1.875\":\"文5专5\",\"文*0.067+专*0.167\":\"文5专5\",\"文*0.067+专*0.125\":\"文5专5\",\"文*0.067+专*0.25\":\"文5专5\",\"文*0.667+专*0.125\":\"文5专5\",\"文*0.667+专*2.5\":\"文5专5\",\"文*0.667+专*0.25\":\"文5专5\",\"文*0.5+专*0.5\":\"文5专5\",\"文*0.6+专*1\":\"文6专10\",\"文*0.076+专*0.3\":\"文6专4\",\"文*0.6+专*0.75\":\"文6专4\",\"文*0.8+专*1.333\":\"文6专4\",\"文*0.08+专*0.133\":\"文6专4\",\"文*0.6+专*0.4\":\"文6专4\",\"文*0.08+专*0.1\":\"文6专4\",\"文*0.8+专*1\":\"文6专4\",\"文*0.7+专*0.75\":\"文7专3\",\"文*0.093+专*0.1\":\"文7专3\",\"文*0.7+专*0.563\":\"文7专3\",\"文*0.933+专*0.75\":\"文7专3\",\"文*0.7+专*0.3\":\"文7专3\"}";
|
||||
JSONObject types = JSONObject.parseObject(json);
|
||||
List<YxSchoolMajor> list = yxSchoolMajorService.list(new LambdaQueryWrapper<YxSchoolMajor>().isNull(YxSchoolMajor::getRulesEnrollProbabilitySx));
|
||||
String rulesEnrollProbability = null;
|
||||
String type = null;
|
||||
Set<String> notTypes=new HashSet<>();
|
||||
List<YxSchoolMajor> updates=new ArrayList<>();
|
||||
for (YxSchoolMajor yxSchoolMajor : list) {
|
||||
rulesEnrollProbability = yxSchoolMajor.getRulesEnrollProbability();
|
||||
if (StringUtils.isNotBlank(rulesEnrollProbability)) {
|
||||
if (rulesEnrollProbability.contains("过") || rulesEnrollProbability.equals("文+专")) {
|
||||
continue;
|
||||
}
|
||||
type = types.getString(rulesEnrollProbability);
|
||||
if (type == null) {
|
||||
notTypes.add(rulesEnrollProbability);
|
||||
continue;
|
||||
}
|
||||
yxSchoolMajor.setRulesEnrollProbabilitySx(type);
|
||||
updates.add(yxSchoolMajor);
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(updates)) {
|
||||
yxSchoolMajorService.updateBatchById(updates);
|
||||
}
|
||||
for (String notType : notTypes) {
|
||||
System.out.println(notType);
|
||||
}
|
||||
}
|
||||
|
||||
if(false){
|
||||
LambdaQueryWrapper<YxArticle> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
//lambdaQueryWrapper.isNull(YxArticle::getSchoolId);
|
||||
lambdaQueryWrapper.eq(YxArticle::getSchoolId,"");
|
||||
List<YxArticle> list = yxArticleService.list(lambdaQueryWrapper);
|
||||
Map<String, YxSchool> stringYxSchoolMap = yxSchoolService.mapsForSchoolName();
|
||||
String title = null;
|
||||
String schoolName = null;
|
||||
String year = "";
|
||||
for (YxArticle yxArticle : list) {
|
||||
title = yxArticle.getTitle();
|
||||
schoolName = yxArticle.getSchoolName();
|
||||
if (title.contains("2022")) {
|
||||
year = "2022";
|
||||
}else if (title.contains("2023")) {
|
||||
year = "2023";
|
||||
}else if (title.contains("2024")) {
|
||||
year = "2024";
|
||||
}
|
||||
YxSchool yxSchool = stringYxSchoolMap.get(schoolName);
|
||||
if (yxSchool == null) {
|
||||
continue;
|
||||
}
|
||||
yxArticle.setType("1");
|
||||
yxArticle.setSchoolId(yxSchool.getId());
|
||||
}
|
||||
yxArticleService.updateBatchById(list);
|
||||
}
|
||||
|
||||
//分页
|
||||
Integer pageNum = queryArticleVO.getPageNum();
|
||||
Integer pageSize = queryArticleVO.getPageSize();
|
||||
|
|
@ -216,29 +75,28 @@ public class MiniArticleController {
|
|||
type = 0;
|
||||
}
|
||||
//先从redis中获取是否有该文章信息
|
||||
String key = "miniArticlePage_type" + type + "_pageNum_" + pageNum + "pageSize_" + pageSize;
|
||||
String key = "miniArticlePage_key_"+title+"_type_" + type + "_pageNum_" + pageNum + "pageSize_" + pageSize;
|
||||
String json = null;
|
||||
IPage<YxArticle> pageList = null;
|
||||
if (false) {
|
||||
redisUtil.hasKey(key);
|
||||
IPage pageList = null;
|
||||
if (redisUtil.hasKey(key) && StringUtils.isBlank(schoolId)) {
|
||||
//redis中存在
|
||||
json = (String) redisUtil.get(key);
|
||||
Gson gson = new Gson();
|
||||
pageList = gson.fromJson(json, new TypeToken<IPage<YxArticle>>() {
|
||||
}.getType());
|
||||
pageList = JSONObject.parseObject(json, Page.class);
|
||||
} else {
|
||||
//redis不存在，从数据库获取
|
||||
LambdaQueryWrapper<YxArticle> yxArticleLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
yxArticleLambdaQueryWrapper.eq(YxArticle::getType, type);
|
||||
yxArticleLambdaQueryWrapper.select(YxArticle::getTitle,YxArticle::getId,YxArticle::getType,YxArticle::getSchoolId,
|
||||
YxArticle::getReleaseTime,YxArticle::getCreateTime);
|
||||
if (StringUtils.isNotBlank(title)) {
|
||||
yxArticleLambdaQueryWrapper.like(YxArticle::getTitle, title);
|
||||
}
|
||||
yxArticleLambdaQueryWrapper.eq(StringUtils.isNotBlank(schoolId), YxArticle::getSchoolId, schoolId);
|
||||
yxArticleLambdaQueryWrapper.orderByDesc(YxArticle::getCreateTime, YxArticle::getUpdateTime);
|
||||
pageList = yxArticleService.page(new Page<>(pageNum, pageSize), yxArticleLambdaQueryWrapper);
|
||||
//json = JSONArray.toJSONString(pageList);
|
||||
json = JSONObject.toJSONString(pageList);
|
||||
//存到redis中
|
||||
//redisUtil.set(key, json, 3600);
|
||||
redisUtil.set(key, json, 360);
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
// 获取上传文件对象
|
||||
|
|
|
|||
Loading…
Reference in New Issue