bug 修复

陈杰
1 parent b246a387
Showing 12 changed files with 98 additions and 22 deletions Show diff stats
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/model/Major.java
src/main/java/com/sincere/student/model/SubmitFile.java
src/main/java/com/sincere/student/model/Video.java
src/main/java/com/sincere/student/service/impl/AdvertServiceImpl.java
src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java
src/main/resources/mapper/MajorMapper.xml
src/main/resources/mapper/UniversityConsultMapper.xml
src/main/resources/mapper/UniversityMessageMapper.xml
src/main/resources/mapper/UniversityReplyMapper.xml
src/main/resources/mapper/UniversitySubmitFileMapper.xml
src/main/resources/mapper/VideoMapper.xml
@@ -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){
@@ -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;
@@ -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;
     }
@@ -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;
     }
  
@@ -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;
@@ -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);
     }
 }
@@ -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">
@@ -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">
@@ -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
@@ -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
@@ -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
@@ -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">
...	...	@@ -71,6 +71,24 @@ public class AdminController {
71	71	}
72	72
73	73	@MemberAccess
	74	+ @ApiOperation("投档线删除接口")
	75	+ @RequestMapping(value = "/submit/delete" , method = RequestMethod.POST)
	76	+ public BaseDto deleteFile(@RequestBody IdDto idDto){
	77	+ BaseDto result = new BaseDto<>();
	78	+ submitService.delete(idDto.getId());
	79	+ return result ;
	80	+ }
	81	+
	82	+ @MemberAccess
	83	+ @ApiOperation("投档线更新接口 ,如果文件没更新，fileUrl不用传")
	84	+ @RequestMapping(value = "/submit/update" , method = RequestMethod.POST)
	85	+ public BaseDto deleteFile(@RequestBody SubmitFile submitFile){
	86	+ BaseDto result = new BaseDto<>();
	87	+ submitService.update(submitFile);
	88	+ return result ;
	89	+ }
	90	+
	91	+ @MemberAccess
