From dfe96567ea22370bb0b04fae41ad6d01e196b69a Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Thu, 7 Mar 2024 15:53:43 +0800 Subject: [PATCH] updates2 --- .../ArtRecommendMajorController.java | 62 ++++ .../controller/ArtVolunteerController.java | 108 +++++- .../modules/art/vo/QueryRecommendMajorVO.java | 6 - .../jeecg/modules/art/vo/SaveVolunteerVO.java | 4 + .../controller/MiniArticleController.java | 308 ++++++++++++++++ .../modules/mini/dto/MiniArticleDTO.java | 66 ++++ .../jeecg/modules/mini/dto/MiniBaseDTO.java | 21 ++ .../jeecg/modules/mini/dto/MiniSchoolDTO.java | 4 + .../mini/service/MiniArticleService.java | 46 +++ .../modules/mini/vo/ImportArticleVO.java | 51 +++ .../jeecg/modules/mini/vo/QueryArticleVO.java | 24 ++ .../jeecg/modules/yx/constant/YxConstant.java | 13 + .../YxArticleContentController.java | 178 +++++++++ .../yx/controller/YxArticleController.java | 178 +++++++++ .../yx/controller/YxArwuController.java | 341 +++++++++--------- .../YxHistoryScoreControlLineController.java | 63 +++- .../controller/YxSchoolMajorController.java | 3 +- .../YxSchoolMasterDegreeController.java | 295 ++++++++------- .../yx/controller/YxScoreController.java | 185 ++++++---- .../modules/yx/dto/LiNianShuJuZhuan2DTO.java | 85 +++++ .../modules/yx/dto/VolunteerRecordDTO.java | 3 + .../jeecg/modules/yx/entity/YxArticle.java | 91 +++++ .../modules/yx/entity/YxArticleContent.java | 51 +++ .../org/jeecg/modules/yx/entity/YxArwu.java | 12 +- .../yx/entity/YxSchoolMasterDegree.java | 8 +- .../modules/yx/entity/YxScoreSegment.java | 8 + .../jeecg/modules/yx/entity/YxUserScore.java | 2 +- .../modules/yx/entity/YxVolunteerRecord.java | 5 + .../yx/mapper/YxArticleContentMapper.java | 17 + .../modules/yx/mapper/YxArticleMapper.java | 17 + .../jeecg/modules/yx/mapper/YxArwuMapper.java | 2 +- .../yx/mapper/xml/YxArticleContentMapper.xml | 5 + .../modules/yx/mapper/xml/YxArticleMapper.xml | 5 + .../yx/mapper/xml/YxSchoolMajorMapper.xml | 5 +- .../modules/yx/mapper/xml/YxSchoolMapper.xml | 8 +- .../yx/mapper/xml/YxVolunteerRecordMapper.xml | 6 +- .../yx/service/IYxArticleContentService.java | 14 + .../modules/yx/service/IYxArticleService.java | 13 + .../modules/yx/service/IYxArwuService.java | 7 +- .../yx/service/IYxSchoolMajorService.java | 2 + .../yx/service/IYxVolunteerService.java | 2 +- .../yx/service/impl/BiaoyanService.java | 20 +- .../modules/yx/service/impl/BoYinService.java | 29 +- .../modules/yx/service/impl/MusicService.java | 29 +- .../modules/yx/service/impl/WuDaoService.java | 20 +- .../impl/YxArticleContentServiceImpl.java | 19 + .../yx/service/impl/YxArticleServiceImpl.java | 20 + .../yx/service/impl/YxArwuServiceImpl.java | 12 +- .../yx/service/impl/YxMajorServiceImpl.java | 87 +++-- .../impl/YxSchoolMajorServiceImpl.java | 104 +++++- .../yx/service/impl/YxSchoolServiceImpl.java | 13 +- .../impl/YxScoreSegmentServiceImpl.java | 4 +- .../service/impl/YxUserScoreServiceImpl.java | 44 ++- .../service/impl/YxVolunteerServiceImpl.java | 84 +++-- .../modules/yx/service/impl/ZhuanService.java | 20 +- .../org/jeecg/modules/yx/util/ScoreUtil.java | 277 ++++++++------ .../src/main/resources/application-dev.yml | 8 +- 57 files changed, 2420 insertions(+), 694 deletions(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniArticleDTO.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniBaseDTO.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniArticleService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/ImportArticleVO.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/QueryArticleVO.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleContentController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/LiNianShuJuZhuan2DTO.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticle.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticleContent.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleContentMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleContentMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxArticleContentService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxArticleService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxArticleContentServiceImpl.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxArticleServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java index c409234..10e1d40 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtRecommendMajorController.java @@ -1,5 +1,7 @@ package org.jeecg.modules.art.controller; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; @@ -8,6 +10,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.AssertUtils; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.art.dto.ArtCalculateInvestmentDTO; import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; import org.jeecg.modules.art.dto.ArtTestCulturalDTO; @@ -44,6 +47,39 @@ public class ArtRecommendMajorController { IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; @Resource IYxHistoryScoreControlLineService yxHistoryScoreControlLineService; + @Resource + private RedisUtil redisUtil; + + @ApiOperation(value = "获取可报专业总数") + @GetMapping("/rulesEnrollrobabilityMenuList") + public Result rulesEnrollrobabilityMenuList(QueryRecommendMajorVO queryRecommendMajorVO){ + String key = "rulesEnrollrobabilityMenuList_professionalCategory_"+queryRecommendMajorVO.getProfessionalCategory(); + String json = null; + List dataList =new ArrayList<>(); + Map data=null; + if (redisUtil.hasKey(key)) { + json = (String)redisUtil.get(key); + dataList = JSONArray.parseArray(json,Map.class); + }else{ + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.select(YxSchoolMajor::getRulesEnrollProbability); + lambdaQueryWrapper.eq(YxSchoolMajor::getMajorType,queryRecommendMajorVO.getProfessionalCategory()); + lambdaQueryWrapper.last("order by field(rules_enroll_probability,'','文过专排','专过文排')"); + lambdaQueryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); + lambdaQueryWrapper.groupBy(YxSchoolMajor::getRulesEnrollProbability); + List yxSchoolMajorList = yxSchoolMajorService.list(lambdaQueryWrapper); + for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { + data = new LinkedHashMap<>(); + data.put("label",yxSchoolMajor.getRulesEnrollProbability()); + data.put("value",yxSchoolMajor.getRulesEnrollProbability()); + dataList.add(data); + } + json = JSONObject.toJSONString(dataList); + redisUtil.set(key,json,3600); + } + + return Result.OK(dataList); + } @ApiOperation(value = "获取可报专业总数") @GetMapping("/recommendMajorCount") @@ -84,6 +120,29 @@ public class ArtRecommendMajorController { @ApiOperation(value = "投档分测算") @GetMapping("/calculateInvestment") public Result calculateInvestment(QueryCalculateInvestmentVO queryCalculateInvestmentVO) { + /*List list = yxHistoryMajorEnrollService.list(new LambdaQueryWrapper().eq(YxHistoryMajorEnroll::getYear,"2020")); + Map maps1=new LinkedHashMap<>(); + String key = null; + for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) { + key = yxHistoryMajorEnroll.getMajorType()+"_"+yxHistoryMajorEnroll.getCategory()+"_"+yxHistoryMajorEnroll.getSchoolCode()+"_"+yxHistoryMajorEnroll.getMajorName()+"_"+yxHistoryMajorEnroll.getBatch(); + maps1.put(key,yxHistoryMajorEnroll); + }*/ + //List yxSchoolMajorList = yxSchoolMajorService.list(new LambdaQueryWrapper().isNotNull(YxSchoolMajor::getRulesEnrollProbability).like(YxSchoolMajor::getRulesEnrollProbability,"专").notLike(YxSchoolMajor::getRulesEnrollProbability,"+")); + /*YxHistoryMajorEnroll yxHistoryMajorEnroll = null; + for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { + *//*key = yxSchoolMajor.getMajorType()+"_"+yxSchoolMajor.getCategory()+"_"+yxSchoolMajor.getSchoolCode()+"_"+yxSchoolMajor.getMajorName()+"_"+yxSchoolMajor.getBatch(); + yxHistoryMajorEnroll = maps1.get(key);*//* + *//*if (yxHistoryMajorEnroll!=null) { + yxSchoolMajor.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(yxHistoryMajorEnroll.getRulesEnrollProbability())); + yxSchoolMajor.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(yxHistoryMajorEnroll.getProbabilityOperator())); + }*//* + String rulesEnrollProbability = yxSchoolMajor.getRulesEnrollProbability(); + *//*yxSchoolMajor.setRulesEnrollProbability(ScoreUtil.replaceLastZeroChar(yxSchoolMajor.getRulesEnrollProbability())); + yxSchoolMajor.setProbabilityOperator(ScoreUtil.replaceLastZeroChar(yxSchoolMajor.getProbabilityOperator()));*//* + }*/ + //yxSchoolMajorService.updateBatchById(yxSchoolMajorList); + + //获取 院校专业信息列表,录取方式notnull LambdaQueryWrapper yxSchoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>(); yxSchoolMajorLambdaQueryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); @@ -122,6 +181,9 @@ public class ArtRecommendMajorController { artCalculateInvestmentDTO.setSchoolNum(maps.get(rulesEnrollProbability).size()); artCalculateInvestmentDTO.setRulesEnrollProbability(rulesEnrollProbability); artCalculateInvestmentDTO.setProbabilityOperator(yxSchoolMajor.getProbabilityOperator()); + if (rulesEnrollProbability.contains("文*0.133+专*0")) { + System.out.println("111"); + } artCalculateInvestmentDTO.setScore(ScoreUtil.convertIntoScore(rulesEnrollProbability, culturalScore, professionalScore, null, yxSchoolMajor.getProbabilityOperator())); calculateInvestmentDTOList.add(artCalculateInvestmentDTO); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java index fef978f..f1035e7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/controller/ArtVolunteerController.java @@ -106,17 +106,6 @@ public class ArtVolunteerController { volunteerDTO = yxVolunteerService.getActiveByCreate(sysUser.getId()); } - //if (this.scoreInfo.professionalCategory === '音乐类') { - // let categorychildrenList = [] - // let professionalCategoryChildren = this.scoreInfo.professionalCategoryChildren - // if (professionalCategoryChildren.includes('音乐表演声乐')) { - // categorychildrenList.push({childName:'音乐表演声乐',score: this.scoreInfo.yybysy}) - // }else if (professionalCategoryChildren.includes('音乐表演器乐')) { - // categorychildrenList.push({childName:'音乐表演声乐',score: this.scoreInfo.yybysy}) - // }else if (professionalCategoryChildren.includes('音乐教育')) { - // categorychildrenList.push({childName:'音乐表演声乐',score: this.scoreInfo.yybysy}) - // } - // } return Result.OK(volunteerDTO); } @@ -156,10 +145,10 @@ public class ArtVolunteerController { */ @ApiOperation(value = "新建志愿", notes = "新建志愿") @PostMapping(value = "/addNew") - public Result addNew() { + public Result addNew(@RequestBody YxVolunteer yxVolunteer) { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); AssertUtils.notNull(sysUser, "请先登录!"); - return Result.OK(yxVolunteerService.addNew()); + return Result.OK(yxVolunteerService.addNew(yxVolunteer)); } @ApiOperation(value = "删除志愿明细") @@ -233,6 +222,99 @@ public class ArtVolunteerController { return Result.OK("删除成功!"); } + /** + * 移动志愿序号 + */ + @ApiOperation(value = "移动志愿序号", notes = "移动志愿序号") + @PostMapping(value = "/moveIndexs") + public Result moveIndexs(@RequestBody SaveVolunteerVO saveVolunteerVO) { + String batch = saveVolunteerVO.getBatch(); + String volunteerId = saveVolunteerVO.getVolunteerId(); + Integer indexs = saveVolunteerVO.getIndexs(); + String id = saveVolunteerVO.getId(); + //当前选择的志愿 + YxVolunteerRecord nowRecord = yxVolunteerRecordService.getById(id); + + //获取移动志愿志愿 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxVolunteerRecord::getVolunteerId,volunteerId); + lambdaQueryWrapper.eq(YxVolunteerRecord::getIndexs,indexs); + lambdaQueryWrapper.eq(YxVolunteerRecord::getBatch,batch); + YxVolunteerRecord recordServiceOne = yxVolunteerRecordService.getOne(lambdaQueryWrapper); + + return Result.OK(); + } + + /** + * 交换志愿序号 + */ + @ApiOperation(value = "交换志愿序号", notes = "交换志愿序号") + @PostMapping(value = "/exchangeIndexs") + public Result exchangeIndexs(@RequestBody SaveVolunteerVO saveVolunteerVO) { + String batch = saveVolunteerVO.getBatch(); + String volunteerId = saveVolunteerVO.getVolunteerId(); + Integer indexs = saveVolunteerVO.getIndexs(); + String id = saveVolunteerVO.getId(); + //当前选择的志愿 + YxVolunteerRecord nowRecord = yxVolunteerRecordService.getById(id); + //获取交换志愿志愿 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxVolunteerRecord::getVolunteerId,volunteerId); + lambdaQueryWrapper.eq(YxVolunteerRecord::getIndexs,indexs); + lambdaQueryWrapper.eq(YxVolunteerRecord::getBatch,batch); + YxVolunteerRecord recordServiceOne = yxVolunteerRecordService.getOne(lambdaQueryWrapper); + if (recordServiceOne!=null) { + recordServiceOne.setIndexs(nowRecord.getIndexs()); + yxVolunteerRecordService.updateById(recordServiceOne); + } + nowRecord.setIndexs(indexs); + yxVolunteerRecordService.updateById(nowRecord); + return Result.OK("操作成功"); + } + + /** + * updateFctj + */ + @ApiOperation(value = "修改服从调剂", notes = "修改服从调剂") + @PostMapping(value = "/updateFctj") + public Result updateFctj(@RequestBody SaveVolunteerVO saveVolunteerVO) { + String id = saveVolunteerVO.getId(); + YxVolunteerRecord yxVolunteerRecord = yxVolunteerRecordService.getById(id); + if (yxVolunteerRecord!=null) { + Integer fctj = yxVolunteerRecord.getFctj(); + if (fctj==null || fctj==0) { + yxVolunteerRecord.setFctj(1); + }else{ + yxVolunteerRecord.setFctj(0); + } + yxVolunteerRecordService.updateById(yxVolunteerRecord); + } + return Result.OK("操作成功"); + } + + @ApiOperation(value = "切换志愿单", notes = "切换志愿单") + @PostMapping(value = "/switchVolunteer") + public Result switchVolunteer(@RequestBody SaveVolunteerVO saveVolunteerVO) { + String id = saveVolunteerVO.getId(); + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + YxVolunteer volunteer = yxVolunteerService.getById(id); + if (volunteer!=null) { + String scoreId = volunteer.getScoreId(); + if (StringUtils.isNotBlank(scoreId)) { + //修改当前用户的所有志愿单状态 0 + yxVolunteerService.update(new LambdaUpdateWrapper().eq(YxVolunteer::getCreateBy,user.getId()).set(YxVolunteer::getState,0)); + //修改当前用户的成绩状态 0 + yxUserScoreService.update(new LambdaUpdateWrapper().eq(YxUserScore::getCreateBy,user.getId()).set(YxUserScore::getState,0)); + //开启志愿单及成绩 + //修改当前用户志愿单状态 1 + yxVolunteerService.update(new LambdaUpdateWrapper().eq(YxVolunteer::getCreateBy,user.getId()).eq(YxVolunteer::getId,id).set(YxVolunteer::getState,1)); + //修改当前用户的成绩状态 0 + yxUserScoreService.update(new LambdaUpdateWrapper().eq(YxUserScore::getCreateBy,user.getId()).eq(YxUserScore::getId,scoreId).set(YxUserScore::getState,1)); + } + } + return Result.OK("操作成功"); + } + @GetMapping(value = "/preview") public void preview(@RequestParam(value = "id") String id, HttpServletResponse response) throws IOException { VolunteerDTO volunteerDTO = yxVolunteerService.findById(id); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java index 313a9aa..c1de1ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/QueryRecommendMajorVO.java @@ -3,13 +3,7 @@ package org.jeecg.modules.art.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang.StringUtils; import org.jeecg.modules.art.dto.ArtBaseDTO; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java index ee8f2d3..d5d48d4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/art/vo/SaveVolunteerVO.java @@ -5,6 +5,7 @@ import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -72,4 +73,7 @@ public class SaveVolunteerVO implements Serializable { */ @ApiModelProperty(value = "创建人") private java.lang.String createBy; + + private BigDecimal enrollProbability; + private BigDecimal studentConvertedScore; } 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 new file mode 100644 index 0000000..07b6619 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java @@ -0,0 +1,308 @@ +package org.jeecg.modules.mini.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.mini.service.MiniArticleService; +import org.jeecg.modules.mini.vo.ImportArticleVO; +import org.jeecg.modules.mini.vo.QueryArticleVO; +import org.jeecg.modules.yx.dto.LiNianShuJuDTO; +import org.jeecg.modules.yx.dto.SchoolMajorImport3; +import org.jeecg.modules.yx.entity.*; +import org.jeecg.modules.yx.service.*; +import org.jeecgframework.poi.excel.ExcelImportUtil; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Description 文章接口 + * @Author ZhouWenTao + * @Date 2024/3/6 16:52 + */ +@Api(tags = "小程序端-文章接口") +@RestController +@Slf4j +@RequestMapping("/mini/article") +public class MiniArticleController { + @Autowired + private RedisUtil redisUtil; + @Autowired + private IYxSchoolService yxSchoolService; + @Autowired + private IYxSchoolMajorService yxSchoolMajorService; + @Autowired + private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService; + @Autowired + private IYxArticleService yxArticleService; + @Autowired + private IYxArticleContentService yxArticleContentService; + @Autowired + private MiniArticleService miniArticleService; + + public static void main(String[] args) { + String rulesEnrollProbability = "文1+专0.66700"; + String[] split = rulesEnrollProbability.split("\\+"); + String w=null,z=null; + BigDecimal wb=null; + BigDecimal zb=null; + for (String s : split) { + w = null; + z = null; + if (s.contains("文")) { + wb = new BigDecimal(s.replace("文","")); + } + if (s.contains("专")) { + zb = new BigDecimal(s.replace("专","")); + } + } + System.out.println("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + } + @ApiOperation(value = "文章列表") + @GetMapping(value = "/page") + public Result articlePage(QueryArticleVO queryArticleVO) { + if(false){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); + queryWrapper.like(YxSchoolMajor::getRulesEnrollProbability,"专"); + queryWrapper.like(YxSchoolMajor::getRulesEnrollProbability,"文"); + queryWrapper.notLike(YxSchoolMajor::getRulesEnrollProbability,"+"); + queryWrapper.notLike(YxSchoolMajor::getRulesEnrollProbability,"文过专排"); + queryWrapper.notLike(YxSchoolMajor::getRulesEnrollProbability,"专过文排"); + //queryWrapper.notIn(YxHistoryMajorEnroll::getRulesEnrollProbability,"文+专","专+文"); + List list = yxSchoolMajorService.list(queryWrapper); + for (YxSchoolMajor yxSchoolMajor : list) { + String[] split = yxSchoolMajor.getRulesEnrollProbability().split("专"); + String w=null,z=null; + BigDecimal wb=null; + BigDecimal zb=null; + for (String s : split) { + w = null; + z = null; + if (s.contains("文")) { + wb = new BigDecimal(s.replace("文","")); + }else{ + zb = new BigDecimal(s.replace("专","")); + } + } + System.out.println(yxSchoolMajor.getRulesEnrollProbability()+":"); + System.out.print("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + System.out.println(); + yxSchoolMajor.setRulesEnrollProbability("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + } + yxSchoolMajorService.updateBatchById(list); + return Result.OK(); + } + if(false){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNotNull(YxHistoryMajorEnroll::getRulesEnrollProbability); + queryWrapper.like(YxHistoryMajorEnroll::getRulesEnrollProbability,"专"); + queryWrapper.like(YxHistoryMajorEnroll::getRulesEnrollProbability,"文"); + queryWrapper.notLike(YxHistoryMajorEnroll::getRulesEnrollProbability,"+"); + queryWrapper.notLike(YxHistoryMajorEnroll::getRulesEnrollProbability,"文过专排"); + queryWrapper.notLike(YxHistoryMajorEnroll::getRulesEnrollProbability,"专过文排"); + //queryWrapper.notIn(YxHistoryMajorEnroll::getRulesEnrollProbability,"文+专","专+文"); + List list = yxHistoryMajorEnrollService.list(queryWrapper); + for (YxHistoryMajorEnroll yxSchoolMajor : list) { + String[] split = yxSchoolMajor.getRulesEnrollProbability().split("专"); + String w=null,z=null; + BigDecimal wb=null; + BigDecimal zb=null; + for (String s : split) { + w = null; + z = null; + if (s.contains("文")) { + wb = new BigDecimal(s.replace("文","")); + }else{ + zb = new BigDecimal(s.replace("专","")); + } + } + System.out.println(yxSchoolMajor.getRulesEnrollProbability()+":"); + System.out.print("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + System.out.println(); + yxSchoolMajor.setRulesEnrollProbability("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + } + yxHistoryMajorEnrollService.updateBatchById(list); + return Result.OK(); + } + if(false){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.isNotNull(YxSchoolMajor::getRulesEnrollProbability); + queryWrapper.like(YxSchoolMajor::getRulesEnrollProbability,"+"); + queryWrapper.notLike(YxSchoolMajor::getRulesEnrollProbability,"*"); + queryWrapper.notIn(YxSchoolMajor::getRulesEnrollProbability,"文+专","专+文"); + List yxSchoolMajorList = yxSchoolMajorService.list(queryWrapper); + for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { + System.out.println(yxSchoolMajor.getRulesEnrollProbability()+":"); + String[] split = yxSchoolMajor.getRulesEnrollProbability().split("\\+"); + String w=null,z=null; + BigDecimal wb=null; + BigDecimal zb=null; + for (String s : split) { + w = null; + z = null; + try { + if (s.contains("文")) { + wb = new BigDecimal(s.replace("文","")); + } + }catch (Exception e){ + System.out.println("--"+yxSchoolMajor.getRulesEnrollProbability()); + e.printStackTrace(); + } + if (s.contains("专")) { + zb = new BigDecimal(s.replace("专","")); + } + } + System.out.print("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + System.out.println(); + yxSchoolMajor.setRulesEnrollProbability("文*"+wb.stripTrailingZeros().toPlainString()+"+专*"+zb.stripTrailingZeros().toPlainString()); + } + yxSchoolMajorService.updateBatchById(yxSchoolMajorList); + return Result.OK(); + } + //分页 + Integer pageNum = queryArticleVO.getPageNum(); + Integer pageSize = queryArticleVO.getPageSize(); + Integer type = queryArticleVO.getType(); + if (null == type) { + type = 0; + } + //先从redis中获取是否有该文章信息 + String key = "miniArticlePage_type" + type + "_pageNum_" + pageNum + "pageSize_" + pageSize; + String json = null; + IPage pageList = null; + if (false) { + redisUtil.hasKey(key); + //redis中存在 + json = (String) redisUtil.get(key); + Gson gson = new Gson(); + pageList = gson.fromJson(json,new TypeToken>(){}.getType()); + } else { + //redis不存在，从数据库获取 + LambdaQueryWrapper yxArticleLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxArticleLambdaQueryWrapper.eq(YxArticle::getType, type); + yxArticleLambdaQueryWrapper.orderByDesc(YxArticle::getCreateTime, YxArticle::getUpdateTime); + pageList = yxArticleService.page(new Page<>(pageNum, pageSize), yxArticleLambdaQueryWrapper); + //json = JSONArray.toJSONString(pageList); + //存到redis中 + //redisUtil.set(key, json, 3600); + } + return Result.OK(pageList); + // 获取上传文件对象 + /*File file = new File("C:\\Users\\Denim\\Desktop\\艺体志愿宝数据\\2招生章程2022.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, ImportArticleVO.class, params); + Map yxSchoolMap = yxSchoolService.list().stream().collect(Collectors.toMap(YxSchool::getSchoolName, y -> y)); + Set notSchoolNameList = new HashSet<>(); + YxSchool yxSchool = null; + String shijian = null; + SimpleDateFormat inputFormat = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss a"); + SimpleDateFormat inputFormat2 = new SimpleDateFormat("M/d/yyyy h:mm:ss a", Locale.ENGLISH); + SimpleDateFormat inputFormat3 = new SimpleDateFormat("MH/dd/yyyy HH:mm:ss a", Locale.ENGLISH); + + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date =null; + String schoolName = null; + List yxArticleList = new ArrayList<>(); + YxArticle yxArticle = null; + YxArticleContent yxArticleContent = null; + for (ImportArticleVO importArticleVO : list) { + schoolName = importArticleVO.getSchoolName(); + date = null; + schoolName = schoolName.replace("(","（").replace(")","）"); + if(StringUtils.isNotBlank(importArticleVO.getShijian())){ + shijian = importArticleVO.getShijian().replace(" "," "); + try { + date = inputFormat.parse(shijian); + } + catch (ParseException e) { + try { + date = inputFormat2.parse(shijian); + }catch (ParseException e2){ + try { + date = inputFormat3.parse(shijian); + }catch (ParseException e3){ + try { + date = outputFormat.parse(shijian); + }catch (ParseException e4){ + e4.printStackTrace(); + } + + } + } + } + } + //长春光华学院2022年招生章程 //2022/4/28 0:52 + //南昌师范学院2022年招生章程 //2022/5/12 0:42 + //河南水利与环境职业学院2022年三年制高职招生章程 //2022/5/11 0:03 + //平顶山工业职业技术学院2022年招生章程 //2022/5/11 0:17 + //漯河医学高等专科学校2022年普通专科招生章程 //2022/5/11 0:05 + //湘南学院2022年招生章程 //2022/5/1 0:59 + //宝鸡中北职业学院2022年招生章程 //2022/5/12 0:05 + index++; + YxSchool school = yxSchoolMap.get(schoolName); + if (school==null) { + notSchoolNameList.add(importArticleVO.getSchoolName()); + continue; + } + yxArticle = new YxArticle(); + BeanUtils.copyProperties(importArticleVO,yxArticle); + yxArticle.setReleaseTime(date); + yxArticle.setSchoolId(school.getId()); + yxArticleService.save(yxArticle); + yxArticleContent = new YxArticleContent(); + yxArticleContent.setArticleId(yxArticle.getId()); + yxArticleContent.setContentType("1"); + yxArticleContent.setContent(importArticleVO.getContent()); + yxArticleContentService.save(yxArticleContent); + } + for (String s : notSchoolNameList) { + System.out.println(s); + } + } 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); + }*/ + } + + @ApiOperation(value = "获取文章详细信息") + @GetMapping(value = "/articleContent/{articleId}") + public Result articleContent(@PathVariable String articleId) { + return Result.OK(miniArticleService.getArticleDtoById(articleId)); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniArticleDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniArticleDTO.java new file mode 100644 index 0000000..8b563da --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniArticleDTO.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.mini.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description 小程序端 文章返回对象 + * @Author ZhouWenTao + * @Date 2024/3/6 17:20 + */ +@Data +@ApiModel(value = "小程序端-文章返回对象") +public class MiniArticleDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /**文章id*/ + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**文章内容*/ + @Excel(name = "文章内容", width = 15) + @ApiModelProperty(value = "文章内容") + private java.lang.String content; + /**内容类型（1.纯文本，2.富文本）*/ + @Excel(name = "内容类型（1.纯文本，2.富文本）", width = 15) + @ApiModelProperty(value = "内容类型（1.纯文本，2.富文本）") + private java.lang.String contentType; + /**院校id*/ + @Excel(name = "院校id", width = 15) + @ApiModelProperty(value = "院校id") + private java.lang.String schoolId; + /**院校名称*/ + @Excel(name = "院校名称", width = 15) + @ApiModelProperty(value = "院校名称") + private java.lang.String schoolName; + /**发布者*/ + @Excel(name = "发布者", width = 15) + @ApiModelProperty(value = "发布者") + private java.lang.String author; + /**类型(1.招生章程)*/ + @Excel(name = "类型(1.招生章程)", width = 15) + @ApiModelProperty(value = "类型(1.招生章程)") + private java.lang.String type; + /**发布日期*/ + @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @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 releaseTime; + /**阅读量*/ + @Excel(name = "阅读量", width = 15) + @ApiModelProperty(value = "阅读量") + private java.lang.Integer viewCount; + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniBaseDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniBaseDTO.java new file mode 100644 index 0000000..3f4ca76 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniBaseDTO.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.mini.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author ZhouWenTao + * @Date 2023/9/18 17:29 + */ +@Data +public class MiniBaseDTO implements Serializable { + @ApiModelProperty(value = "当前页") + private Integer pageNum=0; + @ApiModelProperty(value = "分页页面大小") + private Integer pageSize=10; + private String schoolName; + private String schoolCode; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java index 2a4b026..9b0a7ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/dto/MiniSchoolDTO.java @@ -55,6 +55,10 @@ public class MiniSchoolDTO implements Serializable { @ApiModelProperty(value = "学校类型（本科/专科）") private String schoolType; + /**软科排名*/ + @ApiModelProperty(value = "软科排名") + private String arwuRanking; + /**省份*/ @ApiModelProperty(value = "省份") private String province; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniArticleService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniArticleService.java new file mode 100644 index 0000000..4fb3a54 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniArticleService.java @@ -0,0 +1,46 @@ +package org.jeecg.modules.mini.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.mini.dto.MiniArticleDTO; +import org.jeecg.modules.yx.entity.YxArticle; +import org.jeecg.modules.yx.entity.YxArticleContent; +import org.jeecg.modules.yx.service.IYxArticleContentService; +import org.jeecg.modules.yx.service.IYxArticleService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description 文章Service + * @Author ZhouWenTao + * @Date 2024/3/6 17:21 + */ +@Service +public class MiniArticleService { + @Autowired + private IYxArticleService yxArticleService; + @Autowired + private IYxArticleContentService yxArticleContentService; + + /** + * 获取详细文章信息 + * @param articleId 文章id + */ + public MiniArticleDTO getArticleDtoById(String articleId) { + //先获取文章信息 + YxArticle yxArticle = yxArticleService.getById(articleId); + if (yxArticle == null) { + return null; + } + MiniArticleDTO miniArticleDTO = new MiniArticleDTO(); + BeanUtils.copyProperties(yxArticle,miniArticleDTO); + LambdaQueryWrapper yxArticleContentLambdaQueryWrapper = new LambdaQueryWrapper<>(); + yxArticleContentLambdaQueryWrapper.eq(YxArticleContent::getArticleId,articleId); + YxArticleContent yxArticleContent = yxArticleContentService.getOne(yxArticleContentLambdaQueryWrapper); + if (yxArticleContent!=null) { + miniArticleDTO.setContent(yxArticleContent.getContent()); + miniArticleDTO.setContentType(yxArticleContent.getContentType()); + } + return miniArticleDTO; + } +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/ImportArticleVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/ImportArticleVO.java new file mode 100644 index 0000000..d412b0d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/ImportArticleVO.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.mini.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description + * @Author ZhouWenTao + * @Date 2024/3/6 18:48 + */ +@Data +public class ImportArticleVO implements Serializable{ + /**标题*/ + @Excel(name = "标题", width = 15) + @ApiModelProperty(value = "标题") + private java.lang.String title; + /**院校id*/ + @Excel(name = "院校id", width = 15) + @ApiModelProperty(value = "院校id") + private java.lang.String schoolId; + /**院校名称*/ + @Excel(name = "院校名称", width = 15) + @ApiModelProperty(value = "院校名称") + private java.lang.String schoolName; + /**内容*/ + @Excel(name = "内容", width = 15) + @ApiModelProperty(value = "内容") + private java.lang.String content; + /**发布者*/ + @Excel(name = "发布者", width = 15) + @ApiModelProperty(value = "发布者") + private java.lang.String author; + /**类型(1.招生章程)*/ + @Excel(name = "类型(1.招生章程)", width = 15) + @ApiModelProperty(value = "类型(1.招生章程)") + private java.lang.String type; + /**发布日期*/ + @Excel(name = "时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @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 releaseTime; + + @Excel(name = "时间") + private String shijian; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/QueryArticleVO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/QueryArticleVO.java new file mode 100644 index 0000000..d60a600 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/vo/QueryArticleVO.java @@ -0,0 +1,24 @@ +package org.jeecg.modules.mini.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.modules.mini.dto.MiniBaseDTO; + +/** + * @Description + * @Author ZhouWenTao + * @Date 2024/3/6 16:54 + */ +@Data +@ApiModel(value = "查询文章信息对象") +public class QueryArticleVO extends MiniBaseDTO { + @ApiModelProperty(value = "文章id") + private String articleId; + @ApiModelProperty(value = "标题") + private String title; + @ApiModelProperty(value = "院校id") + private String schoolId; + @ApiModelProperty(value = "文章类型(1.招生章程)") + private Integer type; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java index f58fe5d..61a9a83 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java @@ -46,4 +46,17 @@ public class YxConstant { public static BigDecimal bigDecimal05 = new BigDecimal("0.5"); public static BigDecimal bigDecimal075 = new BigDecimal("0.75"); public static BigDecimal bigDecimal2 = new BigDecimal("2"); + + public static BigDecimal bigDecimal750 = new BigDecimal(750); + + public static BigDecimal bigDecimal300 = new BigDecimal(300); + + //默认的录取方式类型 + public static String culturalControlLineGuo= "文过专排"; + public static String specialControlLineGuo= "专过文排"; + //默认的录取方式类型 + public static String culturalControlLineGuo2= "文过专排主科"; + + + public static List defaultRulesEnrollProbabilityList =Arrays.asList("文过专排","专过文排"); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleContentController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleContentController.java new file mode 100644 index 0000000..2d2455e --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleContentController.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.YxArticleContent; +import org.jeecg.modules.yx.service.IYxArticleContentService; + +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-06 + * @Version: V1.0 + */ +@Api(tags="文章内容表") +@RestController +@RequestMapping("/yx/yxArticleContent") +@Slf4j +public class YxArticleContentController extends JeecgController { + @Autowired + private IYxArticleContentService yxArticleContentService; + + /** + * 分页列表查询 + * + * @param yxArticleContent + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "文章内容表-分页列表查询") + @ApiOperation(value="文章内容表-分页列表查询", notes="文章内容表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxArticleContent yxArticleContent, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxArticleContent, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxArticleContentService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxArticleContent + * @return + */ + @AutoLog(value = "文章内容表-添加") + @ApiOperation(value="文章内容表-添加", notes="文章内容表-添加") + @RequiresPermissions("yx:yx_article_content:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxArticleContent yxArticleContent) { + yxArticleContentService.save(yxArticleContent); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxArticleContent + * @return + */ + @AutoLog(value = "文章内容表-编辑") + @ApiOperation(value="文章内容表-编辑", notes="文章内容表-编辑") + @RequiresPermissions("yx:yx_article_content:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody YxArticleContent yxArticleContent) { + yxArticleContentService.updateById(yxArticleContent); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文章内容表-通过id删除") + @ApiOperation(value="文章内容表-通过id删除", notes="文章内容表-通过id删除") + @RequiresPermissions("yx:yx_article_content:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + yxArticleContentService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文章内容表-批量删除") + @ApiOperation(value="文章内容表-批量删除", notes="文章内容表-批量删除") + @RequiresPermissions("yx:yx_article_content:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.yxArticleContentService.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) { + YxArticleContent yxArticleContent = yxArticleContentService.getById(id); + if(yxArticleContent==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxArticleContent); + } + + /** + * 导出excel + * + * @param request + * @param yxArticleContent + */ + @RequiresPermissions("yx:yx_article_content:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YxArticleContent yxArticleContent) { + return super.exportXls(request, yxArticleContent, YxArticleContent.class, "文章内容表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("yx:yx_article_content:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, YxArticleContent.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java new file mode 100644 index 0000000..73ca915 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.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.YxArticle; +import org.jeecg.modules.yx.service.IYxArticleService; + +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-06 + * @Version: V1.0 + */ +@Api(tags="文章表") +@RestController +@RequestMapping("/yx/yxArticle") +@Slf4j +public class YxArticleController extends JeecgController { + @Autowired + private IYxArticleService yxArticleService; + + /** + * 分页列表查询 + * + * @param yxArticle + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "文章表-分页列表查询") + @ApiOperation(value="文章表-分页列表查询", notes="文章表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxArticle yxArticle, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxArticle, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxArticleService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxArticle + * @return + */ + @AutoLog(value = "文章表-添加") + @ApiOperation(value="文章表-添加", notes="文章表-添加") + @RequiresPermissions("yx:yx_article:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxArticle yxArticle) { + yxArticleService.save(yxArticle); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxArticle + * @return + */ + @AutoLog(value = "文章表-编辑") + @ApiOperation(value="文章表-编辑", notes="文章表-编辑") + @RequiresPermissions("yx:yx_article:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody YxArticle yxArticle) { + yxArticleService.updateById(yxArticle); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "文章表-通过id删除") + @ApiOperation(value="文章表-通过id删除", notes="文章表-通过id删除") + @RequiresPermissions("yx:yx_article:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + yxArticleService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "文章表-批量删除") + @ApiOperation(value="文章表-批量删除", notes="文章表-批量删除") + @RequiresPermissions("yx:yx_article:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.yxArticleService.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) { + YxArticle yxArticle = yxArticleService.getById(id); + if(yxArticle==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxArticle); + } + + /** + * 导出excel + * + * @param request + * @param yxArticle + */ + @RequiresPermissions("yx:yx_article:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YxArticle yxArticle) { + return super.exportXls(request, yxArticle, YxArticle.class, "文章表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("yx:yx_article:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, YxArticle.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArwuController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArwuController.java index f0a05cd..fe4d973 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArwuController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArwuController.java @@ -8,16 +8,13 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang.StringUtils; 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.dto.ArwuImportTestDTO; -import org.jeecg.modules.yx.dto.LiNianShuJuDTO; -import org.jeecg.modules.yx.dto.SchoolMajorImport3; -import org.jeecg.modules.yx.entity.*; +import org.jeecg.modules.yx.entity.YxArwu; +import org.jeecg.modules.yx.entity.YxSchool; import org.jeecg.modules.yx.service.IYxArwuService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -25,7 +22,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecg.modules.yx.service.IYxSchoolChildService; import org.jeecg.modules.yx.service.IYxSchoolService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -44,129 +40,127 @@ 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-03 + * @Date: 2024-03-06 * @Version: V1.0 */ -@Api(tags="软科排名表") +@Api(tags = "软科排名表") @RestController @RequestMapping("/yx/yxArwu") @Slf4j public class YxArwuController extends JeecgController { - @Autowired - private IYxArwuService yxArwuService; + @Autowired + private IYxArwuService yxArwuService; @Autowired private IYxSchoolService yxSchoolService; - @Autowired - private IYxSchoolChildService yxSchoolChildService; - - /** - * 分页列表查询 - * - * @param yxArwu - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "软科排名表-分页列表查询") - @ApiOperation(value="软科排名表-分页列表查询", notes="软科排名表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(YxArwu yxArwu, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxArwu, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = yxArwuService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param yxArwu - * @return - */ - @AutoLog(value = "软科排名表-添加") - @ApiOperation(value="软科排名表-添加", notes="软科排名表-添加") - @RequiresPermissions("yx:yx_arwu:add") - @PostMapping(value = "/add") - public Result add(@RequestBody YxArwu yxArwu) { - yxArwuService.save(yxArwu); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param yxArwu - * @return - */ - @AutoLog(value = "软科排名表-编辑") - @ApiOperation(value="软科排名表-编辑", notes="软科排名表-编辑") - @RequiresPermissions("yx:yx_arwu:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody YxArwu yxArwu) { - yxArwuService.updateById(yxArwu); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "软科排名表-通过id删除") - @ApiOperation(value="软科排名表-通过id删除", notes="软科排名表-通过id删除") - @RequiresPermissions("yx:yx_arwu:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - yxArwuService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "软科排名表-批量删除") - @ApiOperation(value="软科排名表-批量删除", notes="软科排名表-批量删除") - @RequiresPermissions("yx:yx_arwu:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.yxArwuService.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) { - YxArwu yxArwu = yxArwuService.getById(id); - if(yxArwu==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(yxArwu); - } /** - * 导出excel - * - * @param request - * @param yxArwu - */ + * 分页列表查询 + * + * @param yxArwu + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "软科排名表-分页列表查询") + @ApiOperation(value = "软科排名表-分页列表查询", notes = "软科排名表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxArwu yxArwu, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxArwu, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxArwuService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param yxArwu + * @return + */ + @AutoLog(value = "软科排名表-添加") + @ApiOperation(value = "软科排名表-添加", notes = "软科排名表-添加") + @RequiresPermissions("yx:yx_arwu:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxArwu yxArwu) { + yxArwuService.save(yxArwu); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param yxArwu + * @return + */ + @AutoLog(value = "软科排名表-编辑") + @ApiOperation(value = "软科排名表-编辑", notes = "软科排名表-编辑") + @RequiresPermissions("yx:yx_arwu:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody YxArwu yxArwu) { + yxArwuService.updateById(yxArwu); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "软科排名表-通过id删除") + @ApiOperation(value = "软科排名表-通过id删除", notes = "软科排名表-通过id删除") + @RequiresPermissions("yx:yx_arwu:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + yxArwuService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "软科排名表-批量删除") + @ApiOperation(value = "软科排名表-批量删除", notes = "软科排名表-批量删除") + @RequiresPermissions("yx:yx_arwu:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.yxArwuService.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) { + YxArwu yxArwu = yxArwuService.getById(id); + if (yxArwu == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxArwu); + } + + /** + * 导出excel + * + * @param request + * @param yxArwu + */ @RequiresPermissions("yx:yx_arwu:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, YxArwu yxArwu) { @@ -174,58 +168,73 @@ public class YxArwuController extends JeecgController { } /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ @RequiresPermissions("yx:yx_arwu:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, YxArwu.class); } - @RequestMapping(value = "/importTest", method = RequestMethod.POST) - public Result importTest() { - // 获取上传文件对象 - File file = new File("C:\\Users\\Denim\\Desktop\\2023软科排名总榜.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, ArwuImportTestDTO.class, params); - YxArwu yxArwu = new YxArwu(); - List yxArwuList = new ArrayList<>(); - List yxSchoolList = yxSchoolService.list(); - Map schoolMap=new LinkedHashMap<>(); - for (YxSchool yxSchool : yxSchoolList) { - schoolMap.put(yxSchool.getSchoolName(),yxSchool); - } - String xxmc = null; - YxSchool yxSchool=null; - for (ArwuImportTestDTO arwuImportTestDTO : list) { - xxmc = arwuImportTestDTO.getXxmc(); - yxSchool = schoolMap.get(xxmc); - if (yxSchool==null) { - System.out.println(xxmc); - continue; - } - } - //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("文件导入成功!"); - } + @RequestMapping(value = "/importTest", method = RequestMethod.POST) + public Result importTest() { + // 获取上传文件对象 + File file = new File("C:\\Users\\Denim\\Desktop\\2023软科排名总榜.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, ArwuImportTestDTO.class, params); + YxArwu yxArwu =null; + List yxArwuList = new ArrayList<>(); + List yxSchoolList = yxSchoolService.list(); + Map schoolMap = new LinkedHashMap<>(); + for (YxSchool yxSchool : yxSchoolList) { + schoolMap.put(yxSchool.getSchoolName(), yxSchool); + } + String xxmc = null; + YxSchool yxSchool = null; + for (ArwuImportTestDTO arwuImportTestDTO : list) { + String pm = arwuImportTestDTO.getPm();//排名 + String yxbq = arwuImportTestDTO.getYxbq();//院校标签 + String dq = arwuImportTestDTO.getDq();//地区 + String lx = arwuImportTestDTO.getLx();//类型 + String fs = arwuImportTestDTO.getFs();//分数 + xxmc = arwuImportTestDTO.getXxmc(); + yxSchool = schoolMap.get(xxmc); + if (yxSchool == null) { + System.out.println(xxmc); + continue; + } + yxArwu = new YxArwu(); + yxArwu.setSchoolId(yxSchool.getId()); + yxArwu.setRanking(pm); + if (StringUtils.isNotBlank(fs)) { + yxArwu.setScore(new BigDecimal(fs)); + } + yxArwu.setYear("2023"); + yxArwu.setType(lx); + yxArwu.setSchoolName(xxmc); + yxArwuList.add(yxArwu); + } + yxArwuService.saveBatch(yxArwuList); + System.out.println(yxArwuList.size()); + } 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/YxHistoryScoreControlLineController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java index 4065325..a8328c4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryScoreControlLineController.java @@ -7,6 +7,8 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.YxHistoryScoreControlLine; import org.jeecg.modules.yx.service.IYxHistoryScoreControlLineService; @@ -38,6 +40,8 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; public class YxHistoryScoreControlLineController extends JeecgController { @Autowired private IYxHistoryScoreControlLineService yxHistoryScoreControlLineService; + @Autowired + private RedisUtil redisUtil; /** * 分页列表查询 @@ -67,26 +71,49 @@ public class YxHistoryScoreControlLineController extends JeecgController>> listGroupByYear(YxHistoryScoreControlLine yxHistoryScoreControlLine) { - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory,yxHistoryScoreControlLine.getProfessionalCategory()); - queryWrapper.eq(YxHistoryScoreControlLine::getCategory,yxHistoryScoreControlLine.getCategory()); - queryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')"); - List historyScoreControlLineList = yxHistoryScoreControlLineService.list(queryWrapper); - JSONObject responseBody=new JSONObject(); Map> dataMaps=new LinkedHashMap<>(); - List list; - String year=null; - for (YxHistoryScoreControlLine historyScoreControlLine : historyScoreControlLineList) { - year = historyScoreControlLine.getYear(); - list = dataMaps.getOrDefault(year,new ArrayList<>()); - if ("本科A段".equals(historyScoreControlLine.getBatch())) { - YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine(); - BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1); - yxHistoryScoreControlLine1.setBatch("本科提前批"); - list.add(yxHistoryScoreControlLine1); + //判断redis中是否存储过历年省控线信息 + String professionalCategory = yxHistoryScoreControlLine.getProfessionalCategory(); + String category = yxHistoryScoreControlLine.getCategory(); + String key = "yxHistoryScoreControlLine_listGroupByYear_professionalCategory_"+professionalCategory+"_category"+category; + String json = null; + if (redisUtil.hasKey(key)) { + //redis中有 + json = (String) redisUtil.get(key); + dataMaps = JSONObject.parseObject(json,Map.class); + }else{ + //redis中没有 + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory,yxHistoryScoreControlLine.getProfessionalCategory()); + queryWrapper.eq(YxHistoryScoreControlLine::getCategory,yxHistoryScoreControlLine.getCategory()); + queryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')"); + List historyScoreControlLineList = yxHistoryScoreControlLineService.list(queryWrapper); + List list; + String year=null; + String batch = null; + for (YxHistoryScoreControlLine historyScoreControlLine : historyScoreControlLineList) { + year = historyScoreControlLine.getYear(); + batch = historyScoreControlLine.getBatch(); + if (YxConstant.nowYear.equals(year)) { + if (!"高职高专".equals(batch)) { + historyScoreControlLine.setCulturalScore(YxConstant.bigDecimal0); + historyScoreControlLine.setCulturalScoreXk(YxConstant.bigDecimal0); + historyScoreControlLine.setSpecialScore(YxConstant.bigDecimal0); + historyScoreControlLine.setSpecialScoreXk(YxConstant.bigDecimal0); + } + } + list = dataMaps.getOrDefault(year,new ArrayList<>()); + if ("本科A段".equals(batch)) { + YxHistoryScoreControlLine yxHistoryScoreControlLine1 = new YxHistoryScoreControlLine(); + BeanUtils.copyProperties(historyScoreControlLine,yxHistoryScoreControlLine1); + yxHistoryScoreControlLine1.setBatch("本科提前批"); + list.add(yxHistoryScoreControlLine1); + } + list.add(historyScoreControlLine); + dataMaps.put(year,list); } - list.add(historyScoreControlLine); - dataMaps.put(year,list); + json = JSONObject.toJSONString(dataMaps); + redisUtil.set(key,json,3600); } return Result.OK(dataMaps); } 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 585c1cf..121f63b 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 @@ -481,7 +481,8 @@ public class YxSchoolMajorController extends JeecgController importExcel3(){ - service.updateRulesEnrollProbabilityByOldLastYearData(); + //service.updateRulesEnrollProbabilityByOldLastYearData(); + service.updateRulesEnrollProbabilityByOldLastYearData2(); return Result.OK(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java index e9134f6..0a6b45f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolMasterDegreeController.java @@ -43,103 +43,103 @@ 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-03 + * @Date: 2024-03-03 * @Version: V1.0 */ -@Api(tags="院校硕士研究生信息") +@Api(tags = "院校硕士研究生信息") @RestController @RequestMapping("/yx/yxSchoolMasterDegree") @Slf4j public class YxSchoolMasterDegreeController extends JeecgController { - @Autowired - private IYxSchoolMasterDegreeService yxSchoolMasterDegreeService; - @Autowired - private IYxSchoolService yxSchoolService; - - /** - * 分页列表查询 - */ - //@AutoLog(value = "院校硕士研究生信息-分页列表查询") - @ApiOperation(value="院校硕士研究生信息-分页列表查询", notes="院校硕士研究生信息-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(YxSchoolMasterDegree yxSchoolMasterDegree, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolMasterDegree, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = yxSchoolMasterDegreeService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - */ - @AutoLog(value = "院校硕士研究生信息-添加") - @ApiOperation(value="院校硕士研究生信息-添加", notes="院校硕士研究生信息-添加") - @RequiresPermissions("yx:yx_school_master_degree:add") - @PostMapping(value = "/add") - public Result add(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { - yxSchoolMasterDegreeService.save(yxSchoolMasterDegree); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - */ - @AutoLog(value = "院校硕士研究生信息-编辑") - @ApiOperation(value="院校硕士研究生信息-编辑", notes="院校硕士研究生信息-编辑") - @RequiresPermissions("yx:yx_school_master_degree:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { - yxSchoolMasterDegreeService.updateById(yxSchoolMasterDegree); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - */ - @AutoLog(value = "院校硕士研究生信息-通过id删除") - @ApiOperation(value="院校硕士研究生信息-通过id删除", notes="院校硕士研究生信息-通过id删除") - @RequiresPermissions("yx:yx_school_master_degree:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - yxSchoolMasterDegreeService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - */ - @AutoLog(value = "院校硕士研究生信息-批量删除") - @ApiOperation(value="院校硕士研究生信息-批量删除", notes="院校硕士研究生信息-批量删除") - @RequiresPermissions("yx:yx_school_master_degree:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.yxSchoolMasterDegreeService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - */ - //@AutoLog(value = "院校硕士研究生信息-通过id查询") - @ApiOperation(value="院校硕士研究生信息-通过id查询", notes="院校硕士研究生信息-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - YxSchoolMasterDegree yxSchoolMasterDegree = yxSchoolMasterDegreeService.getById(id); - if(yxSchoolMasterDegree==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(yxSchoolMasterDegree); - } + @Autowired + private IYxSchoolMasterDegreeService yxSchoolMasterDegreeService; + @Autowired + private IYxSchoolService yxSchoolService; /** - * 导出excel - */ + * 分页列表查询 + */ + //@AutoLog(value = "院校硕士研究生信息-分页列表查询") + @ApiOperation(value = "院校硕士研究生信息-分页列表查询", notes = "院校硕士研究生信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(YxSchoolMasterDegree yxSchoolMasterDegree, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(yxSchoolMasterDegree, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = yxSchoolMasterDegreeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + */ + @AutoLog(value = "院校硕士研究生信息-添加") + @ApiOperation(value = "院校硕士研究生信息-添加", notes = "院校硕士研究生信息-添加") + @RequiresPermissions("yx:yx_school_master_degree:add") + @PostMapping(value = "/add") + public Result add(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { + yxSchoolMasterDegreeService.save(yxSchoolMasterDegree); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + */ + @AutoLog(value = "院校硕士研究生信息-编辑") + @ApiOperation(value = "院校硕士研究生信息-编辑", notes = "院校硕士研究生信息-编辑") + @RequiresPermissions("yx:yx_school_master_degree:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody YxSchoolMasterDegree yxSchoolMasterDegree) { + yxSchoolMasterDegreeService.updateById(yxSchoolMasterDegree); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "院校硕士研究生信息-通过id删除") + @ApiOperation(value = "院校硕士研究生信息-通过id删除", notes = "院校硕士研究生信息-通过id删除") + @RequiresPermissions("yx:yx_school_master_degree:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + yxSchoolMasterDegreeService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ + @AutoLog(value = "院校硕士研究生信息-批量删除") + @ApiOperation(value = "院校硕士研究生信息-批量删除", notes = "院校硕士研究生信息-批量删除") + @RequiresPermissions("yx:yx_school_master_degree:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.yxSchoolMasterDegreeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + */ + //@AutoLog(value = "院校硕士研究生信息-通过id查询") + @ApiOperation(value = "院校硕士研究生信息-通过id查询", notes = "院校硕士研究生信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + YxSchoolMasterDegree yxSchoolMasterDegree = yxSchoolMasterDegreeService.getById(id); + if (yxSchoolMasterDegree == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(yxSchoolMasterDegree); + } + + /** + * 导出excel + */ @RequiresPermissions("yx:yx_school_master_degree:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, YxSchoolMasterDegree yxSchoolMasterDegree) { @@ -147,62 +147,85 @@ public class YxSchoolMasterDegreeController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, YxSchoolMasterDegree.class); } - /** - * 刷新专业信息 - */ - @RequestMapping(value = "/importExcel1", method = RequestMethod.POST) - public Result importExcel1(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; + /** + * 刷新专业信息 + */ + @RequestMapping(value = "/importExcel1", method = RequestMethod.POST) + public Result importExcel1(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; - try { - fileInputStream = new FileInputStream(file); - List list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolMasterDegree.class, params); + try { + fileInputStream = new FileInputStream(file); + List list = ExcelImportUtil.importExcel(fileInputStream, YxSchoolMasterDegree.class, params); - List schoolNameList=new ArrayList<>(); - List yxSchoolList = null; - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - String schoolName = null; - String sn=null; - int khLast=0; - for (YxSchoolMasterDegree yxSchoolMasterDegree : list) { - schoolName = yxSchoolMasterDegree.getSchoolName(); - khLast = schoolName.indexOf(")"); - if (khLast!=-1) { - sn = schoolName.substring(khLast+1); - } - queryWrapper.clear(); - queryWrapper.eq(YxSchool::getSchoolName,sn); - yxSchoolList = yxSchoolService.list(queryWrapper); - if (CollectionUtils.isEmpty(yxSchoolList)) { - schoolNameList.add(sn); - continue; - } - } - System.out.println("缺少院校编码"); - System.out.println(schoolNameList.size()); - } 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("文件导入成功!"); - } + Set schoolNameList = new HashSet<>(); + List yxSchoolList = yxSchoolService.list(); + Map schoolMap = new LinkedHashMap<>(); + for (YxSchool yxSchool : yxSchoolList) { + schoolMap.put(yxSchool.getSchoolName(), yxSchool); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + String schoolName = null; + String majorName = null; + String sn = null; + String mn = null; + int khLast = 0; + int mrLast = 0; + YxSchool yxSchool = null; + for (YxSchoolMasterDegree yxSchoolMasterDegree : list) { + majorName = yxSchoolMasterDegree.getMajorName(); + majorName = majorName.replace("(","（").replace(")","）"); + mrLast = majorName.indexOf("）"); + + //专业名称 + if (mrLast!=-1) { + mn = majorName.substring(mrLast+1); + } + yxSchoolMasterDegree.setMajorCode(yxSchoolMasterDegree.getMajorName().substring(1,7)); + yxSchoolMasterDegree.setMajorName(mn); + schoolName = yxSchoolMasterDegree.getSchoolName(); + schoolName = schoolName.replace("(","（").replace(")","）"); + khLast = schoolName.indexOf("）"); + if (khLast != -1) { + sn = schoolName.substring(khLast + 1); + } + yxSchool = schoolMap.get(sn); + if (yxSchool==null) { + schoolNameList.add(sn); + continue; + } + yxSchoolMasterDegree.setSchoolMasterCode(schoolName.substring(1,6)); + yxSchoolMasterDegree.setSchoolName(sn); + yxSchoolMasterDegree.setSchoolId(yxSchool.getId()); + } + System.out.println("缺少院校编码"); + for (String s : schoolNameList) { + System.out.println(s); + } + yxSchoolMasterDegreeService.saveBatch(list); + } 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/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java index dbba7a2..0beba09 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java @@ -3,6 +3,7 @@ package org.jeecg.modules.yx.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.JsonObject; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; @@ -13,6 +14,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.art.dto.ArtRecommendMajorBaseDTO; +import org.jeecg.modules.art.vo.QueryRecommendMajorVO; import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.service.*; @@ -21,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -37,6 +42,8 @@ public class YxScoreController { @Autowired private IYxUserScoreService yxUserScoreService; @Autowired + private IYxSchoolMajorService yxSchoolMajorService; + @Autowired private IYxVolunteerService yxVolunteerService; @Autowired private IYxHistoryScoreBatchService yxHistoryScoreBatchService; @@ -52,7 +59,11 @@ public class YxScoreController { // 入参 String professionalCategory = yxUserScore.getProfessionalCategory(); String cognitioPolyclinic = yxUserScore.getCognitioPolyclinic();//文科/理科 - AssertUtils.notNull(cognitioPolyclinic, "请选择[文科/理科]"); + BigDecimal culturalScore = yxUserScore.getCulturalScore(); + BigDecimal professionalScore = yxUserScore.getProfessionalScore(); + String professionalCategoryChildren = yxUserScore.getProfessionalCategoryChildren(); + AssertUtils.notNull(professionalCategory, "请选择[专业类别]"); + AssertUtils.notNull(cognitioPolyclinic, "请选择[选考科目]"); //先判断当前用户是否直接提交过得分 List oldScoreList = yxUserScoreService.list(new LambdaQueryWrapper().eq(YxUserScore::getState, "1").eq(YxUserScore::getCreateBy, sysUser.getId())); if (CollectionUtils.isNotEmpty(oldScoreList)) { @@ -75,6 +86,20 @@ public class YxScoreController { } //保存新的分数信息 yxUserScore.setType("2");//报考类型 1.普通类 2.艺术类 + yxUserScore.setRanking(0);//位次 + yxUserScore.setCreateBy(userId); + + AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0,"[文化成绩]最高分为750"); + AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0,"[文化成绩]最低分为0"); + + if ("音乐类".equals(professionalCategory)) { + AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0,"[主项成绩]最高分为300"); + AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0,"[主项成绩]最低分为0"); + }else{ + AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0,"[统考成绩]最高分为300"); + AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0,"[统考成绩]最低分为0"); + } + /*String professionalScore = requestBody.getString("professionalScore");String culturalScore = requestBody.getString("culturalScore");String chineseScore = requestBody.getString("chineseScore");String englishScore = requestBody.getString("englishScore"); if (!StringUtils.isNumeric(professionalScore)) {return Result.error("统考成绩仅可输入数字");}if (!StringUtils.isNumeric(culturalScore)) {return Result.error("文化成绩仅可输入数字");} if (!StringUtils.isNumeric(chineseScore)) {return Result.error("语文成绩仅可输入数字");}if (!StringUtils.isNumeric(englishScore)) {return Result.error("英语成绩仅可输入数字");} @@ -82,12 +107,7 @@ public class YxScoreController { yxUserScore.setCulturalScore(new BigDecimal(culturalScore));//文化成绩分 yxUserScore.setChineseScore(new BigDecimal(chineseScore));//语文成绩 yxUserScore.setEnglishScore(new BigDecimal(englishScore));//英语成绩*/ - yxUserScore.setRanking(0);//位次 - yxUserScore.setCreateBy(userId); - BigDecimal culturalScore = yxUserScore.getCulturalScore(); - BigDecimal professionalScore = yxUserScore.getProfessionalScore(); - String professionalCategoryChildren = yxUserScore.getProfessionalCategoryChildren(); if (StringUtils.isBlank(professionalCategoryChildren)) { if (!professionalCategoryChildren.contains("音乐表演声乐")) { yxUserScore.setYybysy(YxConstant.bigDecimal0); @@ -106,9 +126,8 @@ public class YxScoreController { //==============判断 批次 start LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(YxHistoryScoreControlLine::getYear,YxConstant.nowYear);//用23年省控线 + lambdaQueryWrapper.eq(YxHistoryScoreControlLine::getYear,YxConstant.nowYear);//24年省控线 lambdaQueryWrapper.eq(YxHistoryScoreControlLine::getCategory,yxUserScore.getCognitioPolyclinic()); - //TODO 目前没有24年省控线，用的是23年省控线 //表演类型的方向 if ("舞蹈类".equals(professionalCategory)) { //舞蹈类使用艺术舞蹈的省控线判定批次 @@ -117,79 +136,111 @@ public class YxScoreController { lambdaQueryWrapper.eq(YxHistoryScoreControlLine::getProfessionalCategory,professionalCategory); } lambdaQueryWrapper.last("ORDER BY year DESC,field(batch,'提前批','本科A段','本科B段','本科','高职高专')"); -// List historyScoreControlLineList = yxHistoryScoreControlLineService.list(lambdaQueryWrapper); -// if (!YxConstant.cankaoMajorTypeList.contains(professionalCategory)) { -// //24年分数转换折合23年分数 -// YxScoreSegment scoreSegment = null; -// if ("舞蹈类".equals(professionalCategory)) { -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,"艺术舞蹈", yxUserScore.getProvince()); -// professionalScore = scoreSegment.getScore(); -// }else if("音乐类".equals(professionalCategory)){ -// BigDecimal yybysy = yxUserScore.getYybysy();//音乐表演声乐成绩 -// BigDecimal yybyqy = yxUserScore.getYybyqy();//音乐表演器乐成绩 -// BigDecimal yyjy = yxUserScore.getYyjy();//音乐教育成绩 -// -// if (yybysy.compareTo(YxConstant.bigDecimal0) > 0) { -// //音乐表演声乐 -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory,"音乐表演声乐", yxUserScore.getProvince()); -// yybysy = scoreSegment.getScore(); -// }else if(yybysy.compareTo(YxConstant.bigDecimal0) > 0){ -// //音乐表演器乐成绩 -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybyqy, professionalCategory,"音乐表演器乐", yxUserScore.getProvince()); -// yybysy = scoreSegment.getScore(); -// }else if(yyjy.compareTo(YxConstant.bigDecimal0) > 0){ -// //音乐教育成绩 -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yyjy, professionalCategory,"音乐教育", yxUserScore.getProvince()); -// yyjy = scoreSegment.getScore(); -// } -// professionalScore = yybysy.max(yybyqy).max(yyjy); -// }else if("播音与主持类".equals(professionalCategory)){ -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,null, yxUserScore.getProvince()); -// professionalScore = scoreSegment.getScore(); -// }else if("表演类".equals(professionalCategory)){ -// BigDecimal xjysby = yxUserScore.getXjysby();//影视戏剧表演 -// BigDecimal xjysdy = yxUserScore.getXjysdy();//影视戏剧导演 -// BigDecimal fzby = yxUserScore.getFzby();//服装表演 -// if (xjysby.compareTo(YxConstant.bigDecimal0) > 0) { -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory,"影视戏剧表演", yxUserScore.getProvince()); -// xjysby = scoreSegment.getScore(); -// }else if(xjysdy.compareTo(YxConstant.bigDecimal0) > 0){ -// //音乐表演器乐成绩 -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysdy, professionalCategory,"影视戏剧导演", yxUserScore.getProvince()); -// xjysdy = scoreSegment.getScore(); -// }else if(fzby.compareTo(YxConstant.bigDecimal0) > 0){ -// //音乐教育成绩 -// scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory,"服装表演", yxUserScore.getProvince()); -// fzby = scoreSegment.getScore(); -// } -// professionalScore = xjysby.max(xjysdy).max(fzby); -// } -// } -// -// String batch = "高职高专"; -// if (professionalScore!=null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) { -// batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList); -// } + List historyScoreControlLineList = yxHistoryScoreControlLineService.list(lambdaQueryWrapper); + if (YxConstant.cankaoMajorTypeList.contains(professionalCategory)) { + //24年分数转换折合23年分数 + YxScoreSegment scoreSegment = null; + if ("舞蹈类".equals(professionalCategory)) { + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,"艺术舞蹈", yxUserScore.getProvince()); + professionalScore = scoreSegment.getScore(); + }else if("音乐类".equals(professionalCategory)){ + BigDecimal yybysy = yxUserScore.getYybysy();//音乐表演声乐成绩 + BigDecimal yybyqy = yxUserScore.getYybyqy();//音乐表演器乐成绩 + BigDecimal yyjy = yxUserScore.getYyjy();//音乐教育成绩 + + if (yybysy!=null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { + //音乐表演声乐 + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory,"音乐表演声乐", yxUserScore.getProvince()); + yybysy = scoreSegment.getScore(); + } + if(yybyqy!=null && yybyqy.compareTo(YxConstant.bigDecimal0) > 0){ + //音乐表演器乐成绩 + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybyqy, professionalCategory,"音乐表演器乐", yxUserScore.getProvince()); + yybyqy = scoreSegment.getScore(); + }else{ + + } + if(yyjy!=null && yyjy.compareTo(YxConstant.bigDecimal0) > 0){ + //音乐教育成绩 + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yyjy, professionalCategory,"音乐教育", yxUserScore.getProvince()); + yyjy = scoreSegment.getScore(); + } + professionalScore = yybysy.max(yybyqy).max(yyjy); + }else if("播音与主持类".equals(professionalCategory)){ + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,null, yxUserScore.getProvince()); + professionalScore = scoreSegment.getScore(); + }else if("表演类".equals(professionalCategory)){ + BigDecimal xjysby = yxUserScore.getXjysby();//影视戏剧表演 + BigDecimal xjysdy = yxUserScore.getXjysdy();//影视戏剧导演 + BigDecimal fzby = yxUserScore.getFzby();//服装表演 + if (xjysby!=null && xjysby.compareTo(YxConstant.bigDecimal0) > 0) { + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysby, professionalCategory,"影视戏剧表演", yxUserScore.getProvince()); + xjysby = scoreSegment.getScore(); + } + if(xjysdy!=null && xjysdy.compareTo(YxConstant.bigDecimal0) > 0){ + //音乐表演器乐成绩 + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, xjysdy, professionalCategory,"影视戏剧导演", yxUserScore.getProvince()); + xjysdy = scoreSegment.getScore(); + } + if(fzby!=null && fzby.compareTo(YxConstant.bigDecimal0) > 0){ + //音乐教育成绩 + scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory,"服装表演", yxUserScore.getProvince()); + fzby = scoreSegment.getScore(); + } + professionalScore = xjysby.max(xjysdy).max(fzby); + } + } + String batch = "高职高专"; + if (professionalScore!=null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) { + batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList); + } //================批次 end //根据批次，判断 本科/高职高专 yxUserScore.setEducationalLevel("1"); - //yxUserScore.setEducationalLevel(batch.contains("专") ? "1" : "2"); - if ("体育类".equals(professionalCategory)) { + yxUserScore.setBatch(batch); + /*if ("体育类".equals(professionalCategory)) { yxUserScore.setBatch("本科"); }else{ yxUserScore.setBatch("本科A段"); - } - + }*/ yxUserScore.setId(null); yxUserScore.setCreateTime(null); yxUserScore.setUpdateTime(null); //保存当前用户的得分 yxUserScoreService.save(yxUserScore); - return Result.OK(); + //创建新的志愿单信息 + YxVolunteer yxVolunteer = new YxVolunteer(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); + yxVolunteer.setVolunteerName(sdf.format(new Date())+"志愿表"); + yxVolunteer.setScoreId(yxUserScore.getId()); + yxVolunteer = yxVolunteerService.addNew(yxVolunteer); + JSONObject responseBody=JSONObject.parseObject(JSONObject.toJSONString(yxUserScore)); + responseBody.put("volunteer",yxVolunteer); + return Result.OK(responseBody); } @GetMapping(value = "/getUserScoreInfo") public Result getUserScoreInfo() { - return Result.OK(yxUserScoreService.getActiveCurrentUserScore()); + //获取分数信息 + YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore(); + if (activeCurrentUserScore==null) { + return Result.OK(); + } + //获取当前成绩下的第志愿单 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(YxVolunteer::getScoreId,activeCurrentUserScore.getId()); + lambdaQueryWrapper.eq(YxVolunteer::getState,1); + lambdaQueryWrapper.last("limit 1"); + YxVolunteer yxVolunteer = yxVolunteerService.getOne(lambdaQueryWrapper); + + //获取可报院校数量 + QueryRecommendMajorVO queryRecommendMajorVO = new QueryRecommendMajorVO(); + queryRecommendMajorVO.setBatch(activeCurrentUserScore.getBatch()); + ArtRecommendMajorBaseDTO artRecommendMajorBaseDTO = yxSchoolMajorService.recommendMajorCount(queryRecommendMajorVO); + String jsonString = JSONObject.toJSONString(activeCurrentUserScore); + JSONObject jsonObject = JSONObject.parseObject(jsonString); + jsonObject.put("fillVolunteer",artRecommendMajorBaseDTO); + jsonObject.put("volunteer",yxVolunteer); + return Result.OK(jsonObject); } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/LiNianShuJuZhuan2DTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/LiNianShuJuZhuan2DTO.java new file mode 100644 index 0000000..d776789 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/LiNianShuJuZhuan2DTO.java @@ -0,0 +1,85 @@ +package org.jeecg.modules.yx.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; + +/** + * @Description + * @Author ZhouWenTao + * @Date 2023/11/28 15:15 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class LiNianShuJuZhuan2DTO implements Serializable { + private static final long serialVersionUID = 1L; + + @Excel(name = "院校编码", width = 15) + @ApiModelProperty(value = "院校编码") + private String yuanxiaoCode; + @Excel(name = "院校", width = 15) + @ApiModelProperty(value = "院校") + private String yuanxiao; + @Excel(name = "文理分科", width = 15) + @ApiModelProperty(value = "文理分科") + private String kelei; + @Excel(name = "年份", width = 15) + @ApiModelProperty(value = "年份") + private String nianfen; + @Excel(name = "批次") + @ApiModelProperty(value = "批次") + private String batch; + @Excel(name = "专业名称", width = 15) + @ApiModelProperty(value = "专业名称") + private String zhuanye; + @Excel(name = "专业编码", width = 15) + @ApiModelProperty(value = "专业编码") + private String zhuanyeCode; + @Excel(name = "排序方法", width = 15) + @ApiModelProperty(value = "排序方法") + private String sortType; + + @Excel(name = "专业类别",width = 15) + private String zhuanyeleibie; + @Excel(name = "招生专业代码") + private String zhaoshengdaima; + + @Excel(name = "录取率计算规则") + private String luqulvguize; + @Excel(name = "文化\n" + + "成绩\n" + + "比例/%", width = 15) + @ApiModelProperty(value = "文化成绩比例/%") + private String wenhuaBili; + @Excel(name = "专业\n" + + "成绩\n" + + "比例/%", width = 15) + @ApiModelProperty(value = "专业成绩比例/%") + private String zhuanyeBili; + + @Excel(name = "计划\n" + + "数", width = 15) + @ApiModelProperty(value = "计划数") + private String jihuashu; + + @Excel(name = "实际\n" + + "投档\n" + + "人数",width = 15) + @ApiModelProperty(value = "实际投档人数") + private String shijitoudangrenshu; + + @Excel(name = "一志愿\n" + + "最低排\n" + + "序成绩", width = 15) + @ApiModelProperty(value = "投档最低分") + private String yizhiyuanzuidipaixuchengji; + + @Excel(name = "专业备注", width = 15) + @ApiModelProperty(value = "专业备注") + private String detail; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java index 07c2e1b..827a769 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/VolunteerRecordDTO.java @@ -25,4 +25,7 @@ public class VolunteerRecordDTO extends RecommendMajorDTO { @Excel(name = "志愿顺序", width = 15) @ApiModelProperty(value = "志愿顺序") private java.lang.Integer indexs; + @Excel(name = "服从调剂", width = 15) + @ApiModelProperty(value = "服从调剂") + private Integer fctj; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticle.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticle.java new file mode 100644 index 0000000..eb664ae --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticle.java @@ -0,0 +1,91 @@ +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-06 + * @Version: V1.0 + */ +@Data +@TableName("yx_article") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="yx_article对象", description="文章表") +public class YxArticle 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 title; + /**院校id*/ + @Excel(name = "院校id", width = 15) + @ApiModelProperty(value = "院校id") + private java.lang.String schoolId; + /**院校名称*/ + @Excel(name = "院校名称", width = 15) + @ApiModelProperty(value = "院校名称") + private java.lang.String schoolName; + /**发布者*/ + @Excel(name = "发布者", width = 15) + @ApiModelProperty(value = "发布者") + private java.lang.String author; + /**类型(1.招生章程)*/ + @Excel(name = "类型(1.招生章程)", width = 15) + @ApiModelProperty(value = "类型(1.招生章程)") + private java.lang.String type; + /**发布日期*/ + @Excel(name = "发布日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @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 releaseTime; + /**阅读量*/ + @Excel(name = "阅读量", width = 15) + @ApiModelProperty(value = "阅读量") + private java.lang.Integer viewCount; + /**年份*/ + @ApiModelProperty(value = "年份") + private java.lang.String year; + /**创建人*/ + @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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticleContent.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticleContent.java new file mode 100644 index 0000000..0676eb1 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArticleContent.java @@ -0,0 +1,51 @@ +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-06 + * @Version: V1.0 + */ +@Data +@TableName("yx_article_content") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="yx_article_content对象", description="文章内容表") +public class YxArticleContent implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**文章id*/ + @Excel(name = "文章id", width = 15) + @ApiModelProperty(value = "文章id") + private java.lang.String articleId; + /**文章内容*/ + @Excel(name = "文章内容", width = 15) + @ApiModelProperty(value = "文章内容") + private java.lang.String content; + /**内容类型（1.纯文本，2.富文本）*/ + @Excel(name = "内容类型（1.纯文本，2.富文本）", width = 15) + @ApiModelProperty(value = "内容类型（1.纯文本，2.富文本）") + private java.lang.String contentType; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArwu.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArwu.java index ae5af4f..4535a85 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArwu.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxArwu.java @@ -21,7 +21,7 @@ import lombok.experimental.Accessors; /** * @Description: 软科排名表 * @Author: jeecg-boot - * @Date: 2024-03-03 + * @Date: 2024-03-06 * @Version: V1.0 */ @Data @@ -35,11 +35,19 @@ public class YxArwu implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") - private java.lang.Integer id; + private java.lang.String id; /**院校编码*/ @Excel(name = "院校编码", width = 15) @ApiModelProperty(value = "院校编码") private java.lang.String schoolCode; + /**院校id*/ + @Excel(name = "院校id", width = 15) + @ApiModelProperty(value = "院校id") + private java.lang.String schoolId; + /**院校名称*/ + @Excel(name = "院校名称", width = 15) + @ApiModelProperty(value = "院校名称") + private java.lang.String schoolName; /**排名*/ @Excel(name = "排名", width = 15) @ApiModelProperty(value = "排名") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java index 910c44e..5aa0bea 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMasterDegree.java @@ -60,6 +60,10 @@ public class YxSchoolMasterDegree implements Serializable { @Excel(name = "学位性质", width = 15) @ApiModelProperty(value = "学位性质") private java.lang.String degreeNature; + /**专业编码*/ + @Excel(name = "专业编码", width = 15) + @ApiModelProperty(value = "专业编码") + private java.lang.String majorCode; /**专业名称*/ @Excel(name = "专业名称", width = 15) @ApiModelProperty(value = "专业名称") @@ -133,8 +137,8 @@ public class YxSchoolMasterDegree implements Serializable { @ApiModelProperty(value = "接收退役") private java.lang.String acceptRetirement; /**详情链接*/ - @Excel(name = "详情链接", width = 15) - @ApiModelProperty(value = "详情链接") + @Excel(name = "详细链接", width = 15) + @ApiModelProperty(value = "详细链接") private java.lang.String detailedLink; /**备注*/ @Excel(name = "备注", width = 15) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java index 74d732d..0044525 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxScoreSegment.java @@ -86,4 +86,12 @@ public class YxScoreSegment implements Serializable { @ApiModelProperty(value = "是否是固定段位") private Integer fixedRank; + + + public YxScoreSegment() { + } + + public YxScoreSegment(BigDecimal score) { + this.score = score; + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserScore.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserScore.java index c38a0f4..6b1dc05 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserScore.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxUserScore.java @@ -35,7 +35,7 @@ public class YxUserScore implements Serializable { @TableId(type = IdType.ASSIGN_ID) private String id; /**使用状态(0-未使用,1-使用中)*/ - @ApiModelProperty(value = "使用状态(0-未使用,1-使用中)") + @ApiModelProperty(value = "使用状态(0-未使用,1-使用中,2-草表)") private java.lang.String state; /**填报类型(1-普通类 2-艺术类)*/ @Excel(name = "填报类型(1-普通类 2-艺术类)", width = 15) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVolunteerRecord.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVolunteerRecord.java index 0141ded..adb1474 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVolunteerRecord.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVolunteerRecord.java @@ -72,6 +72,11 @@ public class YxVolunteerRecord implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; + + /**服从调剂*/ + @Excel(name = "服从调剂", width = 15) + @ApiModelProperty(value = "服从调剂") + private Integer fctj; //========================= /*文理分科*/ @TableField(exist = false) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleContentMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleContentMapper.java new file mode 100644 index 0000000..01abbb6 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleContentMapper.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.YxArticleContent; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文章内容表 + * @Author: jeecg-boot + * @Date: 2024-03-06 + * @Version: V1.0 + */ +public interface YxArticleContentMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleMapper.java new file mode 100644 index 0000000..33ce61b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArticleMapper.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.YxArticle; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 文章表 + * @Author: jeecg-boot + * @Date: 2024-03-06 + * @Version: V1.0 + */ +public interface YxArticleMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArwuMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArwuMapper.java index 2e4ea09..09f0c86 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArwuMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxArwuMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 软科排名表 * @Author: jeecg-boot - * @Date: 2024-03-03 + * @Date: 2024-03-06 * @Version: V1.0 */ public interface YxArwuMapper extends BaseMapper { diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleContentMapper.xml new file mode 100644 index 0000000..c4ed023 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleContentMapper.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/mapper/xml/YxArticleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleMapper.xml new file mode 100644 index 0000000..adbb20d --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxArticleMapper.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/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index 20e56d6..751f06d 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 @@ -42,7 +42,7 @@ LEFT JOIn yx_first_level_disciplines fld ON fld.id = m.first_level_discipline WHERE sm.rules_enroll_probability is not null - AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sm.major_name like + AND (s.school_name like concat('%',#{queryvo.schoolName},'%') or sc.schooL_code like concat('%',#{queryvo.schoolName},'%') or sm.major_name like concat('%',#{queryvo.schoolName},'%')) @@ -132,6 +132,9 @@ ) + + sm.major_type_child = '音乐教育' + ) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml index d98c829..d81e854 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml @@ -33,7 +33,7 @@ LEFT JOIN yx_school_child sc ON s.id = sc.school_id where 1=1 AND s.is_ys = 1 - AND s.school_name like concat('%',#{qvo.schoolName},'%') + AND (s.school_name like concat('%',#{qvo.schoolName},'%') or sc.school_code like concat('%',#{qvo.schoolName},'%')) AND s.province like concat('%',#{qvo.province},'%') @@ -133,7 +133,7 @@ LEFT JOIN (select major_code,school_code from yx_school_major group by major_code,school_code) sm ON sm.school_code = sc.school_code where 1=1 AND s.is_ys = 1 - AND s.school_name like concat('%',#{qvo.schoolName},'%') + AND (s.school_name like concat('%',#{qvo.schoolName},'%') or sc.school_code like concat('%',#{qvo.schoolName},'%')) AND sm.major_code = #{qvo.majorCode} @@ -229,7 +229,7 @@ ) sm ON sm.school_code = sc.school_code where 1=1 AND s.is_ys = 1 - AND s.school_name like concat('%',#{qvo.schoolName},'%') + AND (s.school_name like concat('%',#{qvo.schoolName},'%') or sc.school_code like concat('%',#{qvo.schoolName},'%'))