From b246a387b84e8f04941da634e08efad03e1ae87c Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Wed, 18 Mar 2020 14:23:58 +0800
Subject: [PATCH] bug 修复

---
 pom.xml                                                               | 32 +++++++++++++++++++++++---------
 src/main/java/com/sincere/student/controller/AdminController.java     | 13 ++++++++++++-
 src/main/java/com/sincere/student/controller/AppController.java       | 55 +++++++++++++++++++++++++++++--------------------------
 src/main/java/com/sincere/student/dto/VideoSearchDto.java             | 21 ++++++++++++++++-----
 src/main/java/com/sincere/student/mapper/VideoMapper.java             |  4 ++++
 src/main/java/com/sincere/student/model/Advert.java                   | 18 +++++++++++++++++-
 src/main/java/com/sincere/student/model/ColumnType.java               |  3 ++-
 src/main/java/com/sincere/student/model/Consult.java                  | 10 ++++++++++
 src/main/java/com/sincere/student/model/University.java               | 10 ++++++++++
 src/main/java/com/sincere/student/model/Video.java                    | 30 ++++++++++++++++++++----------
 src/main/java/com/sincere/student/service/AdvertService.java          |  2 +-
 src/main/java/com/sincere/student/service/VideoService.java           |  4 ++++
 src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java |  4 +++-
 src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java  | 12 ++++++++++++
 src/main/java/com/sincere/student/utils/RedisConfig.java              | 36 ++++++++++++++++++++++++++++++++++++
 src/main/resources/application.yaml                                   | 26 ++++++++++++--------------
 src/main/resources/logback.xml                                        | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/resources/mapper/UniversityConsultMapper.xml                 |  2 +-
 src/main/resources/mapper/UniversityMapper.xml                        |  8 ++++++--
 src/main/resources/mapper/VideoMapper.xml                             | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 20 files changed, 369 insertions(+), 81 deletions(-)
 create mode 100644 src/main/java/com/sincere/student/utils/RedisConfig.java
 create mode 100644 src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index a8efe2d..e5c7e47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,27 @@
     <artifactId>enrollStudent</artifactId>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--            <version>2.2.1.RELEASE</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.commons</groupId>-->
+<!--            <artifactId>commons-pool2</artifactId>-->
+<!--            <version>2.4.2</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
@@ -47,11 +68,7 @@
             <artifactId>nimbus-jose-jwt</artifactId>
             <version>6.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -67,10 +84,7 @@
             <artifactId>mssql-jdbc</artifactId>
             <version>6.4.0.jre8</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java
index 32b4afe..bdff068 100644
--- a/src/main/java/com/sincere/student/controller/AdminController.java
+++ b/src/main/java/com/sincere/student/controller/AdminController.java
@@ -14,6 +14,8 @@ 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 java.util.ArrayList;
@@ -544,6 +546,15 @@ public class AdminController {
     }
 
     @MemberAccess
