From a79c5a75ece6ee0288025d0dd5d27b0be2c3558e Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Fri, 20 Mar 2020 13:52:13 +0800 Subject: [PATCH] bug 修复 --- src/main/java/com/sincere/student/controller/AdminController.java | 8 +++++++- src/main/java/com/sincere/student/controller/AppController.java | 23 +++++++++++++++++++++++ src/main/java/com/sincere/student/dto/submit/SubmitMajor.java | 49 ------------------------------------------------- src/main/java/com/sincere/student/dto/submit/SubmitUniv.java | 49 ++++++++++++++++++++++++++++++++++++++++--------- src/main/java/com/sincere/student/model/Article.java | 21 +++++++++++++++++++++ src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java | 15 +++++++++++++-- src/main/resources/logback.xml | 2 +- src/main/resources/mapper/UniversityConsultMapper.xml | 14 ++++++++++---- src/main/resources/mapper/UniversitySubmitFileMapper.xml | 10 ++++------ 9 files changed, 119 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/com/sincere/student/dto/submit/SubmitMajor.java diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java index d4f1bb7..f0e6aba 100644 --- a/src/main/java/com/sincere/student/controller/AdminController.java +++ b/src/main/java/com/sincere/student/controller/AdminController.java @@ -229,6 +229,7 @@ public class AdminController { public BaseDto> getConsultList(@RequestBody ConsultSearchDto consultSearchDto){ BaseDto> result = new BaseDto<>() ; consultSearchDto.setStatus(0); + consultSearchDto.setColumnType(-1); Page page = consultService.getList(consultSearchDto); result.setData(page); return result ; @@ -469,7 +470,12 @@ public class AdminController { @RequestMapping(value = "/article/createArticle" , method = RequestMethod.POST) public BaseDto createArticle(@RequestBody Article article){ BaseDto result = new BaseDto() ; - articleService.create(article); + if(StringUtils.isBlank(article.getImageUrl())){ + result.setSuccess(false); + result.setMessage("请上传封面图片"); + }else { + articleService.create(article); + } return result ; } diff --git a/src/main/java/com/sincere/student/controller/AppController.java b/src/main/java/com/sincere/student/controller/AppController.java index 690d9f5..0d3b151 100644 --- a/src/main/java/com/sincere/student/controller/AppController.java +++ b/src/main/java/com/sincere/student/controller/AppController.java @@ -301,4 +301,27 @@ public class AppController { result.setData(submitService.getAppList(pointSearchDto)); return result ; } + + @ApiOperation("投档线首页列表接口") + @RequestMapping(value = "/submit/getSubmitList" , method = RequestMethod.POST) + public BaseDto> getSubmitList(@RequestBody PageDto pageDto){ + BaseDto> result = new BaseDto<>(); + PointSearchDto pointSearchDto = new PointSearchDto(); + pointSearchDto.setPage(pageDto.getPage()); + pointSearchDto.setPageSize(pageDto.getPageSize()); + result.setData(submitService.getAppList(pointSearchDto)); + return result ; + } + + @ApiOperation("具体某个投档线详情接口") + @RequestMapping(value = "/submit/getDetail" , method = RequestMethod.POST) + public BaseDto getSubmitDetail(@RequestBody IdDto idDto){ + BaseDto result = new BaseDto<>(); + PointSearchDto pointSearchDto = new PointSearchDto(); + pointSearchDto.setPage(1); + pointSearchDto.setPageSize(1); + pointSearchDto.setSubmitId(idDto.getId()); + result.setData(submitService.getAppList(pointSearchDto).getList().get(0)); + return result ; + } } diff --git a/src/main/java/com/sincere/student/dto/submit/SubmitMajor.java b/src/main/java/com/sincere/student/dto/submit/SubmitMajor.java deleted file mode 100644 index 84e150b..0000000 --- a/src/main/java/com/sincere/student/dto/submit/SubmitMajor.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.sincere.student.dto.submit; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -@ApiModel -public class SubmitMajor { - - @ApiModelProperty(value = "专业") - private String major ; - @ApiModelProperty(value = "分数") - private int grade ; - @ApiModelProperty(value = "招收数量") - private int enrollNumber ; - @ApiModelProperty(value = "位次号") - private int rank ; - - public String getMajor() { - return major; - } - - public void setMajor(String major) { - this.major = major; - } - - public int getGrade() { - return grade; - } - - public void setGrade(int grade) { - this.grade = grade; - } - - public int getEnrollNumber() { - return enrollNumber; - } - - public void setEnrollNumber(int enrollNumber) { - this.enrollNumber = enrollNumber; - } - - public int getRank() { - return rank; - } - - public void setRank(int rank) { - this.rank = rank; - } -} diff --git a/src/main/java/com/sincere/student/dto/submit/SubmitUniv.java b/src/main/java/com/sincere/student/dto/submit/SubmitUniv.java index d5af781..bd779d6 100644 --- a/src/main/java/com/sincere/student/dto/submit/SubmitUniv.java +++ b/src/main/java/com/sincere/student/dto/submit/SubmitUniv.java @@ -12,8 +12,46 @@ public class SubmitUniv { private int universityId ; @ApiModelProperty(value = "学校名称") private String universityName ; - @ApiModelProperty(value = "专业列表") - private List majorList ; + @ApiModelProperty(value = "专业") + private String major ; + @ApiModelProperty(value = "分数") + private int grade ; + @ApiModelProperty(value = "招收数量") + private int enrollNumber ; + @ApiModelProperty(value = "位次号") + private int rank ; + + public String getMajor() { + return major; + } + + public void setMajor(String major) { + this.major = major; + } + + public int getGrade() { + return grade; + } + + public void setGrade(int grade) { + this.grade = grade; + } + + public int getEnrollNumber() { + return enrollNumber; + } + + public void setEnrollNumber(int enrollNumber) { + this.enrollNumber = enrollNumber; + } + + public int getRank() { + return rank; + } + + public void setRank(int rank) { + this.rank = rank; + } public int getUniversityId() { return universityId; @@ -31,11 +69,4 @@ public class SubmitUniv { this.universityName = universityName; } - public List getMajorList() { - return majorList; - } - - public void setMajorList(List majorList) { - this.majorList = majorList; - } } diff --git a/src/main/java/com/sincere/student/model/Article.java b/src/main/java/com/sincere/student/model/Article.java index 4409778..f8b4483 100644 --- a/src/main/java/com/sincere/student/model/Article.java +++ b/src/main/java/com/sincere/student/model/Article.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.List; @ApiModel public class Article { @@ -24,6 +25,10 @@ public class Article { private String author ; @ApiModelProperty(value = "封面图片") private String imageUrl ; + @ApiModelProperty(value = "封面图片 展示用") + private List imageUrlList ; + @ApiModelProperty(value = "封面图片数量 展示用") + private int imageCount ; @ApiModelProperty(value = "视频链接") private String videoUrl ; @ApiModelProperty(value = "外链") @@ -39,6 +44,22 @@ public class Article { @ApiModelProperty(value = "状态 0预览1发布") private int status ; + public List getImageUrlList() { + return imageUrlList; + } + + public void setImageUrlList(List imageUrlList) { + this.imageUrlList = imageUrlList; + } + + public int getImageCount() { + return imageCount; + } + + public void setImageCount(int imageCount) { + this.imageCount = imageCount; + } + public int getStatus() { return status; } diff --git a/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java b/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java index ee9079c..17db377 100644 --- a/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java @@ -10,6 +10,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @Service @@ -21,11 +23,16 @@ public class ArticleServiceImpl implements ArticleService { @Override public Page
getList(ArticleSearchDto articleSearchDto) { Page
result = new Page<>(articleSearchDto.getPage(),articleSearchDto.getPageSize()); - PageHelper.startPage(articleSearchDto.getPage(),articleSearchDto.getPageSize()); if(StringUtils.isNotBlank(articleSearchDto.getTitle())){ articleSearchDto.setTitle("%"+articleSearchDto.getTitle()+"%"); } + PageHelper.startPage(articleSearchDto.getPage(),articleSearchDto.getPageSize()); List
list = articleMapper.getList(articleSearchDto) ; + for(Article article : list){ + String[] urlList = article.getImageUrl().split(","); + article.setImageUrlList(Arrays.asList(urlList)); + article.setImageCount(urlList.length); + } result.setList(list); result.setCount(articleMapper.getListCount(articleSearchDto)); return result; @@ -38,7 +45,11 @@ public class ArticleServiceImpl implements ArticleService { @Override public Article selectById(int id) { - return articleMapper.selectById(id); + Article article = articleMapper.selectById(id); + String[] urlList = article.getImageUrl().split(","); + article.setImageUrlList(Arrays.asList(urlList)); + article.setImageCount(urlList.length); + return article ; } @Override diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 800e8d5..6e7895a 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@         - +     diff --git a/src/main/resources/mapper/UniversityConsultMapper.xml b/src/main/resources/mapper/UniversityConsultMapper.xml index 05b82eb..88ae5ea 100644 --- a/src/main/resources/mapper/UniversityConsultMapper.xml +++ b/src/main/resources/mapper/UniversityConsultMapper.xml @@ -18,12 +18,15 @@ join university_relate_major r on info.id = r.university_id join university_major m on m.id = r.major_id - + and c.column_type = #{columnType} and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort) + + and 1=1 + and info.province = #{province} @@ -51,12 +54,15 @@ join university_relate_major r on info.id = r.university_id join university_major m on m.id = r.major_id - + and c.column_type = #{columnType} and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort) + + and 1=1 + and info.province = #{province} @@ -117,10 +123,10 @@ insert into university_consult (university_id, column_type, video_url, context, img_url, - create_time, sort) + create_time, sort,status) values (#{universityId,jdbcType=INTEGER}, #{columnType,jdbcType=INTEGER}, #{videoUrl,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, - GETDATE(), #{sort,jdbcType=INTEGER}) + GETDATE(), #{sort,jdbcType=INTEGER},#{status}) diff --git a/src/main/resources/mapper/UniversitySubmitFileMapper.xml b/src/main/resources/mapper/UniversitySubmitFileMapper.xml index 535327e..d40b543 100644 --- a/src/main/resources/mapper/UniversitySubmitFileMapper.xml +++ b/src/main/resources/mapper/UniversitySubmitFileMapper.xml @@ -8,12 +8,10 @@ - - - - - - + + + + -- libgit2 0.21.0