From 2f3069beda46767b59d567ec02b6382e85eefb49 Mon Sep 17 00:00:00 2001 From: 陈杰 <504987307@qq.com> Date: Fri, 20 Mar 2020 08:29:33 +0800 Subject: [PATCH] bug 修复 --- src/main/java/com/sincere/student/controller/AdminController.java | 39 +++++++++++++++++++++++++++++++++++++-- src/main/java/com/sincere/student/mapper/MajorMapper.java | 2 ++ src/main/java/com/sincere/student/model/Video.java | 14 ++++++++++++-- src/main/java/com/sincere/student/service/MajorService.java | 4 ++++ src/main/java/com/sincere/student/service/SubmitService.java | 2 ++ src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java | 5 +++++ src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java | 19 ++++++++++++------- src/main/resources/mapper/MajorMapper.xml | 17 +++++++++++++++++ src/main/resources/mapper/UniversitySubmitFileMapper.xml | 7 ++----- src/main/resources/mapper/VideoMapper.xml | 8 ++++++-- 10 files changed, 99 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/sincere/student/controller/AdminController.java b/src/main/java/com/sincere/student/controller/AdminController.java index 068f7b5..d4f1bb7 100644 --- a/src/main/java/com/sincere/student/controller/AdminController.java +++ b/src/main/java/com/sincere/student/controller/AdminController.java @@ -82,9 +82,35 @@ public class AdminController { @MemberAccess @ApiOperation("投档线更新接口 ,如果文件没更新，fileUrl不用传") @RequestMapping(value = "/submit/update" , method = RequestMethod.POST) - public BaseDto deleteFile(@RequestBody SubmitFile submitFile){ + public BaseDto updateFile(@RequestBody SubmitFile submitFile){ BaseDto result = new BaseDto<>(); - submitService.update(submitFile); + try{ + SubmitFile beforeFile = submitService.getById(submitFile.getId()); + if(beforeFile.getFileUrl().equals(submitFile.getFileUrl())){ + submitFile.setFileUrl(null); + }else { + List list = ExcelUtils.analysisExcel(submitFile.getFileUrl()); + List points = new ArrayList<>(); + for(Point point : list){ + Integer universityId = universityService.selectByName(point.getUniversityName()); + if(universityId == null){ + throw new ResultException(902,point.getUniversityName()+"不存在"); + } + point.setUniversityId(universityId); + Integer majorId = universityService.selectIdByMajor(point.getMajor(),universityId); + if(majorId == null){ + throw new ResultException(902,point.getUniversityName()+"-"+point.getMajor()+"关系不存在"); + } + point.setMajorId(majorId); + points.add(point); + } + submitFile.setList(points); + } + submitService.update(submitFile); + }catch (ResultException e){ + result.setSuccess(false); + result.setMessage(e.getMessage()); + } return result ; } @@ -381,6 +407,15 @@ public class AdminController { } @MemberAccess + @ApiOperation("获取专业列表 一级二级关系列表") + @RequestMapping(value = "/major/getList" , method = RequestMethod.POST) + public BaseDto> majorGetList(){ + BaseDto> result = new BaseDto<>(); + result.setData(majorService.selectMajor()); + return result ; + } + + @MemberAccess @ApiOperation("新增专业相关接口") @RequestMapping(value = "/major/createMajor" , method = RequestMethod.POST) public BaseDto createMajor(@RequestBody Major major){ diff --git a/src/main/java/com/sincere/student/mapper/MajorMapper.java b/src/main/java/com/sincere/student/mapper/MajorMapper.java index 20e47fc..ccd62bf 100644 --- a/src/main/java/com/sincere/student/mapper/MajorMapper.java +++ b/src/main/java/com/sincere/student/mapper/MajorMapper.java @@ -15,4 +15,6 @@ public interface MajorMapper { int update(Major major); int delete(int id); + + List selectMajor(); } diff --git a/src/main/java/com/sincere/student/model/Video.java b/src/main/java/com/sincere/student/model/Video.java index 170eaec..2274b07 100644 --- a/src/main/java/com/sincere/student/model/Video.java +++ b/src/main/java/com/sincere/student/model/Video.java @@ -26,12 +26,22 @@ public class Video { private String code; @ApiModelProperty(value = "状态 0预览1发布") private int status ; - @ApiModelProperty(value = "图片地址") + @ApiModelProperty(value = "图片地址 展示用 学校logo") private String imgUrl ; @ApiModelProperty(value = "视频时长") private String duration ; - @ApiModelProperty(value = "视频名称 展示用") + @ApiModelProperty(value = "视频标题") private String videoName ; + @ApiModelProperty(value = "视频封面") + private String coverUrl ; + + public String getCoverUrl() { + return coverUrl; + } + + public void setCoverUrl(String coverUrl) { + this.coverUrl = coverUrl; + } public String getVideoName() { return videoName; diff --git a/src/main/java/com/sincere/student/service/MajorService.java b/src/main/java/com/sincere/student/service/MajorService.java index 47b8501..18c7f30 100644 --- a/src/main/java/com/sincere/student/service/MajorService.java +++ b/src/main/java/com/sincere/student/service/MajorService.java @@ -4,6 +4,8 @@ import com.sincere.student.dto.MajorSearchDto; import com.sincere.student.model.Major; import com.sincere.student.utils.Page; +import java.util.List; + public interface MajorService { Page getList(MajorSearchDto majorSearchDto); @@ -13,4 +15,6 @@ public interface MajorService { int update(Major major); int delete(int id); + + List selectMajor(); } diff --git a/src/main/java/com/sincere/student/service/SubmitService.java b/src/main/java/com/sincere/student/service/SubmitService.java index b3834d4..2e94973 100644 --- a/src/main/java/com/sincere/student/service/SubmitService.java +++ b/src/main/java/com/sincere/student/service/SubmitService.java @@ -18,4 +18,6 @@ public interface SubmitService { int update(SubmitFile submitFile); + SubmitFile getById(int id); + } diff --git a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java index 808c353..08c5192 100644 --- a/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/MajorServiceImpl.java @@ -52,4 +52,9 @@ public class MajorServiceImpl implements MajorService { public int delete(int id) { return majorMapper.delete(id); } + + @Override + public List selectMajor() { + return majorMapper.selectMajor(); + } } 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 b58212d..1153e30 100644 --- a/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java +++ b/src/main/java/com/sincere/student/service/impl/SubmitServiceImpl.java @@ -83,24 +83,29 @@ public class SubmitServiceImpl implements SubmitService { } @Override - public int update(SubmitFile submitFile) { - if(StringUtils.isNotBlank(submitFile.getFileUrl())){ - int i = 0 ; + public int update(SubmitFile submitFile){ + if (StringUtils.isNotBlank(submitFile.getFileUrl())) { + int i = 0; pointMapper.deleteBySubmit(submitFile.getId()); List list = new ArrayList<>(); - for(Point point :submitFile.getList()){ + for (Point point : submitFile.getList()) { point.setSubmitId(submitFile.getId()); - i++ ; + i++; list.add(point); - if(i % 100 == 0){ + if (i % 100 == 0) { pointMapper.insertBatch(list); list = new ArrayList<>(); } } - if(list.size() > 0){ + if (list.size() > 0) { pointMapper.insertBatch(list); } } return submitFileMapper.updateByPrimaryKeySelective(submitFile); } + + @Override + public SubmitFile getById(int id) { + return submitFileMapper.selectByPrimaryKey(id); + } } diff --git a/src/main/resources/mapper/MajorMapper.xml b/src/main/resources/mapper/MajorMapper.xml index 79fc53c..a1d5879 100644 --- a/src/main/resources/mapper/MajorMapper.xml +++ b/src/main/resources/mapper/MajorMapper.xml @@ -55,4 +55,21 @@ where id = #{id} + + + + + + + + + + + diff --git a/src/main/resources/mapper/UniversitySubmitFileMapper.xml b/src/main/resources/mapper/UniversitySubmitFileMapper.xml index 92ab88c..535327e 100644 --- a/src/main/resources/mapper/UniversitySubmitFileMapper.xml +++ b/src/main/resources/mapper/UniversitySubmitFileMapper.xml @@ -106,12 +106,9 @@ order by sort - - id, title, year, sort, create_time - + diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml index 43c497c..4d63073 100644 --- a/src/main/resources/mapper/VideoMapper.xml +++ b/src/main/resources/mapper/VideoMapper.xml @@ -14,6 +14,7 @@ + - insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration) - values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration}) + insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name) + values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName}) @@ -124,6 +125,9 @@ duration=#{duration}, + + cover_url=#{coverUrl}, + column_type=#{columnType}, -- libgit2 0.21.0