74	92	@ApiOperation("投档线创建接口")
75	93	@RequestMapping(value = "/submit/createFile" , method = RequestMethod.POST)
76	94	public BaseDto createFile(@RequestBody SubmitFile submitFile){
...	...
...	...	@@ -3,6 +3,8 @@ package com.sincere.student.model;
3	3	import io.swagger.annotations.ApiModel;
4	4	import io.swagger.annotations.ApiModelProperty;
5	5
	6	+import java.util.Date;
	7	+
6	8	@ApiModel
7	9	public class Major {
8	10
...	...	@@ -14,6 +16,16 @@ public class Major {
14	16	private String majorCode ;
15	17	@ApiModelProperty(value = "父级专业id") //-1 说明是一级专业
16	18	private int pId ;
	19	+ @ApiModelProperty(value = "创建时间")
	20	+ private Date createTime ;
	21	+
	22	+ public Date getCreateTime() {
	23	+ return createTime;
	24	+ }
	25	+
	26	+ public void setCreateTime(Date createTime) {
	27	+ this.createTime = createTime;
	28	+ }
17	29
18	30	public int getId() {
19	31	return id;
...	...
...	...	@@ -10,19 +10,29 @@ import java.util.List;
10	10	public class SubmitFile {
11	11	@ApiModelProperty(value = "主键 , 新增接口不用传")
12	12	private Integer id;
13		- @ApiModelProperty(value = "必传标题")
	13	+ @ApiModelProperty(value = " 标题")
14	14	private String title;
15		- @ApiModelProperty(value = "必传年")
	15	+ @ApiModelProperty(value = " 年")
16	16	private String year;
17		- @ApiModelProperty(value = "必传排序")
	17	+ @ApiModelProperty(value = " 排序")
18	18	private Integer sort;
19		- @ApiModelProperty(value = "必传文件路径")
	19	+ @ApiModelProperty(value = " 文件路径")
20	20	private String fileUrl ;
	21	+ @ApiModelProperty(value = " 文件名称展示用")
	22	+ private String fileName ;
21	23	@ApiModelProperty(value = "不用传")
22	24	private Date createTime;
23	25	@ApiModelProperty(value = "不用传")
24	26	private List<Point> list ;
25	27
	28	+ public String getFileName() {
	29	+ return fileName;
	30	+ }
	31	+
	32	+ public void setFileName(String fileName) {
	33	+ this.fileName = fileName;
	34	+ }
	35	+
26	36	public String getFileUrl() {
27	37	return fileUrl;
28	38	}
...	...
...	...	@@ -27,13 +27,23 @@ public class Video {
27	27	@ApiModelProperty(value = "状态 0预览1发布")
28	28	private int status ;
29	29	@ApiModelProperty(value = "图片地址")
30		- private int imgUrl ;
	30	+ private String imgUrl ;
	31	+ @ApiModelProperty(value = "视频时长")
	32	+ private String duration ;
31	33
32		- public int getImgUrl() {
	34	+ public String getDuration() {
	35	+ return duration;
	36	+ }
	37	+
	38	+ public void setDuration(String duration) {
	39	+ this.duration = duration;
	40	+ }
	41	+
	42	+ public String getImgUrl() {
33	43	return imgUrl;
34	44	}
35	45
36		- public void setImgUrl(int imgUrl) {
	46	+ public void setImgUrl(String imgUrl) {
37	47	this.imgUrl = imgUrl;
38	48	}
39	49
...	...
...	...	@@ -5,8 +5,6 @@ import com.sincere.student.mapper.AdvertMapper;
5	5	import com.sincere.student.model.Advert;
6	6	import com.sincere.student.service.AdvertService;
7	7	import org.springframework.beans.factory.annotation.Autowired;
8		-import org.springframework.cache.annotation.CacheEvict;
9		-import org.springframework.cache.annotation.Cacheable;
10	8	import org.springframework.stereotype.Service;
11	9
12	10	import java.util.List;
...	...
...	...	@@ -30,7 +30,12 @@ public class SubmitServiceImpl implements SubmitService {
30	30	public Page<SubmitFile> getAdminList(MessageSearchDto dto) {
31	31	Page<SubmitFile> result = new Page<>(dto.getPage(),dto.getPageSize());
32	32	PageHelper.startPage(dto.getPage(),dto.getPageSize());
33		- result.setList(submitFileMapper.getList(dto));
	33	+ List<SubmitFile> list = submitFileMapper.getList(dto) ;
	34	+ for(SubmitFile submitFile : list){
	35	+ String fileName = submitFile.getFileUrl().substring(submitFile.getFileUrl().lastIndexOf("/")+1);
	36	+ submitFile.setFileName(fileName);
	37	+ }
	38	+ result.setList(list);
34	39	result.setCount(submitFileMapper.getListCount(dto));
35	40	return result;
36	41	}
...	...	@@ -79,6 +84,23 @@ public class SubmitServiceImpl implements SubmitService {
79	84
80	85	@Override
81	86	public int update(SubmitFile submitFile) {
	87	+ if(StringUtils.isNotBlank(submitFile.getFileUrl())){
	88	+ int i = 0 ;
	89	+ pointMapper.deleteBySubmit(submitFile.getId());
	90	+ List<Point> list = new ArrayList<>();
	91	+ for(Point point :submitFile.getList()){
	92	+ point.setSubmitId(submitFile.getId());
	93	+ i++ ;
	94	+ list.add(point);
	95	+ if(i % 100 == 0){
	96	+ pointMapper.insertBatch(list);
	97	+ list = new ArrayList<>();
	98	+ }
	99	+ }
	100	+ if(list.size() > 0){
	101	+ pointMapper.insertBatch(list);
	102	+ }
	103	+ }
82	104	return submitFileMapper.updateByPrimaryKey(submitFile);
83	105	}
84	106	}
...	...
...	...	@@ -7,6 +7,7 @@
7	7	<result column="major" property="major"/>
8	8	<result column="major_code" property="majorCode"/>
9	9	<result column="p_id" property="pId"/>
	10	+ <result column="create_time" property="createTime"/>
10	11	</resultMap>
11	12
12	13	<select id="getList" parameterType="com.sincere.student.model.Major" resultMap="MajorMap">
...	...	@@ -37,8 +38,8 @@
37	38	</select>
38	39
39	40	<insert id="create" parameterType="com.sincere.student.model.Major" >
40		- insert into university_major (major,major_code,p_id)
41		- values (#{major},#{majorCode},#{pId})
	41	+ insert into university_major (major,major_code,p_id,create_time)
	42	+ values (#{major},#{majorCode},#{pId},GETDATE())
42	43	</insert>
43	44
44	45	<delete id="delete" parameterType="java.lang.Integer">
...	...
...	...	@@ -120,7 +120,7 @@
120	120	create_time, sort)
121	121	values (#{universityId,jdbcType=INTEGER}, #{columnType,jdbcType=INTEGER},
122	122	#{videoUrl,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR},
123		- #{createTime,jdbcType=TIMESTAMP}, #{sort,jdbcType=INTEGER})
	123	+ GETDATE(), #{sort,jdbcType=INTEGER})
124	124	</insert>
125	125
126	126	<update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsult">
...	...
...	...	@@ -10,7 +10,7 @@
10	10	</resultMap>
11	11
12	12	<select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
13		- select * from university_message
	13	+ select count(0) from university_message
14	14	<where>
15	15	<if test="search != null and search != ''">
16	16	and title like #{search}
...	...	@@ -41,7 +41,7 @@
41	41	insert into university_message (title, context,
42	42	phone, create_time)
43	43	values (#{title,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR},
44		- #{phone,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
	44	+ #{phone,jdbcType=VARCHAR}, GETDATE())
45	45	</insert>
46	46	<insert id="insertSelective" parameterType="com.sincere.student.model.Message">
47	47	insert into university_message
...	...
...	...	@@ -29,7 +29,7 @@
29	29	insert into university_reply (message_id, context,
30	30	create_time)
31	31	values (#{messageId,jdbcType=INTEGER}, #{context,jdbcType=VARCHAR},
32		- #{createTime,jdbcType=TIMESTAMP})
	32	+ GETDATE())
33	33	</insert>
34	34	<insert id="insertSelective" parameterType="com.sincere.student.model.Reply">
35	35	insert into university_reply
...	...