bug 修复

陈杰
1 parent 4a51395c
Showing 7 changed files with 65 additions and 27 deletions Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/controller/AppController.java
src/main/java/com/sincere/student/model/Consult.java
src/main/java/com/sincere/student/service/impl/ConsultServiceImpl.java
src/main/java/com/sincere/student/service/impl/MessageServiceImpl.java
src/main/resources/mapper/MajorMapper.xml
src/main/resources/mapper/UniversityConsultMapper.xml
@@ -14,9 +14,10 @@ import com.sincere.student.utils.TokenUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.List;
@@ -523,8 +524,12 @@ public class AdminController {
             temp.setUrlLink(dto.getUrlLink());
             advertService.create(temp);
         }else {
-            advert.setImgUrl(dto.getUrl());
-            advert.setUrlLink(dto.getUrlLink());
+            if(StringUtils.isNotBlank(dto.getUrl())){
+                advert.setImgUrl(dto.getUrl());
+            }
+            if(StringUtils.isNotBlank(dto.getUrlLink())){
+                advert.setUrlLink(dto.getUrlLink());
+            }
             advertService.update(advert);
         }
         return new BaseDto() ;
@@ -9,10 +9,12 @@ import com.sincere.student.enums.ParameterUtils;
 import com.sincere.student.model.*;
 import com.sincere.student.service.*;
 import com.sincere.student.utils.Page;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.List;
@@ -214,6 +216,7 @@ public class AppController {
         return result ;
     }
