diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java
index bdff068..d8fcbb5 100644
--- a/src/main/java/com/sincere/student/controller/AdminController.java
+++ b/src/main/java/com/sincere/student/controller/AdminController.java
@@ -71,6 +71,24 @@ public class AdminController {
     }
 
     @MemberAccess
+    @ApiOperation("投档线删除接口")
+    @RequestMapping(value = "/submit/delete" , method = RequestMethod.POST)
+    public BaseDto deleteFile(@RequestBody IdDto idDto){
+        BaseDto result = new BaseDto<>();
+        submitService.delete(idDto.getId());
+        return result ;
+    }
+
+    @MemberAccess
+    @ApiOperation("投档线更新接口 ,如果文件没更新，fileUrl不用传")
+    @RequestMapping(value = "/submit/update" , method = RequestMethod.POST)
+    public BaseDto deleteFile(@RequestBody SubmitFile submitFile){
+        BaseDto result = new BaseDto<>();
+        submitService.update(submitFile);
+        return result ;
+    }
+
+    @MemberAccess
     @ApiOperation("投档线创建接口")
     @RequestMapping(value = "/submit/createFile" , method = RequestMethod.POST)
     public BaseDto createFile(@RequestBody SubmitFile submitFile){
diff --git a/src/main/java/com/sincere/student/model/Major.java b/src/main/java/com/sincere/student/model/Major.java
index 3909b03..f3b8795 100644
--- a/src/main/java/com/sincere/student/model/Major.java
+++ b/src/main/java/com/sincere/student/model/Major.java
@@ -3,6 +3,8 @@ package com.sincere.student.model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 @ApiModel
 public class Major {
 
@@ -14,6 +16,16 @@ public class Major {
     private String majorCode ;
     @ApiModelProperty(value = "父级专业id") //-1 说明是一级专业
     private int pId ;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime ;
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 
     public int getId() {
         return id;
diff --git a/src/main/java/com/sincere/student/model/SubmitFile.java b/src/main/java/com/sincere/student/model/SubmitFile.java
index 6b9f779..6836bf5 100644
--- a/src/main/java/com/sincere/student/model/SubmitFile.java
+++ b/src/main/java/com/sincere/student/model/SubmitFile.java
@@ -10,19 +10,29 @@ import java.util.List;
 public class SubmitFile {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
     private Integer id;
-    @ApiModelProperty(value = "必传 标题")
+    @ApiModelProperty(value = " 标题")
     private String title;
-    @ApiModelProperty(value = "必传 年")
+    @ApiModelProperty(value = " 年")
     private String year;
-    @ApiModelProperty(value = "必传 排序")
+    @ApiModelProperty(value = " 排序")
     private Integer sort;
-    @ApiModelProperty(value = "必传 文件路径")
+    @ApiModelProperty(value = " 文件路径")
     private String fileUrl ;
+    @ApiModelProperty(value = " 文件名称  展示用")
+    private String fileName ;
     @ApiModelProperty(value = "不用传")
     private Date createTime;
     @ApiModelProperty(value = "不用传")
     private List<Point> list ;
 
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
     public String getFileUrl() {
         return fileUrl;
     }
diff --git a/src/main/java/com/sincere/student/model/Video.java b/src/main/java/com/sincere/student/model/Video.java
index f7ba908..c3fc1c6 100644
--- a/src/main/java/com/sincere/student/model/Video.java
+++ b/src/main/java/com/sincere/student/model/Video.java
@@ -27,13 +27,23 @@ public class Video {
     @ApiModelProperty(value = "状态 0预览1发布")
     private int status ;
     @ApiModelProperty(value = "图片地址")
-    private int imgUrl ;
+    private String imgUrl ;
+    @ApiModelProperty(value = "视频时长")
+    private String duration ;
 
-    public int getImgUrl() {
+    public String getDuration() {
+        return duration;
+    }
+
+    public void setDuration(String duration) {
+        this.duration = duration;
+    }
+
+    public String getImgUrl() {
         return imgUrl;
     }
 
-    public void setImgUrl(int imgUrl) {
+    public void setImgUrl(String imgUrl) {
         this.imgUrl = imgUrl;
     }
 
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 c242e82..8645a11 100644
--- a/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
@@ -5,8 +5,6 @@ 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;
diff --git a/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java b/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
index 3d3703f..76fca4c 100644
--- a/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
+++ b/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
@@ -30,7 +30,12 @@ public class SubmitServiceImpl implements SubmitService {
     public Page<SubmitFile> getAdminList(MessageSearchDto dto) {
         Page<SubmitFile> result = new Page<>(dto.getPage(),dto.getPageSize());
         PageHelper.startPage(dto.getPage(),dto.getPageSize());
-        result.setList(submitFileMapper.getList(dto));
+        List<SubmitFile> list = submitFileMapper.getList(dto) ;
+        for(SubmitFile submitFile : list){
+            String fileName = submitFile.getFileUrl().substring(submitFile.getFileUrl().lastIndexOf("/")+1);
+            submitFile.setFileName(fileName);
+        }
+        result.setList(list);
         result.setCount(submitFileMapper.getListCount(dto));
         return result;
     }
@@ -79,6 +84,23 @@ public class SubmitServiceImpl implements SubmitService {
 
     @Override
     public int update(SubmitFile submitFile) {
+        if(StringUtils.isNotBlank(submitFile.getFileUrl())){
+            int i = 0 ;
+            pointMapper.deleteBySubmit(submitFile.getId());
+            List<Point> list = new ArrayList<>();
+            for(Point point :submitFile.getList()){
+                point.setSubmitId(submitFile.getId());
+                i++ ;
+                list.add(point);
+                if(i % 100 == 0){
+                    pointMapper.insertBatch(list);
+                    list = new ArrayList<>();
+                }
+            }
+            if(list.size() > 0){
+                pointMapper.insertBatch(list);
+            }
+        }
         return submitFileMapper.updateByPrimaryKey(submitFile);
     }
 }
diff --git a/src/main/resources/mapper/MajorMapper.xml b/src/main/resources/mapper/MajorMapper.xml
index 603278f..6548646 100644
--- a/src/main/resources/mapper/MajorMapper.xml
+++ b/src/main/resources/mapper/MajorMapper.xml
@@ -7,6 +7,7 @@
         <result column="major" property="major"/>
         <result column="major_code" property="majorCode"/>
         <result column="p_id" property="pId"/>
+        <result column="create_time" property="createTime"/>
     </resultMap>
 
     <select id="getList" parameterType="com.sincere.student.model.Major" resultMap="MajorMap">
@@ -37,8 +38,8 @@
     </select>
 
     <insert id="create" parameterType="com.sincere.student.model.Major" >
-        insert into university_major (major,major_code,p_id)
-        values (#{major},#{majorCode},#{pId})
+        insert into university_major (major,major_code,p_id,create_time)
+        values (#{major},#{majorCode},#{pId},GETDATE())
     </insert>
 
     <delete id="delete" parameterType="java.lang.Integer">
diff --git a/src/main/resources/mapper/UniversityConsultMapper.xml b/src/main/resources/mapper/UniversityConsultMapper.xml
index 1f36de2..05b82eb 100644
--- a/src/main/resources/mapper/UniversityConsultMapper.xml
+++ b/src/main/resources/mapper/UniversityConsultMapper.xml
@@ -120,7 +120,7 @@
       create_time, sort)
     values (#{universityId,jdbcType=INTEGER}, #{columnType,jdbcType=INTEGER},
       #{videoUrl,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=INTEGER})
+      GETDATE(), #{sort,jdbcType=INTEGER})
   </insert>
 
   <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsult">
diff --git a/src/main/resources/mapper/UniversityMessageMapper.xml b/src/main/resources/mapper/UniversityMessageMapper.xml
index 516c231..a042b6f 100644
--- a/src/main/resources/mapper/UniversityMessageMapper.xml
+++ b/src/main/resources/mapper/UniversityMessageMapper.xml
@@ -10,7 +10,7 @@
   </resultMap>
 
   <select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
-    select * from university_message
+    select count(0) from university_message
     <where>
       <if test="search != null and search != ''">
         and title like #{search}
@@ -41,7 +41,7 @@
     insert into university_message (title, context,
       phone, create_time)
     values (#{title,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR},
-      #{phone,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+      #{phone,jdbcType=VARCHAR}, GETDATE())
   </insert>
   <insert id="insertSelective" parameterType="com.sincere.student.model.Message">
     insert into university_message
diff --git a/src/main/resources/mapper/UniversityReplyMapper.xml b/src/main/resources/mapper/UniversityReplyMapper.xml
index cfd4d54..09684fc 100644
--- a/src/main/resources/mapper/UniversityReplyMapper.xml
+++ b/src/main/resources/mapper/UniversityReplyMapper.xml
@@ -29,7 +29,7 @@
     insert into university_reply (message_id, context,
       create_time)
     values (#{messageId,jdbcType=INTEGER}, #{context,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP})
+      GETDATE())
   </insert>
   <insert id="insertSelective" parameterType="com.sincere.student.model.Reply">
     insert into university_reply
diff --git a/src/main/resources/mapper/UniversitySubmitFileMapper.xml b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
index 41100cc..d30a85b 100644
--- a/src/main/resources/mapper/UniversitySubmitFileMapper.xml
+++ b/src/main/resources/mapper/UniversitySubmitFileMapper.xml
@@ -81,6 +81,7 @@
   <resultMap id="BaseResultMap" type="com.sincere.student.model.SubmitFile">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="file_url" jdbcType="VARCHAR" property="fileUrl" />
     <result column="year" jdbcType="VARCHAR" property="year" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -120,9 +121,9 @@
   </delete>
   <insert id="insert" parameterType="com.sincere.student.model.SubmitFile" useGeneratedKeys="true" keyProperty="id">
     insert into university_submit_file (title, year,
-      sort, create_time)
+      sort, create_time,file_url)
     values (#{title,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR},
-      #{sort,jdbcType=INTEGER}, GETDATE())
+      #{sort,jdbcType=INTEGER}, GETDATE(),#{fileUrl})
   </insert>
   <insert id="insertSelective" parameterType="com.sincere.student.model.SubmitFile">
     insert into university_submit_file
diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml
index 5d6e70a..43c497c 100644
--- a/src/main/resources/mapper/VideoMapper.xml
+++ b/src/main/resources/mapper/VideoMapper.xml
@@ -13,6 +13,7 @@
         <result column="code" property="code"/>
         <result column="status" property="status" />
         <result column="logo_url" property="imgUrl" />
+        <result column="duration" property="duration" />
     </resultMap>
 
     <select id="getById" parameterType="java.lang.Integer" resultMap="VideoMap">
@@ -106,8 +107,8 @@
     </select>
 
     <insert id="create" parameterType="com.sincere.student.model.Video" >
-        insert into university_video (column_type,university_id,sort,video_url,create_time,status)
-        values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status})
+        insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration)
+        values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration})
     </insert>
 
     <delete id="delete" parameterType="java.lang.Integer">
@@ -117,13 +118,16 @@
     <update id="update" parameterType="com.sincere.student.model.Video">
         update university_video
         <trim prefix="set" suffixOverrides=",">
-            <if test="videoUrl!=null">
+            <if test="videoUrl!=null and videoUrl != ''">
                 video_url=#{videoUrl},
             </if>
+            <if test="duration!=null and duration != ''">
+                duration=#{duration},
+            </if>
             <if test="columnType!=0">
                 column_type=#{columnType},
             </if>
-            <if test="universityName!=null">
+            <if test="universityName!=null and universityName != ''">
                 university_name=#{universityName},
             </if>
             <if test="universityId!=0">
--
libgit2 0.21.0