diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java index ed7725e..59e9475 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/dto/RecommendMajorDTO.java @@ -92,6 +92,27 @@ public class RecommendMajorDTO implements Serializable { @ApiModelProperty(value = "学生的折合分数") private BigDecimal studentConvertedScore; + /** + * 文化分限制 + */ + @ApiModelProperty(value = "文化成绩限制") + private BigDecimal culturalScoreLimitation; + /** + * 专业分限制 + */ + @ApiModelProperty(value = "专业成绩限制") + private BigDecimal professionalScoreLimitation; + /** + * 语文分限制 + */ + @ApiModelProperty(value = "语文成绩限制") + private BigDecimal chineseScoreLimitation; + /** + * 外语成绩限制 + */ + @ApiModelProperty(value = "外语成绩限制") + private BigDecimal englishScoreLimitation; + @ApiModelProperty(value = "科类(文科/理科)") private java.lang.String category; @ApiModelProperty(value = "批次") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java index 210fc92..a80d897 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java @@ -68,7 +68,8 @@ public class MiniArticleController { @GetMapping(value = "/page") public Result articlePage(QueryArticleVO queryArticleVO) { if (false) { - String strs = "专业主科、器乐类只招、只招、不招、要求、语文成绩、英语成绩、高考文化课成绩、外语单科成绩、建议、只录取、无色盲、色弱者、体育、色弱、色盲、体检、体育专项统一测试成绩、身体无残疾、不予录取、男生身高、女生身高"; + //俄罗斯圣彼得堡国立列斯加夫特体育大学；4+0) + String strs = "在考生达到、省统考、高考文化成绩、专业主科、器乐类只招、只招、不招、要求、语文成绩、英语成绩、外语科目、高考文化课成绩、外语单科成绩、建议、只录取、无色盲、色弱者、体育专业、色弱、色盲、体检、体育专项统一测试成绩、身体无残疾、不予录取、男生身高、女生身高"; String[] tiquList = strs.split("、"); LambdaQueryWrapper yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); yxSchoolMajorLambdaQueryWrapper.isNull(YxSchoolMajor::getLimitation); @@ -79,6 +80,7 @@ public class MiniArticleController { String limitation = null; int i = 0; int i1 = 0; + List updateSchoolMajorList=new ArrayList<>(); for (YxSchoolMajor yxSchoolMajor : list) { detail = yxSchoolMajor.getDetail(); detail = detail.replace("；", ",").replace("，", ",").replace("。",","); @@ -100,9 +102,10 @@ public class MiniArticleController { limitation = limitation.substring(0,i1); } yxSchoolMajor.setLimitation(limitation); + updateSchoolMajorList.add(yxSchoolMajor); } } - yxSchoolMajorService.updateBatchById(list,100); + yxSchoolMajorService.updateBatchById(updateSchoolMajorList,100); return Result.OK(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java index 121f63b..67d409a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMajorController.java @@ -32,7 +32,9 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -214,6 +216,208 @@ public class YxSchoolMajorController extends JeecgController importExcel1Xz(HttpServletRequest request, HttpServletResponse response) { + // 获取上传文件对象 + File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\招录限制.xlsx"); + FileInputStream fileInputStream = null; + ImportParams params = new ImportParams(); + params.setTitleRows(0); + params.setNeedSave(true); + int index = 0; + String type = null; + try { + fileInputStream = new FileInputStream(file); + List list = ExcelImportUtil.importExcel(fileInputStream, SchoolMajorImport3.class, params); + List notlist = new ArrayList<>(); + String zspc = null;//招生批次 + String yxmc = null;//院校名称 + String yxdm = null;//院校代码 + String zymc = null; + String majorName = ""; + String majorCode = ""; + String zydm = null; + String jhs = null; + String xz = null; + String xf = null; + String zybz = null; + String whcj = null; + String ywcj = null; + String wycj = null; + String yycj = null; + Integer level = 1; + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List schoolMajorList = yxSchoolMajorService.list(queryWrapper); + Map schoolMajorMap=new LinkedHashMap<>(); + String key = null; + for (YxSchoolMajor yxSchoolMajor : schoolMajorList) { + key = yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getBatch()+"_"+yxSchoolMajor.getMajorName()+"_"+yxSchoolMajor.getEnrollmentCode()+"_"+yxSchoolMajor.getCategory()+"_"+yxSchoolMajor.getMajorType(); + schoolMajorMap.put(key,yxSchoolMajor); + } + Map schoolMajorMap1=new LinkedHashMap<>(); + for (YxSchoolMajor yxSchoolMajor : schoolMajorList) { + if (yxSchoolMajor.getSchoolCode().equals("9907")) { + key = yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getBatch()+"_"+yxSchoolMajor.getMajorName()+"_"+yxSchoolMajor.getEnrollmentCode()+"_"+yxSchoolMajor.getCategory()+"_"+yxSchoolMajor.getMajorType(); + schoolMajorMap1.put(key,yxSchoolMajor); + } + } + StringBuilder mainSubjects = new StringBuilder(); + YxSchoolMajor schoolMajor = null; + YxSchoolMajor schoolMajorUpdate = null; + List updateSchoolMajorList = new ArrayList<>(); + Map notSchoolCodeMap = new LinkedHashMap<>(); + for (SchoolMajorImport3 schoolMajorImport3 : list) { + schoolMajor =new YxSchoolMajor(); + index++; + if (index == 899) { + //index++; + System.out.println(index); + } + zspc = schoolMajorImport3.getZspc(); + yxmc = schoolMajorImport3.getYxmc(); + yxdm = schoolMajorImport3.getYxdm(); + zymc = schoolMajorImport3.getZymc(); + zydm = schoolMajorImport3.getZydm(); + jhs = schoolMajorImport3.getJhs(); + xz = schoolMajorImport3.getXz(); + xf = schoolMajorImport3.getXf(); + zybz = schoolMajorImport3.getZybz(); + whcj = schoolMajorImport3.getWhcj(); + ywcj = schoolMajorImport3.getYwcj(); + wycj = schoolMajorImport3.getWycj(); + yycj = schoolMajorImport3.getYycj(); + + if (zspc.contains("音乐类")) { + schoolMajor.setMajorType("音乐类"); + } + else if (zspc.contains("美术类")) { + schoolMajor.setMajorType("美术与设计类"); + } + else if (zspc.contains("舞蹈类")) { + schoolMajor.setMajorType("舞蹈类"); + if (zspc.contains("艺术舞蹈")) { + schoolMajor.setMainSubjects("艺术舞蹈"); + } else if (zspc.contains("国际标准")) { + schoolMajor.setMainSubjects("国际标准舞"); + } else { + notlist.add(schoolMajorImport3); + continue; + } + } + else if (zspc.contains("播音")) { + schoolMajor.setMajorType("播音与主持类"); + } + else if (zspc.contains("表演类")) { + schoolMajor.setMajorType("表演类"); + } + else if (zspc.contains("体育类")) { + schoolMajor.setMajorType("体育类"); + }else if (zspc.contains("书法类")) { + schoolMajor.setMajorType("书法类"); + }else{ + //美术 + schoolMajor.setMajorType("美术与设计类"); + //notlist.add(schoolMajorImport3); + //continue; + } + + //文理分科 + if(zspc.contains("文理综合")){ + //notlist.add(schoolMajorImport3); + continue; + } + else if(zspc.contains("文科")){ + schoolMajor.setCategory("文科"); + } + else if(zspc.contains("理科")){ + schoolMajor.setCategory("理科"); + } + else{ + notlist.add(schoolMajorImport3); + } + + //批次 + if (zspc.contains("提前批")) { + schoolMajor.setBatch("提前批"); + } + else if(zspc.contains("本科A段")){ + schoolMajor.setBatch("本科A段"); + } + else if(zspc.contains("本科B段")){ + schoolMajor.setBatch("本科B段"); + } + else if(zspc.contains("本科") && zspc.contains("体育")){ + schoolMajor.setBatch("本科"); + } + else if(zspc.contains("高职高专")){ + level = 2; + schoolMajor.setBatch("高职高专"); + } + else{ + notlist.add(schoolMajorImport3); + } + + zymc = zymc.replace("(","（").replace(")","）"); + majorName = zymc; + int i2 = zymc.indexOf("（"); + if (i2!=-1) { + majorName = zymc.substring(0,i2); + } + schoolMajor.setSchoolCode(yxdm); + schoolMajor.setMajorName(zymc); + schoolMajor.setMajorCode(majorCode); + schoolMajor.setEnrollmentCode(zydm); + schoolMajor.setPlanNum(StringUtils.isNotBlank(jhs)?Integer.valueOf(jhs):0);//计划数 + schoolMajor.setSemester(xz);//学制 + + if (zybz.contains("(专业组61)(中外合作办学)(中日合作)(30000元/年;办学地点延安路校区;合作方日本文化学园大学)")) { + System.out.printf("111"); + } + key = schoolMajor.getSchoolCode()+"_"+ schoolMajor.getBatch()+"_"+schoolMajor.getMajorName()+"_"+schoolMajor.getEnrollmentCode()+"_"+schoolMajor.getCategory()+"_"+schoolMajor.getMajorType(); + schoolMajorList.stream().filter(s->s.getSchoolCode().equals("9907")).collect(Collectors.toList()); + if (schoolMajorMap.containsKey(key)) { + schoolMajorUpdate = new YxSchoolMajor(); + BeanUtils.copyProperties(schoolMajorMap.get(key),schoolMajorUpdate); + if (StringUtils.isNotBlank(whcj)) { + schoolMajorUpdate.setCulturalScoreLimitation(new BigDecimal(whcj)); + } + if (StringUtils.isNotBlank(ywcj)) { + schoolMajorUpdate.setChineseScoreLimitation(new BigDecimal(ywcj)); + } + if (StringUtils.isNotBlank(wycj)) { + schoolMajorUpdate.setEnglishScoreLimitation(new BigDecimal(wycj)); + } + if (StringUtils.isNotBlank(yycj)) { + schoolMajorUpdate.setProfessionalScoreLimitation(new BigDecimal(yycj)); + } + if (StringUtils.isNotBlank(whcj)||StringUtils.isNotBlank(ywcj)||StringUtils.isNotBlank(wycj)||StringUtils.isNotBlank(yycj)) { + updateSchoolMajorList.add(schoolMajorUpdate); + } + }else{ + notlist.add(schoolMajorImport3); + } + } + JSONObject.toJSONString(notSchoolCodeMap); + System.out.println("不存在的专业信息:"); + System.out.println(notlist.size()); + yxSchoolMajorService.updateBatchById(updateSchoolMajorList); + //System.out.println(JSONArray.toJSONString(notlist)); + } catch (FileNotFoundException fileNotFoundException) { + log.error("文件不存在," + file.getAbsolutePath()); + throw new RuntimeException(fileNotFoundException); + } catch (StringIndexOutOfBoundsException e) { + } catch (Exception e) { + System.out.println(index); + throw new RuntimeException(e); + } + return Result.ok("文件导入成功!"); + } + + + /** * 刷新专业信息 */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxUserCalculationMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxUserCalculationMajorController.java new file mode 100644 index 0000000..cd947ac --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxUserCalculationMajorController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.yx.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.yx.entity.YxUserCalculationMajor; +import org.jeecg.modules.yx.service.IYxUserCalculationMajorService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 计算用户专业分数关联表 + * @Author: jeecg-boot + * @Date: 2024-03-10 + * @Version: V1.0 + */ +@Api(tags="计算用户专业分数关联表") +@RestController +@RequestMapping("/yx/yxUserCalculationMajor") +@Slf4j +public class YxUserCalculationMajorController extends JeecgController { + @Autowired + private IYxUserCalculationMajorService yxUserCalculationMajorService; + + /** + * 分页列表查询 + * + * @param yxUserCalculationMajor + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "计算用户专业分数关联表-分页列表查询") + @ApiOperation(value="计算用户专业分数关联表-分页列表查询", notes="计算用户专业分数关联表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxUserCalculationMajor yxUserCalculationMajor, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxUserCalculationMajor, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxUserCalculationMajorService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxUserCalculationMajor + * @return + */ + @AutoLog(value = "计算用户专业分数关联表-添加") + @ApiOperation(value="计算用户专业分数关联表-添加", notes="计算用户专业分数关联表-添加") + @RequiresPermissions("yx:yx_user_calculation_major:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxUserCalculationMajor yxUserCalculationMajor) { + yxUserCalculationMajorService.save(yxUserCalculationMajor); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxUserCalculationMajor + * @return + */ + @AutoLog(value = "计算用户专业分数关联表-编辑") + @ApiOperation(value="计算用户专业分数关联表-编辑", notes="计算用户专业分数关联表-编辑") + @RequiresPermissions("yx:yx_user_calculation_major:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody YxUserCalculationMajor yxUserCalculationMajor) { + yxUserCalculationMajorService.updateById(yxUserCalculationMajor); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "计算用户专业分数关联表-通过id删除") + @ApiOperation(value="计算用户专业分数关联表-通过id删除", notes="计算用户专业分数关联表-通过id删除") + @RequiresPermissions("yx:yx_user_calculation_major:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + yxUserCalculationMajorService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "计算用户专业分数关联表-批量删除") + @ApiOperation(value="计算用户专业分数关联表-批量删除", notes="计算用户专业分数关联表-批量删除") + @RequiresPermissions("yx:yx_user_calculation_major:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.yxUserCalculationMajorService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "计算用户专业分数关联表-通过id查询") + @ApiOperation(value="计算用户专业分数关联表-通过id查询", notes="计算用户专业分数关联表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + YxUserCalculationMajor yxUserCalculationMajor = yxUserCalculationMajorService.getById(id); + if(yxUserCalculationMajor==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxUserCalculationMajor); + } + + /** + * 导出excel + * + * @param request + * @param yxUserCalculationMajor + */ + @RequiresPermissions("yx:yx_user_calculation_major:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YxUserCalculationMajor yxUserCalculationMajor) { + return super.exportXls(request, yxUserCalculationMajor, YxUserCalculationMajor.class, "计算用户专业分数关联表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("yx:yx_user_calculation_major:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, YxUserCalculationMajor.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorImport3.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorImport3.java index e2c556b..ad59ebe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorImport3.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorImport3.java @@ -30,5 +30,12 @@ public class SchoolMajorImport3 implements Serializable { private String xf; @Excel(name = "专业备注", width = 15) private String zybz; - + @Excel(name = "文化分数", width = 15) + private String whcj; + @Excel(name = "语文", width = 15) + private String ywcj; + @Excel(name = "外语", width = 15) + private String wycj; + @Excel(name = "专业成绩", width = 15) + private String yycj; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java index 1c89b2d..04be61d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java @@ -129,4 +129,28 @@ public class YxSchoolMajor implements Serializable { */ @ApiModelProperty(value = "院校限制") private String limitation; + + /** + * 文化分限制 + */ + @ApiModelProperty(value = "文化成绩限制") + private BigDecimal culturalScoreLimitation; + + /** + * 专业分限制 + */ + @ApiModelProperty(value = "专业成绩限制") + private BigDecimal professionalScoreLimitation; + + /** + * 语文分限制 + */ + @ApiModelProperty(value = "语文成绩限制") + private BigDecimal chineseScoreLimitation; + + /** + * 外语成绩限制 + */ + @ApiModelProperty(value = "外语成绩限制") + private BigDecimal englishScoreLimitation; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserCalculationMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserCalculationMajor.java new file mode 100644 index 0000000..f766303 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserCalculationMajor.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.yx.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 计算用户专业分数关联表 + * @Author: jeecg-boot + * @Date: 2024-03-10 + * @Version: V1.0 + */ +@Data +@TableName("yx_user_calculation_major") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="yx_user_calculation_major对象", description="计算用户专业分数关联表") +public class YxUserCalculationMajor implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**年份*/ + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private java.lang.String year; + /**成绩单id*/ + @Excel(name = "成绩单id", width = 15) + @ApiModelProperty(value = "成绩单id") + private java.lang.String scoreId; + /**学校代码*/ + @Excel(name = "学校代码", width = 15) + @ApiModelProperty(value = "学校代码") + private java.lang.String schoolCode; + /**专业代码*/ + @Excel(name = "专业代码", width = 15) + @ApiModelProperty(value = "专业代码") + private java.lang.String majorCode; + /**专业名称*/ + @Excel(name = "专业名称", width = 15) + @ApiModelProperty(value = "专业名称") + private java.lang.String majorName; + /**招生代码*/ + @Excel(name = "招生代码", width = 15) + @ApiModelProperty(value = "招生代码") + private java.lang.String enrollmentCode; + /**学费*/ + @Excel(name = "学费", width = 15) + @ApiModelProperty(value = "学费") + private java.math.BigDecimal tuition; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private java.lang.String detail; + /**科类(文科/理科)*/ + @Excel(name = "科类(文科/理科)", width = 15) + @ApiModelProperty(value = "科类(文科/理科)") + private java.lang.String category; + /**录取方式*/ + @Excel(name = "录取方式", width = 15) + @ApiModelProperty(value = "录取方式") + private java.lang.String rulesEnrollProbability; + /**批次*/ + @Excel(name = "批次", width = 15) + @ApiModelProperty(value = "批次") + private java.lang.String batch; + /**学生的折合分数*/ + @Excel(name = "学生的折合分数", width = 15) + @ApiModelProperty(value = "学生的折合分数") + private java.math.BigDecimal studentConvertedScore; + /**录取率*/ + @Excel(name = "录取率", width = 15) + @ApiModelProperty(value = "录取率") + private java.math.BigDecimal enrollRobability; + /**录取概率计算规则运算符*/ + @Excel(name = "录取概率计算规则运算符", width = 15) + @ApiModelProperty(value = "录取概率计算规则运算符") + private java.lang.String probabilityOperator; + /**文化分省控线*/ + @Excel(name = "文化分省控线", width = 15) + @ApiModelProperty(value = "文化分省控线") + private java.math.BigDecimal culturalControlLine; + /**专项分数线*/ + @Excel(name = "专项分数线", width = 15) + @ApiModelProperty(value = "专项分数线") + private java.math.BigDecimal specialControlLine; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**专业类型*/ + @Excel(name = "专业类型", width = 15) + @ApiModelProperty(value = "专业类型") + private java.lang.String majorType; + /**二级专业类型*/ + @Excel(name = "二级专业类型", width = 15) + @ApiModelProperty(value = "二级专业类型") + private java.lang.String majorTypeChild; + /**计划招生人数*/ + @Excel(name = "计划招生人数", width = 15) + @ApiModelProperty(value = "计划招生人数") + private java.lang.Integer planNum; + /**是否使用主项成绩*/ + @Excel(name = "是否使用主项成绩", width = 15) + @ApiModelProperty(value = "是否使用主项成绩") + private java.lang.String checkMaster; + /**主考科目*/ + @Excel(name = "主考科目", width = 15) + @ApiModelProperty(value = "主考科目") + private java.lang.String mainSubjects; + /**学制*/ + @Excel(name = "学制", width = 15) + @ApiModelProperty(value = "学制") + private java.lang.String semester; + /**院校限制*/ + @Excel(name = "院校限制", width = 15) + @ApiModelProperty(value = "院校限制") + private java.lang.String limitation; + /**其他分数限制*/ + @Excel(name = "其他分数限制", width = 15) + @ApiModelProperty(value = "其他分数限制") + private java.lang.String otherScoreLimitation; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxUserCalculationMajorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxUserCalculationMajorMapper.java new file mode 100644 index 0000000..86256bc --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxUserCalculationMajorMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.yx.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.yx.entity.YxUserCalculationMajor; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 计算用户专业分数关联表 + * @Author: jeecg-boot + * @Date: 2024-03-10 + * @Version: V1.0 + */ +public interface YxUserCalculationMajorMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index 6ed5b2d..cabd9f7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml @@ -25,7 +25,10 @@ sm.batch as batch, sm.enrollment_code as enrollmentCode, sm.category as category, - + sm.professional_score_limitation, + sm.english_score_limitation, + sm.chinese_score_limitation, + sm.cultural_score_limitation, sm.rules_enroll_probability as rulesEnrollProbability, sm.probability_operator as probabilityOperator, sm.cultural_control_line as culturalControlLine, diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxUserCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxUserCalculationMajorMapper.xml new file mode 100644 index 0000000..1dbd9f0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxUserCalculationMajorMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxUserCalculationMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxUserCalculationMajorService.java new file mode 100644 index 0000000..ae71545 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxUserCalculationMajorService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.yx.service; + +import org.jeecg.modules.yx.entity.YxUserCalculationMajor; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 计算用户专业分数关联表 + * @Author: jeecg-boot + * @Date: 2024-03-10 + * @Version: V1.0 + */ +public interface IYxUserCalculationMajorService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java index f443f58..82093b1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java @@ -150,6 +150,11 @@ public class BiaoyanService { continue; } + //判断其他录取要求 + if(!ScoreUtil.otherScoreJudge(professionalScore,activeCurrentUserScore,recommendMajorDTO)){ + recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); + continue; + } //分数是否过省控线 if(!ScoreUtil.crossingControlLine(rulesEnrollProbability,culturalScore,professionalScore,culturalControlLine,specialControlLine)){ recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); @@ -291,15 +296,15 @@ public class BiaoyanService { } if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文")) && professionalProbabilityOperator != null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { - artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); + //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); } else if (("专过文排".equals(rulesEnrollProbability) || !probabilityOperator.contains("专")) && culturalProbabilityOperator != null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { //测文化 体育类的 专过文排 ，分数转（最低录取线/文化分录取方式(0.133)） continue; } else { //2.再用最低录取分数减去转换后的分数 - a1 = artTestCulturalDTO.getScore().subtract(professionalScore3); + a1 = professionalScore3.multiply(professionalProbabilityOperator); //当前输入分数乘以专业折合分 - a2 = a1.multiply(professionalProbabilityOperator); + a2 = artTestCulturalDTO.getScore().subtract(a1); //3.再用这个数值除以文化分的公式 //余数/文化课计算方式 divide = a2.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java index cb3ffbe..fe96d89 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java @@ -101,6 +101,12 @@ public class BoYinService { recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); continue; } + + //判断其他录取要求 + if(!ScoreUtil.otherScoreJudge(professionalScore,activeCurrentUserScore,recommendMajorDTO)){ + recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); + continue; + } //分数是否过省控线 if(!ScoreUtil.crossingControlLine(rulesEnrollProbability,culturalScore,by,culturalControlLine,specialControlLine)){ recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); @@ -201,18 +207,18 @@ public class BoYinService { } } - if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文") ||probabilityOperator.contains("专*")) && professionalProbabilityOperator!=null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { + if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文")) && professionalProbabilityOperator!=null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { //播音，表演，音乐，舞蹈，先把当前专业分转换成去年分数，再用最低录取分数减去转换后的分数 （文过专排） - artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(by)); - }else if (("专过文排".equals(rulesEnrollProbability)||!probabilityOperator.contains("专") || probabilityOperator.contains("文*")) && culturalProbabilityOperator!=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { + //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(by)); + }else if (("专过文排".equals(rulesEnrollProbability)||!probabilityOperator.contains("专")) && culturalProbabilityOperator!=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { continue; //测文化 体育类的 专过文排 ，分数转（最低录取线/文化分录取方式(0.133)） //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().divide(culturalProbabilityOperator,0,RoundingMode.HALF_UP)); }else{ //2.再用最低录取分数减去转换后的分数 - a1 = artTestCulturalDTO.getScore().subtract(by); + a1 = by.multiply(professionalProbabilityOperator); //当前输入分数乘以专业折合分 - a2 = a1.multiply(professionalProbabilityOperator); + a2 = artTestCulturalDTO.getScore().subtract(a1); //3.再用这个数值除以文化分的公式 //余数/文化课计算方式 divide = a2.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java index 1f4a48a..3216b7b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java @@ -161,6 +161,11 @@ public class MusicService { } } } + //判断其他录取要求 + if(!ScoreUtil.otherScoreJudge(professionalScore,activeCurrentUserScore,recommendMajorDTO)){ + recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); + continue; + } //分数是否过省控线 if (!ScoreUtil.crossingControlLine(rulesEnrollProbability, culturalScore, professionalScore, culturalControlLine, specialControlLine)) { recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); @@ -181,11 +186,12 @@ public class MusicService { } YxHistoryMajorEnroll yxHistoryMajorEnroll = historyMajorEnrollList.get(0); BigDecimal admissionLine = yxHistoryMajorEnroll.getAdmissionLine(); - enrollProbability = studentScore.multiply(admissionLine).multiply(YxConstant.bigDecimal075); - if (studentScore.compareTo(admissionLine) < 0) { + enrollProbability = studentScore.divide(admissionLine,4,RoundingMode.HALF_UP); + /*if (studentScore.compareTo(admissionLine) < 0) { //如果当前主项成绩<近一年的录取分数，录取概率*0.5 enrollProbability = enrollProbability.multiply(YxConstant.bigDecimal05); - } + }*/ + enrollProbability = enrollProbability.multiply(YxConstant.bigDecimal100); recommendMajorDTO.setEnrollProbability(enrollProbability); recommendMajorDTO.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(rulesEnrollProbability)); recommendMajorDTO.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(probabilityOperator)); @@ -303,7 +309,9 @@ public class MusicService { majorTypeChild = artTestCulturalDTO.getMajorTypeChild(); mainSubjects = artTestCulturalDTO.getMainSubjects(); if (!"高职高专".equals(activeCurrentUserScore.getBatch())) { - if ("音乐表演".equals(majorTypeChild)) { + if("文过专排主科".equals(rulesEnrollProbability)){ + professionalScore3 = professionalScore.multiply(YxConstant.bigDecimal05); + }else if ("音乐表演".equals(majorTypeChild)) { if (mainSubjects.contains("器乐") && activeCurrentUserScore.getProfessionalCategoryChildren().contains("器乐")) { professionalScore3 = yybyqy; } else { @@ -315,19 +323,19 @@ public class MusicService { } } if(("文过专排主科".equals(artTestCulturalDTO.getRulesEnrollProbability())||"1".equals(artTestCulturalDTO.getCheckMaster()))){ - artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(zxcj)); - }else if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文") || probabilityOperator.contains("专*")) && professionalProbabilityOperator != null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { + //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); + }else if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文")) && professionalProbabilityOperator != null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { //播音，表演，音乐，舞蹈，先把当前专业分转换成去年分数，再用最低录取分数减去转换后的分数 （文过专排） - artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); - } else if (("专过文排".equals(rulesEnrollProbability) || !probabilityOperator.contains("专") || probabilityOperator.contains("文*")) && culturalProbabilityOperator != null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { + //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); + } else if (("专过文排".equals(rulesEnrollProbability) || !probabilityOperator.contains("专")) && culturalProbabilityOperator != null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { continue; //测文化 体育类的 专过文排 ，分数转（最低录取线/文化分录取方式(0.133)） //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().divide(culturalProbabilityOperator,0,RoundingMode.HALF_UP)); } else { //2.再用最低录取分数减去转换后的分数 - a1 = artTestCulturalDTO.getScore().subtract(professionalScore3); + a1 = professionalScore3.multiply(professionalProbabilityOperator); //当前输入分数乘以专业折合分 - a2 = a1.multiply(professionalProbabilityOperator); + a2 = artTestCulturalDTO.getScore().subtract(a1); //3.再用这个数值除以文化分的公式 //余数/文化课计算方式 divide = a2.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java index d0c1b24..3daf95c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/TiyuService.java @@ -44,10 +44,10 @@ public class TiyuService { } } - if (("文过专排".equals(rulesEnrollProbability) || probabilityOperator.contains("专*")) && professionalProbabilityOperator!=null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { + if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文")) && professionalProbabilityOperator!=null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { //测文化 体育类的 文过专排 ，分数转换成150分（最低录取线/0.667） artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().divide(professionalProbabilityOperator,0,RoundingMode.HALF_UP)); - }else if (("专过文排".equals(rulesEnrollProbability) || probabilityOperator.contains("文*")) && culturalProbabilityOperator!=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { + }else if (("专过文排".equals(rulesEnrollProbability) || !probabilityOperator.contains("专")) && culturalProbabilityOperator!=null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0)>0) { //测文化 体育类的 专过文排 ，分数转（最低录取线/文化分录取方式(0.133)） artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().divide(culturalProbabilityOperator,0,RoundingMode.HALF_UP)); }else{ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java index bfa8bf8..bca8769 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java @@ -121,7 +121,11 @@ public class WuDaoService { log.error("当前专业有问题，不清楚主考科目:" + JSONObject.toJSONString(recommendMajorDTO)); continue; } - + //判断其他录取要求 + if(!ScoreUtil.otherScoreJudge(professionalScore,activeCurrentUserScore,recommendMajorDTO)){ + recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); + continue; + } //分数是否过省控线 if (!ScoreUtil.crossingControlLine(rulesEnrollProbability, culturalScore, professionalScore, culturalControlLine, specialControlLine)) { recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); @@ -242,15 +246,14 @@ public class WuDaoService { } if (("文过专排".equals(rulesEnrollProbability) || !probabilityOperator.contains("文")) && professionalProbabilityOperator != null && professionalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { - artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); + //artTestCulturalDTO.setNeedScore(artTestCulturalDTO.getScore().subtract(professionalScore3)); } else if (("专过文排".equals(rulesEnrollProbability) || !probabilityOperator.contains("专")) && culturalProbabilityOperator != null && culturalProbabilityOperator.compareTo(YxConstant.bigDecimal0) > 0) { //测文化 体育类的 专过文排 ，分数转（最低录取线/文化分录取方式(0.133)） continue; } else { - //2.再用最低录取分数减去转换后的分数 - a1 = artTestCulturalDTO.getScore().subtract(professionalScore3); + a1 = professionalScore3.multiply(professionalProbabilityOperator); //当前输入分数乘以专业折合分 - a2 = a1.multiply(professionalProbabilityOperator); + a2 = artTestCulturalDTO.getScore().subtract(a1); //3.再用这个数值除以文化分的公式 //余数/文化课计算方式 divide = a2.divide(culturalProbabilityOperator, 0, RoundingMode.HALF_UP); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java index 5904f4a..0ee8ca7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolMajorServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.yx.service.impl; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,6 +13,7 @@ import org.checkerframework.checker.units.qual.A; import org.jeecg.common.api.vo.Result; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.util.DateUtils; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.art.dto.RecommendMajorDTO; import org.jeecg.modules.art.vo.QueryRecommendMajorVO; @@ -27,6 +29,7 @@ import org.jeecg.modules.yx.service.*; import org.jeecg.modules.yx.util.ScoreUtil; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -68,6 +71,8 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet()); - List schoolList = yxSchoolMapper.selectBatchIds(schoolIdSet); + //从redis中看看有没有这些院校 + String schoolKey = "schoollistm"; + String schoolJson = null; + List schoolList = null; + JSONObject yxSchoolMap = new JSONObject(); + /*Set schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet()); + List schoolList = yxSchoolMapper.selectBatchIds(schoolIdSet);*/ + if (redisUtil.hasKey(schoolKey)) { + schoolJson =(String) redisUtil.get(schoolKey); + yxSchoolMap = JSONObject.parseObject(schoolJson); + }else{ + LambdaQueryWrapper yxSchoolLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxSchoolLambdaQueryWrapper.select(YxSchool::getId,YxSchool::getSchoolType,YxSchool::getSchoolNature,YxSchool::getInstitutionType,YxSchool::getIs211,YxSchool::getIs985,YxSchool::getSfsyl,YxSchool::getGzsz); + schoolList = yxSchoolMapper.selectList(yxSchoolLambdaQueryWrapper); + for (YxSchool yxSchool : schoolList) { + yxSchoolMap.put(yxSchool.getId(),yxSchool); + } + if (yxSchoolMap!=null) { + schoolJson = yxSchoolMap.toJSONString(); + redisUtil.set("schoollistm",schoolJson); + } + } + if (CollectionUtils.isNotEmpty(schoolList)) { - Map yxSchoolMap = schoolList.stream().collect(Collectors.toMap(YxSchool::getId, s -> s)); YxSchool school = null; Set tagsList; for (RecommendMajorDTO recommendMajorDTO : recommendMajorList) { - school = yxSchoolMap.get(recommendMajorDTO.getSchoolId()); + school = yxSchoolMap.getObject(recommendMajorDTO.getSchoolId(),YxSchool.class); if (school == null) { continue; } @@ -388,6 +413,7 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl recommendMajorList, YxUserScore activeCurrentUserScore) { try { + long startTime = new Date().getTime(); //专业类别 String professionalCategory = activeCurrentUserScore.getProfessionalCategory(); String cognitioPolyclinic = activeCurrentUserScore.getCognitioPolyclinic(); @@ -441,6 +467,11 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl implements IYxUserCalculationMajorService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java index 0f0caff..2828d21 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.jeecg.modules.art.dto.RecommendMajorDTO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.ScoreBatchDTO; import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll; @@ -459,4 +460,33 @@ public class ScoreUtil { } return null; } + + /** + * 其他录取要求 + * @param professionalScore + * @param activeCurrentUserScore + * @param recommendMajorDTO + * @return + */ + public static boolean otherScoreJudge(BigDecimal professionalScore, YxUserScore activeCurrentUserScore, RecommendMajorDTO recommendMajorDTO) { + if (recommendMajorDTO!=null) { + //语文成绩判断 + if (recommendMajorDTO.getChineseScoreLimitation()!=null && activeCurrentUserScore.getChineseScore().compareTo(recommendMajorDTO.getChineseScoreLimitation())<0) { + return false; + } + //外语成绩判断 + if (recommendMajorDTO.getEnglishScoreLimitation()!=null && activeCurrentUserScore.getEnglishScore().compareTo(recommendMajorDTO.getEnglishScoreLimitation())<0) { + return false; + } + //文化成绩判断 + if (recommendMajorDTO.getCulturalScoreLimitation()!=null && activeCurrentUserScore.getCulturalScore().compareTo(recommendMajorDTO.getCulturalScoreLimitation())<0) { + return false; + } + //统考成绩判断 + if (recommendMajorDTO.getProfessionalScoreLimitation()!=null && activeCurrentUserScore.getProfessionalScore().compareTo(recommendMajorDTO.getProfessionalScoreLimitation())<0) { + return false; + } + } + return true; + } }