bug 修复

陈杰
1 parent d10218de
Showing 18 changed files with 127 additions and 16 deletions Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/dto/ReturnDto.java
src/main/java/com/sincere/student/mapper/ArticleMapper.java
src/main/java/com/sincere/student/mapper/UniversityConsultMapper.java
src/main/java/com/sincere/student/mapper/UniversityMapper.java
src/main/java/com/sincere/student/model/Reply.java
src/main/java/com/sincere/student/service/ConsultService.java
src/main/java/com/sincere/student/service/UniversityService.java
src/main/java/com/sincere/student/service/impl/ArticleServiceImpl.java
src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java
src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java
src/main/java/com/sincere/student/service/impl/UniversityServiceImpl.java
src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
src/main/resources/mapper/ArticleMapper.xml
src/main/resources/mapper/UniversityConsultMapper.xml
src/main/resources/mapper/UniversityMapper.xml
src/main/resources/mapper/UniversityReplyMapper.xml
src/main/resources/mapper/VideoMapper.xml
@@ -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<ReturnDto> createConsult(@RequestBody UniversityConsult universityConsult){
+        BaseDto<ReturnDto> result = new BaseDto() ;
+        ReturnDto dto = new ReturnDto();
+        List<Consult> 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<ReturnDto> createVideo(@RequestBody Video video){
+        BaseDto<ReturnDto> 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<Integer> createArticle(@RequestBody Article article){
+        BaseDto<Integer> 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 ;
     }
@@ -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;
+    }
+}
@@ -20,4 +20,6 @@ public interface ArticleMapper {
     int delete(int id);
     int update(Article article);
+
+    Article getAdvert();
 }
@@ -24,4 +24,6 @@ public interface UniversityConsultMapper {
     int updateByPrimaryKeySelective(UniversityConsult record);
+    List<Consult> selectByUniversityIdAndColumnType(UniversityConsult consult);
+
 }
 \ No newline at end of file
@@ -15,6 +15,8 @@ public interface UniversityMapper {
     int delete(int id);
+    University getById(int id);
+
     int update(University university);
     Integer selectByName(String name);
@@ -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;
     }
@@ -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<Consult> getList(ConsultSearchDto consultSearchDto);
+    List<Consult> selectByUniversityIdAndColumnType(int universityId , int columnType);
+
     Page<Consult> getColumnList(int columnType ,int page ,int pageSize);
     Consult getDetail(int id);
@@ -16,6 +16,8 @@ public interface UniversityService {
     int delete(int id);
+    University getById(int id);
+
     int update(University university);
     int addMajor(List<UniversityMajor> list);
@@ -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<Article> 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
@@ -32,6 +32,14 @@ public class ConsultServiceImpl implements ConsultService {
     ColumnMapper columnMapper ;
     @Override
+    public List<Consult> selectByUniversityIdAndColumnType(int universityId, int columnType) {
+        UniversityConsult consult = new UniversityConsult();
+        consult.setColumnType(columnType);
+        consult.setUniversityId(universityId);
+        return universityConsultMapper.selectByUniversityIdAndColumnType(consult);
+    }
+
+    @Override
     public Page<Consult> getList(ConsultSearchDto consultSearchDto) {
         Page<Consult> 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
@@ -35,7 +35,11 @@ public class MessageServiceImpl implements MessageService {
         List<Message> list = messageMapper.getList(messageSearchDto) ;
         for(Message message : list){
             message.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),message.getCreateTime()));
-            message.setList(replyMapper.selectByMessageId(message.getId()));
+            List<Reply> 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));
@@ -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);
     }
@@ -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
@@ -64,6 +64,10 @@
          order by sort
     </select>
+    <select id="getAdvert" resultMap="ArticleMap">
+        select top 1 * from university_article  where type = 1 ORDER BY NEWID()
+    </select>
+
     <select id="getRelationList" parameterType="java.lang.Integer" resultMap="ArticleMap">
         select top 3 * from university_article where university_id = #{universityId}
     </select>
@@ -72,7 +76,7 @@
         select * from university_article where id = #{id}
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Article" >
+    <insert id="create" parameterType="com.sincere.student.model.Article"  useGeneratedKeys="true" keyProperty="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})
     </insert>
@@ -86,6 +86,11 @@
     order by c.sort
   </select>
+  <select id="selectByUniversityIdAndColumnType" parameterType="com.sincere.student.model.UniversityConsult" resultMap="DetailMap">
+    select * from university_consult
+    where university_id =#{universityId} and column_type = #{columnType}
+  </select>
+
   <select id="getColumnListCount" parameterType="java.lang.Integer" resultType="java.lang.Integer">
     select count(DISTINCT c.id) from university_consult c
     join university_info info on c.university_id = info.id
