From be5d580a9198748eea380df6e5502abb63447a38 Mon Sep 17 00:00:00 2001
From: 陈杰 <504987307@qq.com>
Date: Tue, 17 Mar 2020 08:37:28 +0800
Subject: [PATCH] 加发布 预览功能

---
 pom.xml                                                           | 26 +-------------------------
 src/main/java/com/sincere/student/controller/AdminController.java | 13 +++++++++++--
 src/main/java/com/sincere/student/controller/AppController.java   |  3 +++
 src/main/java/com/sincere/student/controller/IndexController.java | 34 +---------------------------------
 src/main/java/com/sincere/student/dto/ArticleSearchDto.java       | 10 ++++++++++
 src/main/java/com/sincere/student/dto/ConsultSearchDto.java       | 10 ++++++++++
 src/main/java/com/sincere/student/dto/VideoSearchDto.java         |  9 +++++++++
 src/main/java/com/sincere/student/model/Article.java              |  9 +++++++++
 src/main/java/com/sincere/student/model/UniversityConsult.java    |  9 +++++++++
 src/main/java/com/sincere/student/model/Video.java                | 10 ++++++++++
 src/main/java/com/sincere/student/utils/ExcelUtils.java           |  4 ++--
 src/main/java/com/sincere/student/utils/HttpClientUtils.java      | 81 ---------------------------------------------------------------------------------
 src/main/resources/mapper/ArticleMapper.xml                       | 30 +++++++++++++++++++++++-------
 src/main/resources/mapper/UniversityConsultMapper.xml             | 17 +++++++++++++++--
 src/main/resources/mapper/VideoMapper.xml                         | 33 ++++++++++++++++++++++++++-------
 src/main/resources/templates/index.html                           | 42 ------------------------------------------
 16 files changed, 139 insertions(+), 201 deletions(-)
 delete mode 100644 src/main/java/com/sincere/student/utils/HttpClientUtils.java
 delete mode 100644 src/main/resources/templates/index.html

diff --git a/pom.xml b/pom.xml
index bd8efca..a8efe2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,34 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>EnrollStudent_independent</artifactId>
+    <artifactId>enrollStudent</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf</artifactId>
-            <version>3.0.9.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf-spring4</artifactId>
-            <version>3.0.9.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
             <version>1.3.5</version>
diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java
index 24bfa6f..4dc5d14 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -180,6 +181,7 @@ public class AdminController {
     @RequestMapping(value = "/consult/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Consult>> getConsultList(@RequestBody ConsultSearchDto consultSearchDto){
         BaseDto<Page<Consult>> result = new BaseDto<>() ;
+        consultSearchDto.setStatus(0);
         Page<Consult> page = consultService.getList(consultSearchDto);
         result.setData(page);
         return result ;
@@ -229,6 +231,7 @@ public class AdminController {
     @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
         BaseDto<Page<Video>> result = new BaseDto<>() ;
+        videoSearchDto.setStatus(0);
         Page<Video> page = videoService.getList(videoSearchDto);
         result.setData(page);
         return result ;
@@ -402,6 +405,7 @@ public class AdminController {
     @RequestMapping(value = "/article/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Article>> getArticleList(@RequestBody ArticleSearchDto articleSearchDto){
         BaseDto<Page<Article>> result = new BaseDto<>() ;
+        articleSearchDto.setStatus(0);
         Page<Article> page = articleService.getList(articleSearchDto);
         result.setData(page);
         return result ;
@@ -479,8 +483,13 @@ public class AdminController {
     @RequestMapping(value = "/advert/createBanner" , method = RequestMethod.POST)
     public BaseDto createBanner(@RequestBody Advert advert){
         BaseDto result = new BaseDto();
-        advert.setType(AdvertEnums.banner.getType());
-        advertService.create(advert);
+        if(StringUtils.isBlank(advert.getImgUrl())){
+            result.setSuccess(false);
+            result.setMessage("图片地址不能为空");
+        }else {
+            advert.setType(AdvertEnums.banner.getType());
+            advertService.create(advert);
+        }
         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 8b3041d..5e55650 100644
--- a/src/main/java/com/sincere/student/controller/AppController.java
+++ b/src/main/java/com/sincere/student/controller/AppController.java
@@ -121,6 +121,7 @@ public class AppController {
     @RequestMapping(value = "/consult/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Consult>> getConsultList(@RequestBody ConsultSearchDto consultSearchDto){
         BaseDto<Page<Consult>> result = new BaseDto<>() ;
+        consultSearchDto.setStatus(1);
         Page<Consult> page = consultService.getList(consultSearchDto);
         result.setData(page);
         return result ;
@@ -161,6 +162,7 @@ public class AppController {
     @RequestMapping(value = "/article/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Article>> getArticleList(@RequestBody ArticleSearchDto articleSearchDto){
         BaseDto<Page<Article>> result = new BaseDto<>() ;
+        articleSearchDto.setStatus(1);
         Page<Article> page = articleService.getList(articleSearchDto);
         result.setData(page);
         return result ;
@@ -224,6 +226,7 @@ public class AppController {
     @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
     public BaseDto<Page<Video>> getVideoList(@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/controller/IndexController.java b/src/main/java/com/sincere/student/controller/IndexController.java
index 76ec444..31407fe 100644
--- a/src/main/java/com/sincere/student/controller/IndexController.java
+++ b/src/main/java/com/sincere/student/controller/IndexController.java
@@ -1,6 +1,5 @@
 package com.sincere.student.controller;
 
-import com.sincere.student.utils.HttpClientUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,37 +23,6 @@ public class IndexController {
     @ResponseBody
     @RequestMapping(value = "upload" ,method = RequestMethod.POST)
     public String upload(@RequestParam("file") MultipartFile file) throws Exception{
-        //return file.getOriginalFilename() ;
-        return HttpClientUtils.upload("http://121.40.109.21:8083/file-center/file/fileUpload",multipartFileToFile(file),file.getOriginalFilename());
-    }
-
-    public File multipartFileToFile(MultipartFile file) throws Exception {
-
-        File toFile = null;
-        if (file.equals("") || file.getSize() <= 0) {
-            file = null;
-        } else {
-            InputStream ins = null;
-            ins = file.getInputStream();
-            toFile = new File(file.getOriginalFilename());
-            inputStreamToFile(ins, toFile);
-            ins.close();
-        }
-        return toFile;
-    }
-
-    private void inputStreamToFile(InputStream ins, File file) {
-        try {
-            OutputStream os = new FileOutputStream(file);
-            int bytesRead = 0;
-            byte[] buffer = new byte[8192];
-            while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
-                os.write(buffer, 0, bytesRead);
-            }
-            os.close();
-            ins.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        return file.getOriginalFilename() ;
     }
 }
diff --git a/src/main/java/com/sincere/student/dto/ArticleSearchDto.java b/src/main/java/com/sincere/student/dto/ArticleSearchDto.java
index 54b4bed..5cae608 100644
--- a/src/main/java/com/sincere/student/dto/ArticleSearchDto.java
+++ b/src/main/java/com/sincere/student/dto/ArticleSearchDto.java
@@ -12,6 +12,16 @@ public class ArticleSearchDto extends PageDto{
     private String title ;
     @ApiModelProperty(value = "文章栏目")
     private int columnType ;
+    @ApiModelProperty(value = "状态 0预览1发布 都不用传")
+    private int status ;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
 
     public int getArticleType() {
         return articleType;
diff --git a/src/main/java/com/sincere/student/dto/ConsultSearchDto.java b/src/main/java/com/sincere/student/dto/ConsultSearchDto.java
index 2fb3385..b392d96 100644
--- a/src/main/java/com/sincere/student/dto/ConsultSearchDto.java
+++ b/src/main/java/com/sincere/student/dto/ConsultSearchDto.java
@@ -16,6 +16,16 @@ public class ConsultSearchDto extends PageDto {
     private String city ;
     @ApiModelProperty(value = "专业")
     private String majorName ;
+    @ApiModelProperty(value = "状态 0预览1发布 都不用传")
+    private int status ;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
 
     public int getColumnType() {
         return columnType;
diff --git a/src/main/java/com/sincere/student/dto/VideoSearchDto.java b/src/main/java/com/sincere/student/dto/VideoSearchDto.java
index be78ffa..7687679 100644
--- a/src/main/java/com/sincere/student/dto/VideoSearchDto.java
+++ b/src/main/java/com/sincere/student/dto/VideoSearchDto.java
@@ -11,7 +11,16 @@ public class VideoSearchDto extends PageDto {
 
     @ApiModelProperty(value = "查询名称")
     private String universityName ;
+    @ApiModelProperty(value = "状态 0预览1发布 都不用传")
+    private int status ;
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
     public int getColumnTypeId() {
         return columnTypeId;
     }
diff --git a/src/main/java/com/sincere/student/model/Article.java b/src/main/java/com/sincere/student/model/Article.java
index e2cde8c..feaaf51 100644
--- a/src/main/java/com/sincere/student/model/Article.java
+++ b/src/main/java/com/sincere/student/model/Article.java
@@ -36,7 +36,16 @@ public class Article {
     private Date createTime ;
     @ApiModelProperty(value = "文章类型 1广告文章  2权威解读 ")
     private int type ;
+    @ApiModelProperty(value = "状态 0预览1发布")
+    private int status ;
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
     public int getType() {
         return type;
     }
diff --git a/src/main/java/com/sincere/student/model/UniversityConsult.java b/src/main/java/com/sincere/student/model/UniversityConsult.java
index 1d150ac..a2bafab 100644
--- a/src/main/java/com/sincere/student/model/UniversityConsult.java
+++ b/src/main/java/com/sincere/student/model/UniversityConsult.java
@@ -26,7 +26,16 @@ public class UniversityConsult {
     private Integer sort;
     @ApiModelProperty(value = "4个栏目")
     private List<UniversityConsultDetail> list;
+    @ApiModelProperty(value = "状态 0预览1发布")
+    private int status ;
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
     public List<UniversityConsultDetail> getList() {
         return list;
     }
diff --git a/src/main/java/com/sincere/student/model/Video.java b/src/main/java/com/sincere/student/model/Video.java
index 1a0e19f..d953a1b 100644
--- a/src/main/java/com/sincere/student/model/Video.java
+++ b/src/main/java/com/sincere/student/model/Video.java
@@ -24,6 +24,16 @@ public class Video {
     private String universityName;
     @ApiModelProperty(value = "学校编码  展示用")
     private String universityCode;
+    @ApiModelProperty(value = "状态 0预览1发布")
+    private int status ;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
 
     public String getUniversityCode() {
         return universityCode;
diff --git a/src/main/java/com/sincere/student/utils/ExcelUtils.java b/src/main/java/com/sincere/student/utils/ExcelUtils.java
index ab78123..dce36ff 100644
--- a/src/main/java/com/sincere/student/utils/ExcelUtils.java
+++ b/src/main/java/com/sincere/student/utils/ExcelUtils.java
@@ -38,8 +38,8 @@ public class ExcelUtils {
             // 获得工作簿
             String file = excelFile.getName();
             Workbook workbook = null;
-            //InputStream inputStream = GetFileInputStream(url);
-            InputStream inputStream = new FileInputStream(url);
+            InputStream inputStream = GetFileInputStream(url);
+            //InputStream inputStream = new FileInputStream(url);
             if(inputStream == null){
                 throw new ResultException(901,"路径错误");
             }
diff --git a/src/main/java/com/sincere/student/utils/HttpClientUtils.java b/src/main/java/com/sincere/student/utils/HttpClientUtils.java
deleted file mode 100644
index f26b222..0000000
--- a/src/main/java/com/sincere/student/utils/HttpClientUtils.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.sincere.student.utils;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.mime.MultipartEntityBuilder;
-import org.apache.http.entity.mime.content.FileBody;
-import org.apache.http.entity.mime.content.StringBody;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * HttpClient4.3工具类
- * @author chen
- * @version 1.0
- * @date 2019/10/11 0011 10:17
- */
-public class HttpClientUtils {
-
-    private static RequestConfig requestConfig = null;
-
-    static {
-        // 设置请求和传输超时时间
-        requestConfig = RequestConfig.custom().setSocketTimeout(5000).setConnectTimeout(5000).build();
-    }
-
-    public static void main(String[] args){
-//        String url = "http://http://zhktest.114school.com.cn/szkjapi/toyxy/addTeacherOrg" ;
-//        String json = "{\"name\": \"子部门\",\"groupname\": \"父部门\",\"schoolid\": \"16\",\"token\": \"05719991\"}" ;
-//        JSONObject jsonObject = HttpClientUtils.httpPostJson(url,json);
-//        System.out.println(jsonObject.toJSONString());
-    }
-
-
-    public static String upload(String url, File file, String filename) {
-        CloseableHttpClient httpclient = HttpClients.createDefault();
-        try {
-            HttpPost httppost = new HttpPost(url);
-            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(200000).setSocketTimeout(200000).build();
-            httppost.setConfig(requestConfig);
-            FileBody bin = new FileBody(file);
-            StringBody comment = new StringBody(filename, ContentType.TEXT_PLAIN);
-            HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", bin).addPart("filename", comment).build();
-            httppost.setEntity(reqEntity);
-            httppost.setHeader("ossPath","test");
-            System.out.println("executing request " + httppost.getRequestLine());
-            CloseableHttpResponse response = httpclient.execute(httppost);
-            try {
-                System.out.println(response.getStatusLine());
-                HttpEntity resEntity = response.getEntity();
-                if (resEntity != null) {
-                    String responseEntityStr = EntityUtils.toString(response.getEntity());
-                    System.out.println(responseEntityStr);
-                    return responseEntityStr ;
-                }
-                EntityUtils.consume(resEntity);
-            } finally {
-                response.close();
-            }
-        } catch (ClientProtocolException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                httpclient.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return null ;
-    }
-
- }
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 714c0ac..b7b45dc 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -17,6 +17,7 @@
         <result column="look_number" property="lookNumber"/>
         <result column="create_time" property="createTime"/>
         <result column="type" property="type"/>
+        <result column="status" property="status" />
     </resultMap>
 
 
@@ -32,6 +33,12 @@
             <if test="articleType != 0">
                 and type = #{articleType}
             </if>
+            <if test="status == 1">
+                and status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
         </where>
     </select>
 
@@ -47,6 +54,12 @@
              <if test="articleType != 0">
                  and type = #{articleType}
              </if>
+             <if test="status == 1">
+                 and status = 1
+             </if>
+             <if test="status != 1">
+                 and 1 = 1
+             </if>
          </where>
          order by sort
     </select>
@@ -60,8 +73,8 @@
     </select>
 
     <insert id="create" parameterType="com.sincere.student.model.Article" >
-        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)
-        values (#{title},#{columnType},#{universityId},#{sort},#{context},#{author},#{imageUrl},#{videoUrl},#{articleLink},#{goodNumber},#{lookNumber},GETDATE(),#{type})
+        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>
 
     <delete id="delete" parameterType="java.lang.Integer">
@@ -74,16 +87,16 @@
             <if test="title!=null">
                 title=#{title},
             </if>
-            <if test="columnType!=null">
+            <if test="columnType!=0">
                 column_type=#{columnType},
             </if>
             <if test="universityName!=null">
                 university_name=#{universityName},
             </if>
-            <if test="universityId!=null">
+            <if test="universityId!=0">
                 university_id=#{universityId},
             </if>
-            <if test="sort!=null">
+            <if test="sort!=0">
                 sort=#{sort},
             </if>
             <if test="context!=null">
@@ -101,12 +114,15 @@
             <if test="articleLink!=null">
                 article_link=#{articleLink},
             </if>
-            <if test="goodNumber!=null">
+            <if test="goodNumber!=0">
                 good_number=#{goodNumber},
             </if>
-            <if test="lookNumber!=null">
+            <if test="lookNumber!=0">
                 look_number=#{lookNumber},
             </if>
+            <if test="status!=-1">
+                status=#{status},
+            </if>
         </trim>
          where id = #{id}
     </update>
diff --git a/src/main/resources/mapper/UniversityConsultMapper.xml b/src/main/resources/mapper/UniversityConsultMapper.xml
index 60920b6..dc897f7 100644
--- a/src/main/resources/mapper/UniversityConsultMapper.xml
+++ b/src/main/resources/mapper/UniversityConsultMapper.xml
@@ -9,6 +9,7 @@
     <result column="code" property="code" />
     <result column="sort" property="sort" />
     <result column="img_url"  property="imgUrl" />
+    <result column="status" property="status" />
   </resultMap>
 
   <select id="getListCount" parameterType="com.sincere.student.dto.ConsultSearchDto" resultType="java.lang.Integer">
@@ -35,6 +36,12 @@
       <if test="majorName != null">
         and m.major like #{majorName}
       </if>
+      <if test="status == 1">
+        and c.status = 1
+      </if>
+      <if test="status != 1">
+        and 1 = 1
+      </if>
     </where>
   </select>
 
@@ -62,6 +69,12 @@
       <if test="majorName != null">
         and m.major like #{majorName}
       </if>
+      <if test="status == 1">
+        and c.status = 1
+      </if>
+      <if test="status != 1">
+        and 1 = 1
+      </if>
     </where>
     order by c.sort
   </select>
@@ -69,13 +82,13 @@
   <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
-    where c.column_type = #{columnType}
+    where c.column_type = #{columnType} and c.status = 1
   </select>
 
   <select id="getColumnList" parameterType="java.lang.Integer" resultMap="ListMap">
     select DISTINCT c.id , info.id as universityId , c.img_url ,c.sort , info.name , info.code from university_consult c
     join university_info info on c.university_id = info.id
-    where c.column_type = #{columnType}
+    where c.column_type = #{columnType} and c.status = 1
     order by c.sort
   </select>
 
diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml
index 0e89732..de6edd1 100644
--- a/src/main/resources/mapper/VideoMapper.xml
+++ b/src/main/resources/mapper/VideoMapper.xml
@@ -11,6 +11,7 @@
         <result column="create_time" property="createTime"/>
         <result column="name" property="universityName"/>
         <result column="code" property="universityCode"/>
+        <result column="status" property="status" />
     </resultMap>
 
     <select id="getById" parameterType="java.lang.Integer" resultMap="VideoMap">
@@ -20,8 +21,8 @@
     <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="universityName != 0">
-                and v.column_type = #{columnType}
+            <if test="columnTypeId != 0">
+                and v.column_type = #{columnTypeId}
             </if>
             <if test="universityName == 0">
                 and 1 = 1
@@ -29,22 +30,37 @@
             <if test="universityName != null">
                 and info.name like #{universityName}
             </if>
+            <if test="status == 1">
+                and status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
         </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
         <where>
+            <if test="columnTypeId != 0">
+                and v.column_type = #{columnTypeId}
+            </if>
             <if test="universityName != null">
                 and info.name like #{universityName}
             </if>
+            <if test="status == 1">
+                and status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
         </where>
          order by sort
     </select>
 
     <insert id="create" parameterType="com.sincere.student.model.Video" >
-        insert into university_video (column_type,university_id,sort,video_url,create_time)
-        values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE())
+        insert into university_video (column_type,university_id,sort,video_url,create_time,status)
+        values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status})
     </insert>
 
     <delete id="delete" parameterType="java.lang.Integer">
@@ -57,18 +73,21 @@
             <if test="videoUrl!=null">
                 video_url=#{videoUrl},
             </if>
-            <if test="columnType!=null">
+            <if test="columnType!=0">
                 column_type=#{columnType},
             </if>
             <if test="universityName!=null">
                 university_name=#{universityName},
             </if>
-            <if test="universityId!=null">
+            <if test="universityId!=0">
                 university_id=#{universityId},
             </if>
-            <if test="sort!=null">
+            <if test="sort!=0">
                 sort=#{sort},
             </if>
+            <if test="status!=-1">
+                status=#{status},
+            </if>
         </trim>
          where id = #{id}
     </update>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
deleted file mode 100644
index 29132f4..0000000
--- a/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>action is everything</title>
-</head>
-<body>
-<div  data-th-fragment="header">
-    <h1> 图片q </h1>
-</div>
-<form>
-    <input type="file"  id="file" name="file">
-    <button type="button"  onclick="submitForm()">提交</button>
-
-</form>
-</body>
-<script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
-<script>
-    function submitForm() {
-        var formData = new FormData(); //将需要提交的参数封装起来
-        formData.append("file", $("#file")[0].files[0]);
-        $.ajax({
-            //url:'upload',
-            url : 'http://121.40.109.21:8083/file-center/file/fileUpload',
-            beforeSend: function(xhr) {
-                xhr.setRequestHeader("ossPath","test");
-            },
-            type : 'post',
-            data : formData,
-            processData : false,
-            contentType : false,
-            success : function(value) {
-               alert(value);
-            },
-            error:function (value) {
-                alert(value);
-            }
-        });
-
-    }
-</script>
-</html>
\ No newline at end of file
--
libgit2 0.21.0