From fafdccdcc2e4f04253b56e73d3cad99fedea8a1d Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Wed, 25 Mar 2020 14:11:17 +0800 Subject: [PATCH] bug 修复 --- src/main/java/com/sincere/student/controller/AdminController.java | 36 +++++++++++++++++++++++++++--------- src/main/java/com/sincere/student/dto/ReturnDto.java | 23 +++++++++++++++++++++++ src/main/java/com/sincere/student/mapper/ArticleMapper.java | 2 ++ src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java | 2 ++ src/main/java/com/sincere/student/mapper/UniversityMapper.java | 2 ++ src/main/java/com/sincere/student/model/Reply.java | 11 +++++++++++ src/main/java/com/sincere/student/service/ConsultService.java | 4 ++++ src/main/java/com/sincere/student/service/UniversityService.java | 2 ++ src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java | 17 +++++++++++++++-- src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java | 10 +++++++++- src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java | 6 +++++- src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java | 5 +++++ src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java | 3 ++- src/main/resources/mapper/ArticleMapper.xml | 6 +++++- src/main/resources/mapper/UniversityConsultMapper.xml | 5 +++++ src/main/resources/mapper/UniversityMapper.xml | 6 ++++++ src/main/resources/mapper/UniversityReplyMapper.xml | 1 + src/main/resources/mapper/VideoMapper.xml | 2 +- 18 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/sincere/student/dto/ReturnDto.java diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java index ae7ad54..7f77fb6 100644 --- a/src/main/java/com/sincere/student/controller/AdminController.java +++ b/src/main/java/com/sincere/student/controller/AdminController.java @@ -12,6 +12,7 @@ import com.sincere.student.utils.Page; import com.sincere.student.utils.ResultException; import com.sincere.student.utils.TokenUtils; import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -248,9 +249,20 @@ public class AdminController { @MemberAccess @ApiOperation("新建招生咨询会相关接口") @RequestMapping(value = "/consult/createConsult" , method = RequestMethod.POST) - public BaseDto createConsult(@RequestBody UniversityConsult universityConsult){ - BaseDto result = new BaseDto() ; - consultService.create(universityConsult); + public BaseDto createConsult(@RequestBody UniversityConsult universityConsult){ + BaseDto result = new BaseDto() ; + ReturnDto dto = new ReturnDto(); + List list = consultService.selectByUniversityIdAndColumnType(universityConsult.getUniversityId(),universityConsult.getColumnType()); + if(list != null && list.size() > 0){ + result.setSuccess(false); + result.setMessage("同一栏目下，已有该学校招生咨询"); + }else { + int id = consultService.create(universityConsult); + String name = universityService.getById(universityConsult.getUniversityId()).getName(); + dto.setId(id); + dto.setName(name); + result.setData(dto); + } return result ; } @@ -289,9 +301,14 @@ public class AdminController { @MemberAccess @ApiOperation("新建视频相关接口") @RequestMapping(value = "/video/createVideo" , method = RequestMethod.POST) - public BaseDto createVideo(@RequestBody Video video){ - BaseDto result = new BaseDto() ; - videoService.create(video); + public BaseDto createVideo(@RequestBody Video video){ + BaseDto result = new BaseDto() ; + ReturnDto dto = new ReturnDto(); + int id = videoService.create(video); + String name = universityService.getById(video.getUniversityId()).getName(); + dto.setName(name); + dto.setId(id); + result.setData(dto); return result ; } @@ -461,13 +478,14 @@ public class AdminController { @MemberAccess @ApiOperation("新建权威解读(文章广告)相关接口") @RequestMapping(value = "/article/createArticle" , method = RequestMethod.POST) - public BaseDto createArticle(@RequestBody Article article){ - BaseDto result = new BaseDto() ; + public BaseDto createArticle(@RequestBody Article article){ + BaseDto result = new BaseDto() ; if(StringUtils.isBlank(article.getImageUrl())){ result.setSuccess(false); result.setMessage("请上传封面图片"); }else { - articleService.create(article); + int id = articleService.create(article); + result.setData(id); } return result ; } diff --git a/src/main/java/com/sincere/student/dto/ReturnDto.java b/src/main/java/com/sincere/student/dto/ReturnDto.java new file mode 100644 index 0000000..af666f4 --- /dev/null +++ b/src/main/java/com/sincere/student/dto/ReturnDto.java @@ -0,0 +1,23 @@ +package com.sincere.student.dto; + +public class ReturnDto { + + private int id ; + private String name ; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/com/sincere/student/mapper/ArticleMapper.java b/src/main/java/com/sincere/student/mapper/ArticleMapper.java index 68ce72d..d9f3cf1 100644 --- a/src/main/java/com/sincere/student/mapper/ArticleMapper.java +++ b/src/main/java/com/sincere/student/mapper/ArticleMapper.java @@ -20,4 +20,6 @@ public interface ArticleMapper { int delete(int id); int update(Article article); + + Article getAdvert(); } diff --git a/src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java b/src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java index 813e7ea..2ed863e 100644 --- a/src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java +++ b/src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java @@ -24,4 +24,6 @@ public interface UniversityConsultMapper { int updateByPrimaryKeySelective(UniversityConsult record); + List selectByUniversityIdAndColumnType(UniversityConsult consult); + } \ No newline at end of file diff --git a/src/main/java/com/sincere/student/mapper/UniversityMapper.java b/src/main/java/com/sincere/student/mapper/UniversityMapper.java index 75f761a..7031054 100644 --- a/src/main/java/com/sincere/student/mapper/UniversityMapper.java +++ b/src/main/java/com/sincere/student/mapper/UniversityMapper.java @@ -15,6 +15,8 @@ public interface UniversityMapper { int delete(int id); + University getById(int id); + int update(University university); Integer selectByName(String name); diff --git a/src/main/java/com/sincere/student/model/Reply.java b/src/main/java/com/sincere/student/model/Reply.java index 6a33e7a..e5a0a86 100644 --- a/src/main/java/com/sincere/student/model/Reply.java +++ b/src/main/java/com/sincere/student/model/Reply.java @@ -16,6 +16,17 @@ public class Reply { @ApiModelProperty(value = "不用传") private Date createTime; + @ApiModelProperty(value = "相差的时间") + private Long[] distanceTimes ; + + public Long[] getDistanceTimes() { + return distanceTimes; + } + + public void setDistanceTimes(Long[] distanceTimes) { + this.distanceTimes = distanceTimes; + } + public Integer getId() { return id; } diff --git a/src/main/java/com/sincere/student/service/ConsultService.java b/src/main/java/com/sincere/student/service/ConsultService.java index e75e9f0..b37fa6d 100644 --- a/src/main/java/com/sincere/student/service/ConsultService.java +++ b/src/main/java/com/sincere/student/service/ConsultService.java @@ -5,11 +5,15 @@ import com.sincere.student.model.Consult; import com.sincere.student.model.UniversityConsult; import com.sincere.student.utils.Page; +import java.util.List; + public interface ConsultService { Page getList(ConsultSearchDto consultSearchDto); + List selectByUniversityIdAndColumnType(int universityId , int columnType); + Page getColumnList(int columnType ,int page ,int pageSize); Consult getDetail(int id); diff --git a/src/main/java/com/sincere/student/service/UniversityService.java b/src/main/java/com/sincere/student/service/UniversityService.java index 1bf2d72..752d5f2 100644 --- a/src/main/java/com/sincere/student/service/UniversityService.java +++ b/src/main/java/com/sincere/student/service/UniversityService.java @@ -16,6 +16,8 @@ public interface UniversityService { int delete(int id); + University getById(int id); + int update(University university); int addMajor(List list); 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 17db377..092a951 100644 --- a/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Arrays; +import java.util.LinkedList; import java.util.List; @Service @@ -33,7 +34,18 @@ public class ArticleServiceImpl implements ArticleService { article.setImageUrlList(Arrays.asList(urlList)); article.setImageCount(urlList.length); } - result.setList(list); + List
addAdvertList = new ArrayList<>(); + for(int i = 0 ; i < list.size() ;i++){ + addAdvertList.add(list.get(i)); + if(i % 5 ==4){ + Article advert =articleMapper.getAdvert(); + String[] urlList = advert.getImageUrl().split(","); + advert.setImageUrlList(Arrays.asList(urlList)); + advert.setImageCount(urlList.length); + addAdvertList.add(advert); + } + } + result.setList(addAdvertList); result.setCount(articleMapper.getListCount(articleSearchDto)); return result; } @@ -57,7 +69,8 @@ public class ArticleServiceImpl implements ArticleService { if(article.getType() == 1){ article.setColumnType(0); } - return articleMapper.create(article); + articleMapper.create(article); + return article.getId() ; } @Override diff --git a/src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java b/src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java index 192004f..3a4b48d 100644 --- a/src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java @@ -32,6 +32,14 @@ public class ConsultServiceImpl implements ConsultService { ColumnMapper columnMapper ; @Override + public List selectByUniversityIdAndColumnType(int universityId, int columnType) { + UniversityConsult consult = new UniversityConsult(); + consult.setColumnType(columnType); + consult.setUniversityId(universityId); + return universityConsultMapper.selectByUniversityIdAndColumnType(consult); + } + + @Override public Page getList(ConsultSearchDto consultSearchDto) { Page page = new Page<>(consultSearchDto.getPage(),consultSearchDto.getPageSize()); if(StringUtils.isNotBlank(consultSearchDto.getUniversityName())){ @@ -80,7 +88,7 @@ public class ConsultServiceImpl implements ConsultService { detail.setConsultId(consult.getId()); universityConsultDetailMapper.insert(detail); } - return 1 ; + return consult.getId() ; } @Override diff --git a/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java b/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java index 997f16c..1be7d1b 100644 --- a/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java @@ -35,7 +35,11 @@ public class MessageServiceImpl implements MessageService { List list = messageMapper.getList(messageSearchDto) ; for(Message message : list){ message.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),message.getCreateTime())); - message.setList(replyMapper.selectByMessageId(message.getId())); + List replies = replyMapper.selectByMessageId(message.getId()); + for(Reply reply : replies){ + reply.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),reply.getCreateTime())); + } + message.setList(replies); } page.setList(list); page.setCount(messageMapper.getListCount(messageSearchDto)); diff --git a/src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java b/src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java index 1b50509..e559aea 100644 --- a/src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java @@ -56,6 +56,11 @@ public class UniversityServiceImpl implements UniversityService { } @Override + public University getById(int id) { + return universityMapper.getById(id); + } + + @Override public int update(University university) { return universityMapper.update(university); } diff --git a/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java b/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java index dc6aacd..e1b4471 100644 --- a/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java @@ -52,7 +52,8 @@ public class VideoServiceImpl implements VideoService { @Override public int create(Video video) { - return videoMapper.create(video); + videoMapper.create(video); + return video.getId(); } @Override diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 83b362f..66e38c3 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -64,6 +64,10 @@ order by sort + + @@ -72,7 +76,7 @@ select * from university_article where id = #{id} - + insert into university_article (title,column_type,university_id,sort,context,author,image_url,video_url,article_link,good_number,look_number,create_time,type,status) values (#{title},#{columnType},#{universityId},#{sort},#{context},#{author},#{imageUrl},#{videoUrl},#{articleLink},#{goodNumber},#{lookNumber},GETDATE(),#{type},#{status}) diff --git a/src/main/resources/mapper/UniversityConsultMapper.xml b/src/main/resources/mapper/UniversityConsultMapper.xml index 95b71be..ecebfb9 100644 --- a/src/main/resources/mapper/UniversityConsultMapper.xml +++ b/src/main/resources/mapper/UniversityConsultMapper.xml @@ -86,6 +86,11 @@ order by c.sort + + + + + insert into university_info (name,code,university_type,department,province,city,level,create_time,phone,logo_url) values (#{name},#{code},#{universityType},#{department},#{province},#{city},#{level},GETDATE(),#{phone},#{logoUrl}) @@ -80,4 +85,5 @@ + diff --git a/src/main/resources/mapper/UniversityReplyMapper.xml b/src/main/resources/mapper/UniversityReplyMapper.xml index 09684fc..cb931fe 100644 --- a/src/main/resources/mapper/UniversityReplyMapper.xml +++ b/src/main/resources/mapper/UniversityReplyMapper.xml @@ -15,6 +15,7 @@ from university_reply where message_id = #{id,jdbcType=INTEGER} + order by create_time delete from university_reply diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml index 4e4671e..52a6444 100644 --- a/src/main/resources/mapper/VideoMapper.xml +++ b/src/main/resources/mapper/VideoMapper.xml @@ -108,7 +108,7 @@ order by sort - + insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name) values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName}) -- libgit2 0.21.0