@@ -34,6 +34,11 @@
         </where>
     </select>
+
+    <select id="getById" parameterType="java.lang.Integer" resultMap="UniversityMap">
+        select * from university_info where id = #{id}
+    </select>
+
     <insert id="create" parameterType="com.sincere.student.model.University" >
         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 @@
     <select id="selectByName" parameterType="java.lang.String" resultType="java.lang.Integer">
         select id from university_info where name = #{name}
     </select>
+
 </mapper>
@@ -15,6 +15,7 @@
     <include refid="Base_Column_List" />
     from university_reply
     where message_id = #{id,jdbcType=INTEGER}
+    order by create_time
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from university_reply
@@ -108,7 +108,7 @@
          order by sort
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Video" >
+    <insert id="create" parameterType="com.sincere.student.model.Video"  useGeneratedKeys="true" keyProperty="id">
         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})
     </insert>
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+package com.sincere.student.dto;
	2	+
	3	+public class ReturnDto {
	4	+
	5	+ private int id ;
	6	+ private String name ;
	7	+
	8	+ public int getId() {
	9	+ return id;
	10	+ }
	11	+
	12	+ public void setId(int id) {
	13	+ this.id = id;
	14	+ }
	15	+
	16	+ public String getName() {
	17	+ return name;
	18	+ }
	19	+
	20	+ public void setName(String name) {
	21	+ this.name = name;
	22	+ }
	23	+}
	@@ -20,4 +20,6 @@ public interface ArticleMapper {		@@ -20,4 +20,6 @@ public interface ArticleMapper {
20	int delete(int id);	20	int delete(int id);
21		21
22	int update(Article article);	22	int update(Article article);
		23	+
		24	+ Article getAdvert();
23	}	25	}
	@@ -24,4 +24,6 @@ public interface UniversityConsultMapper {		@@ -24,4 +24,6 @@ public interface UniversityConsultMapper {
24		24
25	int updateByPrimaryKeySelective(UniversityConsult record);	25	int updateByPrimaryKeySelective(UniversityConsult record);
26		26
		27	+ List<Consult> selectByUniversityIdAndColumnType(UniversityConsult consult);
		28	+
27	}	29	}
28	\ No newline at end of file	30	\ No newline at end of file
	@@ -15,6 +15,8 @@ public interface UniversityMapper {		@@ -15,6 +15,8 @@ public interface UniversityMapper {
15		15
16	int delete(int id);	16	int delete(int id);
17		17
		18	+ University getById(int id);
		19	+
18	int update(University university);	20	int update(University university);
19		21
20	Integer selectByName(String name);	22	Integer selectByName(String name);
	@@ -16,6 +16,17 @@ public class Reply {		@@ -16,6 +16,17 @@ public class Reply {
16	@ApiModelProperty(value = "不用传")	16	@ApiModelProperty(value = "不用传")
17	private Date createTime;	17	private Date createTime;
18		18
		19	+ @ApiModelProperty(value = "相差的时间")
		20	+ private Long[] distanceTimes ;
		21	+
		22	+ public Long[] getDistanceTimes() {
		23	+ return distanceTimes;
		24	+ }
		25	+
		26	+ public void setDistanceTimes(Long[] distanceTimes) {
		27	+ this.distanceTimes = distanceTimes;
		28	+ }
		29	+
19	public Integer getId() {	30	public Integer getId() {
20	return id;	31	return id;
21	}	32	}
	@@ -16,6 +16,8 @@ public interface UniversityService {		@@ -16,6 +16,8 @@ public interface UniversityService {
16		16
17	int delete(int id);	17	int delete(int id);
18		18
		19	+ University getById(int id);
		20	+
19	int update(University university);	21	int update(University university);
20		22
21	int addMajor(List<UniversityMajor> list);	23	int addMajor(List<UniversityMajor> list);
	@@ -52,7 +52,8 @@ public class VideoServiceImpl implements VideoService {		@@ -52,7 +52,8 @@ public class VideoServiceImpl implements VideoService {
52		52
53	@Override	53	@Override
54	public int create(Video video) {	54	public int create(Video video) {
55	- return videoMapper.create(video);	55	+ videoMapper.create(video);
		56	+ return video.getId();
56	}	57	}
57		58
58	@Override	59	@Override
	@@ -108,7 +108,7 @@		@@ -108,7 +108,7 @@
108	order by sort	108	order by sort
109	</select>	109	</select>
110		110
111	- <insert id="create" parameterType="com.sincere.student.model.Video" >	111	+ <insert id="create" parameterType="com.sincere.student.model.Video" useGeneratedKeys="true" keyProperty="id">
112	insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name)	112	insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name)
113	values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName})	113	values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName})
114	</insert>	114	</insert>