+
     @ApiOperation(" 点赞 权威解读(文章广告)相关接口")
     @RequestMapping(value = "/article/good" , method = RequestMethod.POST)
     public BaseDto good(@RequestBody IdDto idDto){
@@ -257,14 +260,6 @@ public class AppController {
         return result ;
     }
-//    @ApiOperation("留言板详情，管理回复 接口")
-//    @RequestMapping(value = "/message/getDetail" , method = RequestMethod.POST)
-//    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto){
-//        BaseDto<Message> result = new BaseDto<>();
-//        result.setData(messageService.getDetail(idDto.getId()));
-//        return result ;
-//    }
-
     @ApiOperation("留言")
     @RequestMapping(value = "/message/create" , method = RequestMethod.POST)
     public BaseDto insertMessage(@RequestBody Message message){
@@ -272,6 +267,14 @@ public class AppController {
         return new BaseDto();
     }
+    @ApiOperation("留言详情")
+    @RequestMapping(value = "/message/detail" , method = RequestMethod.POST)
+    public BaseDto<Message> insertMessage(@RequestBody IdDto idDto){
+        BaseDto<Message> result = new BaseDto<>();
+        result.setData(messageService.getDetail(idDto.getId()));
+        return result;
+    }
+
     @ApiOperation("获取视频相关接口")
     @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
@@ -306,12 +309,12 @@ public class AppController {
     @ApiOperation("投档线首页列表接口")
     @RequestMapping(value = "/submit/getSubmitList" , method = RequestMethod.POST)
-    public BaseDto<Page<SubmitLine>> getSubmitList(@RequestBody PageDto pageDto){
-        BaseDto<Page<SubmitLine>> result = new BaseDto<>();
-        PointSearchDto pointSearchDto = new PointSearchDto();
+    public BaseDto<Page<SubmitFile>> getSubmitList(@RequestBody PageDto pageDto){
+        BaseDto<Page<SubmitFile>> result = new BaseDto<>();
+        MessageSearchDto pointSearchDto = new MessageSearchDto();
         pointSearchDto.setPage(pageDto.getPage());
         pointSearchDto.setPageSize(pageDto.getPageSize());
-        result.setData(submitService.getAppList(pointSearchDto));
+        result.setData(submitService.getAdminList(pointSearchDto));
         return result ;
     }
@@ -321,7 +324,7 @@ public class AppController {
         BaseDto<SubmitLine> result = new BaseDto<>();
         PointSearchDto pointSearchDto = new PointSearchDto();
         pointSearchDto.setPage(1);
-        pointSearchDto.setPageSize(1);
+        pointSearchDto.setPageSize(9999);
         pointSearchDto.setSubmitId(idDto.getId());
         result.setData(submitService.getAppList(pointSearchDto).getList().get(0));
         return result ;
@@ -23,6 +23,8 @@ public class Consult {
     private String code ;
     @ApiModelProperty(value = "栏目分类")
     private Integer columnType;
+    @ApiModelProperty(value = "栏目分类名称")
+    private String columnTypeName;
     @ApiModelProperty(value = "视频地址")
     private String videoUrl;
     @ApiModelProperty(value = "内容")
@@ -34,6 +36,14 @@ public class Consult {
     @ApiModelProperty(value = "4个栏目")
     private List<UniversityConsultDetail> list ;
+    public String getColumnTypeName() {
+        return columnTypeName;
+    }
+
+    public void setColumnTypeName(String columnTypeName) {
+        this.columnTypeName = columnTypeName;
+    }
+
     public Integer getStatus() {
         return status;
     }
 package com.sincere.student.service.impl;
 import com.github.pagehelper.PageHelper;
+import com.sincere.student.dto.ColumnDto;
 import com.sincere.student.dto.ConsultSearchDto;
+import com.sincere.student.enums.ColumnEnums;
+import com.sincere.student.mapper.ColumnMapper;
 import com.sincere.student.mapper.UniversityConsultDetailMapper;
 import com.sincere.student.mapper.UniversityConsultMapper;
+import com.sincere.student.model.ColumnType;
 import com.sincere.student.model.Consult;
 import com.sincere.student.model.UniversityConsult;
 import com.sincere.student.model.UniversityConsultDetail;
@@ -13,6 +17,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 @Service
 public class ConsultServiceImpl implements ConsultService {
@@ -22,6 +28,8 @@ public class ConsultServiceImpl implements ConsultService {
     @Autowired
     UniversityConsultDetailMapper universityConsultDetailMapper ;
+    @Autowired
+    ColumnMapper columnMapper ;
     @Override
     public Page<Consult> getList(ConsultSearchDto consultSearchDto) {
@@ -33,7 +41,18 @@ public class ConsultServiceImpl implements ConsultService {
             consultSearchDto.setMajorName("%"+consultSearchDto.getMajorName()+"%");
         }
         PageHelper.startPage(consultSearchDto.getPage(),consultSearchDto.getPageSize());
-        page.setList(universityConsultMapper.getList(consultSearchDto));
+        List<Consult> list =universityConsultMapper.getList(consultSearchDto) ;
+        ColumnDto columnDto = new ColumnDto();
+        columnDto.setType(ColumnEnums.university.getType());
+        List<ColumnType> columnTypes = columnMapper.getList(columnDto);
+        for(Consult consult : list){
+            for(ColumnType columnType :columnTypes){
+                if(consult.getColumnType() == columnType.getId()){
+                    consult.setColumnTypeName(columnType.getName());
+                }
+            }
+        }
+        page.setList(list);
         page.setCount(universityConsultMapper.getListCount(consultSearchDto));
         return page;
     }
@@ -35,6 +35,7 @@ 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()));
         }
         page.setList(list);
         page.setCount(messageMapper.getListCount(messageSearchDto));
@@ -72,7 +72,6 @@
                 select f.id as f_id , f.major as f_major , s.id as s_id  , s.major as s_major from
          university_major s
 				join university_major f on f.id = s.p_id
-				join university_relate_major r on s.id = r.major_id
     </select>
 </mapper>
@@ -4,6 +4,7 @@
   <resultMap id="ListMap" type="com.sincere.student.model.Consult">
     <result column="id" property="id" />
+    <result column="column_type" property="columnType" />
     <result column="universityId" property="universityId" />
     <result column="name"  property="name" />
     <result column="code" property="code" />
@@ -15,8 +16,8 @@
   <select id="getListCount" parameterType="com.sincere.student.dto.ConsultSearchDto" resultType="java.lang.Integer">
     select count(DISTINCT c.id) from university_consult c
     join university_info info on c.university_id = info.id
-    join university_relate_major r on info.id = r.university_id
-    join university_major m on m.id = r.major_id
+    left join university_relate_major r on info.id = r.university_id
+    left join university_major m on m.id = r.major_id
     <where>
       <if test="columnType > 0">
         and c.column_type = #{columnType}
@@ -49,10 +50,10 @@
   </select>
   <select id="getList" parameterType="com.sincere.student.dto.ConsultSearchDto" resultMap="ListMap">
-    select DISTINCT c.id , info.id as universityId , c.img_url ,c.sort , info.name , info.code ,c.status from university_consult c
+    select DISTINCT c.id , c.column_type , info.id as universityId , c.img_url ,c.sort , info.name , info.code ,c.status from university_consult c
     join university_info info on c.university_id = info.id
-    join university_relate_major r on info.id = r.university_id
-    join university_major m on m.id = r.major_id
+    left join university_relate_major r on info.id = r.university_id
+    left join university_major m on m.id = r.major_id
     <where>
       <if test="columnType > 0">
         and c.column_type = #{columnType}
	@@ -72,7 +72,6 @@		@@ -72,7 +72,6 @@
72	select f.id as f_id , f.major as f_major , s.id as s_id , s.major as s_major from	72	select f.id as f_id , f.major as f_major , s.id as s_id , s.major as s_major from
73	university_major s	73	university_major s
74	join university_major f on f.id = s.p_id	74	join university_major f on f.id = s.p_id
75	- join university_relate_major r on s.id = r.major_id
76		75
77	</select>	76	</select>
78	</mapper>	77	</mapper>