+    @ApiOperation("获取详情 栏目")
+    @RequestMapping(value = "/column/getDetail" , method = RequestMethod.POST)
+    public BaseDto createColumn(@RequestBody IdDto idDto){
+        BaseDto result = new BaseDto() ;
+        ColumnType c = columnService.selectDetail(idDto.getId());
+        return result ;
+    }
+
+    @MemberAccess
     @ApiOperation("更新栏目（type : 1 文章 2学校 3视频）")
     @RequestMapping(value = "/column/update" , method = RequestMethod.POST)
     public BaseDto updateColumn(@RequestBody ColumnType columnType){
@@ -586,7 +597,7 @@ public class AdminController {
             }
         }else if(columnType.getType() == ColumnEnums.video.getType()){
             VideoSearchDto videoSearchDto = new VideoSearchDto();
-            videoSearchDto.setColumnTypeId(columnType.getId());
+            videoSearchDto.setColumnType(columnType.getId());
             videoSearchDto.setPage(1);
             videoSearchDto.setPageSize(10);
             Page<Video> videoPage = videoService.getList(videoSearchDto);
diff --git a/src/main/java/com/sincere/student/controller/AppController.java b/src/main/java/com/sincere/student/controller/AppController.java
index 40c4214..432f7ff 100644
--- a/src/main/java/com/sincere/student/controller/AppController.java
+++ b/src/main/java/com/sincere/student/controller/AppController.java
@@ -159,10 +159,10 @@ public class AppController {
     }
 
     @ApiOperation("获取招生咨询会详情相关接口")
-    @RequestMapping(value = "/consult/getDetail/{id}" , method = RequestMethod.POST)
-    public BaseDto<Consult> getConsultDetail(@PathVariable("id") int id){
+    @RequestMapping(value = "/consult/getDetail" , method = RequestMethod.POST)
+    public BaseDto<Consult> getConsultDetail(@RequestBody IdDto id){
         BaseDto<Consult> result = new BaseDto<>() ;
-        result.setData(consultService.getDetail(id));
+        result.setData(consultService.getDetail(id.getId()));
         return result ;
     }
 
@@ -170,9 +170,10 @@ public class AppController {
      * 栏目相关接口
      */
     @ApiOperation("获取栏目列表（1 文章 2学校 3视频）")
-    @RequestMapping(value = "/column/getList/{type}" , method = RequestMethod.POST)
-    public BaseDto<List<ColumnType>> getColumnList(@PathVariable("type") int type){
+    @RequestMapping(value = "/column/getList" , method = RequestMethod.POST)
+    public BaseDto<List<ColumnType>> getColumnList(@RequestBody IdDto idDto){
         BaseDto<List<ColumnType>> result = new BaseDto<>();
+        int type = idDto.getId();
         ColumnEnums columnEnums = ColumnEnums.getByType(type);
         if(columnEnums != null){
             ColumnDto columnDto = new ColumnDto() ;
@@ -199,36 +200,36 @@ public class AppController {
         return result ;
     }
 
-    @ApiOperation("获取权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/getDetail/{id}" , method = RequestMethod.POST)
-    public BaseDto<Article> getDetail(@PathVariable("id") int id){
+    @ApiOperation("获取权威解读(文章广告)详情相关接口")
+    @RequestMapping(value = "/article/getDetail" , method = RequestMethod.POST)
+    public BaseDto<Article> getDetail(@RequestBody IdDto idDto){
         BaseDto<Article> result = new BaseDto<>() ;
-        Article article = articleService.selectById(id) ;
+        Article article = articleService.selectById(idDto.getId()) ;
         result.setData(article);
         Article temp = new Article();
-        temp.setId(id);
+        temp.setId(idDto.getId());
         temp.setLookNumber(article.getLookNumber()+1);
         articleService.update(temp);
         return result ;
     }
 
     @ApiOperation(" 点赞 权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/good/{id}" , method = RequestMethod.POST)
-    public BaseDto good(@PathVariable("id") int id){
+    @RequestMapping(value = "/article/good" , method = RequestMethod.POST)
+    public BaseDto good(@RequestBody IdDto idDto){
         BaseDto result = new BaseDto<>() ;
-        Article article = articleService.selectById(id) ;
+        Article article = articleService.selectById(idDto.getId()) ;
         Article temp = new Article();
-        temp.setId(id);
+        temp.setId(idDto.getId());
         temp.setGoodNumber(article.getGoodNumber()+1);
         articleService.update(temp);
         return result ;
     }
 
-    @ApiOperation("获取权威解读(文章广告) 相关咨询 相关接口")
-    @RequestMapping(value = "/article/getRelation/{universityId}" , method = RequestMethod.POST)
-    public BaseDto<List<Article>> getRelation(@PathVariable("universityId") int universityId){
+    @ApiOperation("获取权威解读(文章广告) 相关咨询 相关接口 传学校id")
+    @RequestMapping(value = "/article/getRelation" , method = RequestMethod.POST)
+    public BaseDto<List<Article>> getRelation(@RequestBody IdDto idDto){
         BaseDto<List<Article>> result = new BaseDto<>() ;
-        result.setData(articleService.getRelationList(universityId));
+        result.setData(articleService.getRelationList(idDto.getId()));
         return result ;
     }
 
@@ -255,10 +256,10 @@ public class AppController {
     }
 
     @ApiOperation("留言板详情，管理回复 接口")
-    @RequestMapping(value = "/message/getDetail/{id}" , method = RequestMethod.POST)
-    public BaseDto<Message> getMessageDetail(@PathVariable("id") int id){
+    @RequestMapping(value = "/message/getDetail" , method = RequestMethod.POST)
+    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto){
         BaseDto<Message> result = new BaseDto<>();
-        result.setData(messageService.getDetail(id));
+        result.setData(messageService.getDetail(idDto.getId()));
         return result ;
     }
 
@@ -275,16 +276,18 @@ public class AppController {
     public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
         BaseDto<Page<Video>> result = new BaseDto<>() ;
         videoSearchDto.setStatus(1);
-        Page<Video> page = videoService.getList(videoSearchDto);
+        Page<Video> page = videoService.getUniversityList(videoSearchDto);
         result.setData(page);
         return result ;
     }
 
     @ApiOperation("获取视频相关接口")
-    @RequestMapping(value = "/video/getDetail/{id}" , method = RequestMethod.POST)
-    public BaseDto<Video> getVideoDetail(@PathVariable ("id") int id){
-        BaseDto<Video> result = new BaseDto<>() ;
-        result.setData(videoService.getDetail(id));
+    @RequestMapping(value = "/video/getDetail" , method = RequestMethod.POST)
+    public BaseDto<Page<Video>> getVideoDetail(@RequestBody VideoSearchDto videoSearchDto){
+        BaseDto<Page<Video>> result = new BaseDto<>() ;
+        videoSearchDto.setStatus(1);
+        Page<Video> page = videoService.getList(videoSearchDto);
+        result.setData(page);
         return result ;
     }
 
diff --git a/src/main/java/com/sincere/student/dto/VideoSearchDto.java b/src/main/java/com/sincere/student/dto/VideoSearchDto.java
index 7687679..3af3410 100644
--- a/src/main/java/com/sincere/student/dto/VideoSearchDto.java
+++ b/src/main/java/com/sincere/student/dto/VideoSearchDto.java
@@ -7,13 +7,23 @@ import io.swagger.annotations.ApiModelProperty;
 public class VideoSearchDto extends PageDto {
 
     @ApiModelProperty(value = "视频栏目主键")
-    private int columnTypeId ;
+    private int columnType ;
 
     @ApiModelProperty(value = "查询名称")
     private String universityName ;
+    @ApiModelProperty(value = "学校主键")
+    private int universityId ;
     @ApiModelProperty(value = "状态 0预览1发布 都不用传")
     private int status ;
 
+    public int getUniversityId() {
+        return universityId;
+    }
+
+    public void setUniversityId(int universityId) {
+        this.universityId = universityId;
+    }
+
     public int getStatus() {
         return status;
     }
@@ -21,12 +31,13 @@ public class VideoSearchDto extends PageDto {
     public void setStatus(int status) {
         this.status = status;
     }
-    public int getColumnTypeId() {
-        return columnTypeId;
+
+    public int getColumnType() {
+        return columnType;
     }
 
-    public void setColumnTypeId(int columnTypeId) {
-        this.columnTypeId = columnTypeId;
+    public void setColumnType(int columnType) {
+        this.columnType = columnType;
     }
 
     public String getUniversityName() {
diff --git a/src/main/java/com/sincere/student/mapper/VideoMapper.java b/src/main/java/com/sincere/student/mapper/VideoMapper.java
index 651e860..1cc1011 100644
--- a/src/main/java/com/sincere/student/mapper/VideoMapper.java
+++ b/src/main/java/com/sincere/student/mapper/VideoMapper.java
@@ -11,6 +11,10 @@ public interface VideoMapper {
 
     List<Video> getList(VideoSearchDto dto);
 
+    int getUniversityListCount(VideoSearchDto dto);
+
+    List<Video> getUniversityList(VideoSearchDto dto);
+
     int create(Video video);
 
     int update(Video video);
diff --git a/src/main/java/com/sincere/student/model/Advert.java b/src/main/java/com/sincere/student/model/Advert.java
index 0e6615e..e35d7cc 100644
--- a/src/main/java/com/sincere/student/model/Advert.java
+++ b/src/main/java/com/sincere/student/model/Advert.java
@@ -3,11 +3,13 @@ package com.sincere.student.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @ApiModel
-public class Advert {
+public class Advert implements Serializable {
 
+    private static final long serialVersionUID = 765348013299664647L;
     @ApiModelProperty(value = "主键 , 新增接口不用传")
     private int id ;
     @ApiModelProperty(value = "广告类型 1：开屏 2:banner  所有接口不用传")
@@ -88,4 +90,18 @@ public class Advert {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    @Override
+    public String toString() {
+        return "Advert{" +
+                "id=" + id +
+                ", type=" + type +
+                ", imgUrl='" + imgUrl + '\'' +
+                ", urlLink='" + urlLink + '\'' +
+                ", sort=" + sort +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", title='" + title + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/com/sincere/student/model/ColumnType.java b/src/main/java/com/sincere/student/model/ColumnType.java
index 410b586..203ef80 100644
--- a/src/main/java/com/sincere/student/model/ColumnType.java
+++ b/src/main/java/com/sincere/student/model/ColumnType.java
@@ -3,10 +3,11 @@ package com.sincere.student.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @ApiModel
-public class ColumnType {
+public class ColumnType implements Serializable {
 
     @ApiModelProperty(value = "主键 , 新增接口不用传")
     private int id ;
diff --git a/src/main/java/com/sincere/student/model/Consult.java b/src/main/java/com/sincere/student/model/Consult.java
index 8ff6983..e5a9744 100644
--- a/src/main/java/com/sincere/student/model/Consult.java
+++ b/src/main/java/com/sincere/student/model/Consult.java
@@ -29,9 +29,19 @@ public class Consult {
     private String context;
     @ApiModelProperty(value = "联系方式")
     private String phone;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
     @ApiModelProperty(value = "4个栏目")
     private List<UniversityConsultDetail> list ;
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public int getId() {
         return id;
     }
diff --git a/src/main/java/com/sincere/student/model/University.java b/src/main/java/com/sincere/student/model/University.java
index 351e5cc..6b5fd54 100644
--- a/src/main/java/com/sincere/student/model/University.java
+++ b/src/main/java/com/sincere/student/model/University.java
@@ -27,11 +27,21 @@ public class University {
     private String level ;
     @ApiModelProperty(value = "联系方式")
     private String phone ;
+    @ApiModelProperty(value = "logo")
+    private String logoUrl ;
     @ApiModelProperty(value = "创建时间")
     private Date createTime ;
     @ApiModelProperty(value = "专业列表,展示用")
     private List<String> majorList ;
 
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
     public String getPhone() {
         return phone;
     }
diff --git a/src/main/java/com/sincere/student/model/Video.java b/src/main/java/com/sincere/student/model/Video.java
index d953a1b..f7ba908 100644
--- a/src/main/java/com/sincere/student/model/Video.java
+++ b/src/main/java/com/sincere/student/model/Video.java
@@ -21,11 +21,21 @@ public class Video {
     @ApiModelProperty(value = "创建时间")
     private Date createTime ;
     @ApiModelProperty(value = "学校名称  展示用")
-    private String universityName;
+    private String name;
     @ApiModelProperty(value = "学校编码  展示用")
-    private String universityCode;
+    private String code;
     @ApiModelProperty(value = "状态 0预览1发布")
     private int status ;
+    @ApiModelProperty(value = "图片地址")
+    private int imgUrl ;
+
+    public int getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(int imgUrl) {
+        this.imgUrl = imgUrl;
+    }
 
     public int getStatus() {
         return status;
@@ -35,20 +45,20 @@ public class Video {
         this.status = status;
     }
 
-    public String getUniversityCode() {
-        return universityCode;
+    public String getName() {
+        return name;
     }
 
-    public void setUniversityCode(String universityCode) {
-        this.universityCode = universityCode;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getUniversityName() {
-        return universityName;
+    public String getCode() {
+        return code;
     }
 
-    public void setUniversityName(String universityName) {
-        this.universityName = universityName;
+    public void setCode(String code) {
+        this.code = code;
     }
 
     public int getId() {
diff --git a/src/main/java/com/sincere/student/service/AdvertService.java b/src/main/java/com/sincere/student/service/AdvertService.java
index 926096e..f718abf 100644
--- a/src/main/java/com/sincere/student/service/AdvertService.java
+++ b/src/main/java/com/sincere/student/service/AdvertService.java
@@ -12,7 +12,7 @@ public interface AdvertService {
 
     Advert getDetail(int id);
 
-    int create(Advert advert);
+    Integer create(Advert advert);
 
     int delete(int id);
 
diff --git a/src/main/java/com/sincere/student/service/VideoService.java b/src/main/java/com/sincere/student/service/VideoService.java
index c830d5f..18e49e3 100644
--- a/src/main/java/com/sincere/student/service/VideoService.java
+++ b/src/main/java/com/sincere/student/service/VideoService.java
@@ -4,8 +4,12 @@ import com.sincere.student.dto.VideoSearchDto;
 import com.sincere.student.model.Video;
 import com.sincere.student.utils.Page;
 
+import java.util.List;
+
 public interface VideoService {
 
+    Page<Video> getUniversityList(VideoSearchDto dto);
+
     Page<Video> getList(VideoSearchDto dto);
 
     Video getDetail(int id);
diff --git a/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java b/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
index 4060b29..c242e82 100644
--- a/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
@@ -5,6 +5,8 @@ import com.sincere.student.mapper.AdvertMapper;
 import com.sincere.student.model.Advert;
 import com.sincere.student.service.AdvertService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -36,7 +38,7 @@ public class AdvertServiceImpl implements AdvertService {
     }
 
     @Override
-    public int create(Advert advert) {
+    public Integer create(Advert advert) {
         return advertMapper.create(advert);
     }
 
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 0bab2a7..9f435df 100644
--- a/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/VideoServiceImpl.java
@@ -18,6 +18,18 @@ public class VideoServiceImpl implements VideoService {
     VideoMapper videoMapper ;
 
     @Override
+    public Page<Video> getUniversityList(VideoSearchDto dto) {
+        Page<Video> page = new Page<>(dto.getPage(),dto.getPageSize());
+        if(StringUtils.isNotBlank(dto.getUniversityName())){
+            dto.setUniversityName("%"+dto.getUniversityName()+"%");
+        }
+        PageHelper.startPage(dto.getPage(),dto.getPageSize());
+        page.setList(videoMapper.getUniversityList(dto));
+        page.setCount(videoMapper.getUniversityListCount(dto));
+        return page;
+    }
+
+    @Override
     public Page<Video> getList(VideoSearchDto dto) {
         Page<Video> page = new Page<>(dto.getPage(),dto.getPageSize());
         if(StringUtils.isNotBlank(dto.getUniversityName())){
diff --git a/src/main/java/com/sincere/student/utils/RedisConfig.java b/src/main/java/com/sincere/student/utils/RedisConfig.java
new file mode 100644
index 0000000..042b9d4
--- /dev/null
+++ b/src/main/java/com/sincere/student/utils/RedisConfig.java
@@ -0,0 +1,36 @@
+//package com.sincere.student.utils;
+//
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.data.redis.connection.RedisConnectionFactory;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+//import org.springframework.data.redis.serializer.RedisSerializer;
+//import org.springframework.data.redis.serializer.StringRedisSerializer;
+//
+//@Configuration
+//public class RedisConfig {
+//
+//    @Bean(name = "redisTemplate")
+//    public RedisTemplate<String,Object> redisTemplate(RedisConnectionFactory redisConnectionFactory){
+//
+//        RedisTemplate<String,Object> redisTemplate = new RedisTemplate<>();
+//        //参照StringRedisTemplate内部实现指定序列化器
+//        redisTemplate.setConnectionFactory(redisConnectionFactory);
+//        redisTemplate.setKeySerializer(keySerializer());
+//        redisTemplate.setHashKeySerializer(keySerializer());
+//        redisTemplate.setValueSerializer(valueSerializer());
+//        redisTemplate.setHashValueSerializer(valueSerializer());
+//
+//        return redisTemplate;
+//    }
+//
+//    private RedisSerializer<String> keySerializer() {
+//        return new StringRedisSerializer();
+//    }
+//
+//    //使用Jackson序列化器
+//    private RedisSerializer<Object> valueSerializer() {
+//        return new GenericJackson2JsonRedisSerializer();
+//    }
+//}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index f29800c..5bfb551 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -9,23 +9,21 @@ spring:
     password: xst200919
     url: jdbc:sqlserver://60.190.202.57:14333;database=consultative
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  thymeleaf: #thymelea模板配置
-    prefix: classpath:/templates/
-    suffix: .html
-    mode: HTML5
-    encoding: UTF-8
-    cache: false
-  resources:
-    chain:
-       strategy:
-         content:
-           enabled: true
-           paths: /**
+#  cache:
+#    type: redis
+#  redis:
+#    host: 127.0.0.1
+#    port: 6379
+#    password:
+#    lettuce:
+#      pool:
+#        max-active: 8
+#    database: 0
 ##mybatis
 mybatis:
   mapper-locations: classpath:mapper/*.xml
   type-aliases-package: com.sincere.student.model
 
-Logger:
+logging:
   level:
-    com.sincere.student.mapper: info
\ No newline at end of file
+    com.sincere.student.mapper: debug
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..800e8d5
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+        <!-- 项目名称 -->
+       
+    <property name="PROJECT_NAME" value="quartz"/>
+
+        <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="C://log"/>
+
+        <!-- 控制台输出 -->
+       
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+                <!--<withJansi>true</withJansi>-->
+               
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+                        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+                       
+            <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %highlight([%-5level] %logger{50} - %msg%n)</pattern>
+                       
+            <charset>UTF-8</charset>
+                   
+        </encoder>
+           
+    </appender>
+
+        <!-- 按照每天生成日志文件 -->
+       
+    <appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <!-- 过滤器，只打印ERROR级别的日志 -->
+               
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+                        <!--日志文件输出的文件名-->
+                       
+            <FileNamePattern>${LOG_HOME}/${PROJECT_NAME}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+                        <!--日志文件保留天数-->
+                       
+            <MaxHistory>30</MaxHistory>
+                        <!--日志文件最大的大小-->
+                       
+            <MaxFileSize>100MB</MaxFileSize>
+                   
+        </rollingPolicy>
+
+               
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+                        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+                       
+            <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] [%-5level] %logger{50} - %msg%n</pattern>
+                       
+            <charset>UTF-8</charset>
+                   
+        </encoder>
+           
+    </appender>
+       
+    <logger name="system_error" additivity="true">
+               
+        <appender-ref ref="SYSTEM_FILE"/>
+           
+    </logger>
+
+        <!-- 设置Spring&Hibernate日志输出级别 -->
+       
+    <logger name="org.springframework" level="WARN"/>
+       
+    <logger name="org.mybatis" level="WARN"/>
+       
+    <logger name="com.ibatis" level="DEBUG"/>
+       
+    <logger name="com.ibatis.common.jdbc.SimpleDataSource" level="DEBUG"/>
+       
+    <logger name="com.ibatis.common.jdbc.ScriptRunner" level="DEBUG"/>
+       
+    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG"/>
+
+
+       
+    <logger name="java.sql.Connection" level="DEBUG"/>
+       
+    <logger name="java.sql.Statement" level="DEBUG"/>
+       
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+       
+    <logger name="com.sincere.smartSearch.mapper" level="DEBUG"/>
+        <!-- 开发环境下的日志配置 -->
+       
+    <root level="INFO">
+               
+        <appender-ref ref="CONSOLE"/>
+               
+        <appender-ref ref="SYSTEM_FILE"/>
+           
+    </root>
+
+</configuration>
diff --git a/src/main/resources/mapper/UniversityConsultMapper.xml b/src/main/resources/mapper/UniversityConsultMapper.xml
index ad11503..1f36de2 100644
--- a/src/main/resources/mapper/UniversityConsultMapper.xml
+++ b/src/main/resources/mapper/UniversityConsultMapper.xml
@@ -46,7 +46,7 @@
   </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 from university_consult c
+    select DISTINCT c.id , 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
diff --git a/src/main/resources/mapper/UniversityMapper.xml b/src/main/resources/mapper/UniversityMapper.xml
index d284dc8..ccdb59d 100644
--- a/src/main/resources/mapper/UniversityMapper.xml
+++ b/src/main/resources/mapper/UniversityMapper.xml
@@ -13,6 +13,7 @@
         <result column="level" property="level"/>
         <result column="create_time" property="createTime"/>
         <result column="phone" property="phone"/>
+        <result column="logo_url" property="logoUrl"/>
     </resultMap>
 
     <select id="getListCount" parameterType="com.sincere.student.dto.UniversitySearchDto" resultType="java.lang.Integer">
@@ -34,8 +35,8 @@
     </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)
-        values (#{name},#{code},#{universityType},#{department},#{province},#{city},#{level},GETDATE(),#{phone})
+        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})
     </insert>
 
     <delete id="delete" parameterType="java.lang.Integer">
@@ -69,6 +70,9 @@
             <if test="phone!=null">
                 phone=#{phone},
             </if>
+            <if test="logoUrl!=null">
+                logo_url=#{logoUrl},
+            </if>
         </trim>
         where id = #{id}
     </update>
diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml
index 6c5724f..5d6e70a 100644
--- a/src/main/resources/mapper/VideoMapper.xml
+++ b/src/main/resources/mapper/VideoMapper.xml
@@ -9,27 +9,71 @@
         <result column="video_url" property="videoUrl"/>
         <result column="sort" property="sort"/>
         <result column="create_time" property="createTime"/>
-        <result column="name" property="universityName"/>
-        <result column="code" property="universityCode"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
         <result column="status" property="status" />
+        <result column="logo_url" property="imgUrl" />
     </resultMap>
 
     <select id="getById" parameterType="java.lang.Integer" resultMap="VideoMap">
         select * from university_video where id = #{id}
     </select>
 
+
+    <select id="getUniversityListCount" parameterType="com.sincere.student.dto.VideoSearchDto" resultType="java.lang.Integer">
+        select count( distinct (v.university_id)) from university_video v join university_info info on v.university_id = info.id
+        <where>
+            <if test="columnType != 0">
+                and v.column_type = #{columnType}
+            </if>
+            <if test="columnType == 0">
+                and 1 = 1
+            </if>
+            <if test="universityId != 0">
+                and info.id = #{universityId}
+            </if>
+            <if test="status == 1">
+                and status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
+        </where>
+    </select>
+
+    <select id="getUniversityList" parameterType="com.sincere.student.dto.VideoSearchDto" resultMap="VideoMap">
+        select distinct v.university_id , info.name,info.code ,info.logo_url from university_video v join university_info info on v.university_id = info.id
+        <where>
+            <if test="columnType != 0">
+                and v.column_type = #{columnType}
+            </if>
+            <if test="universityId != 0">
+                and info.id = #{universityId}
+            </if>
+            <if test="status == 1">
+                and status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
+        </where>
+    </select>
+
     <select id="getListCount" parameterType="com.sincere.student.dto.VideoSearchDto" resultType="java.lang.Integer">
         select count(0) from university_video v join university_info info on v.university_id = info.id
         <where>
-            <if test="columnTypeId != 0">
-                and v.column_type = #{columnTypeId}
+            <if test="columnType != 0">
+                and v.column_type = #{columnType}
             </if>
-            <if test="universityName == 0">
+            <if test="columnType == 0">
                 and 1 = 1
             </if>
             <if test="universityName != null and universityName != ''">
                 and info.name like #{universityName}
             </if>
+            <if test="universityId != 0">
+                and info.id = #{universityId}
+            </if>
             <if test="status == 1">
                 and status = 1
             </if>
@@ -39,11 +83,14 @@
         </where>
     </select>
 
-    <select id="getList" parameterType="com.sincere.student.dto.ArticleSearchDto" resultMap="VideoMap">
-        select v.*,info.name,info.code from university_video v join university_info info on v.university_id = info.id
+    <select id="getList" parameterType="com.sincere.student.dto.VideoSearchDto" resultMap="VideoMap">
+        select v.*,info.name,info.code ,info.logo_url from university_video v join university_info info on v.university_id = info.id
         <where>
-            <if test="columnTypeId != 0">
-                and v.column_type = #{columnTypeId}
+            <if test="columnType != 0">
+                and v.column_type = #{columnType}
+            </if>
+            <if test="universityId != 0">
+                and info.id = #{universityId}
             </if>
             <if test="universityName != null and universityName != ''">
                 and info.name like #{universityName}
--
libgit2 0.21.0