研学代码提交

徐泉
1 parent b7a828a7
Showing 87 changed files with 1810 additions and 1507 deletions Show diff stats
src/main/java/com/sincere/student/Swagger2.java
src/main/java/com/sincere/student/access/MemberAccess.java
src/main/java/com/sincere/student/access/MemberInterceptor.java
src/main/java/com/sincere/student/controller/AdminController.java
src/main/java/com/sincere/student/controller/AppController.java
src/main/java/com/sincere/student/controller/CommonController.java
src/main/java/com/sincere/student/dto/ArticleSearchDto.java
src/main/java/com/sincere/student/dto/BaseDto.java
src/main/java/com/sincere/student/dto/ColumnDto.java
src/main/java/com/sincere/student/dto/ConsultSearchDto.java
src/main/java/com/sincere/student/dto/IdDto.java
src/main/java/com/sincere/student/dto/LinkUsDto.java
src/main/java/com/sincere/student/dto/MajorSearchDto.java
src/main/java/com/sincere/student/dto/MessageSearchDto.java
src/main/java/com/sincere/student/dto/PageDto.java
src/main/java/com/sincere/student/dto/PointSearchDto.java
src/main/java/com/sincere/student/dto/Province.java
src/main/java/com/sincere/student/dto/ReturnDto.java
src/main/java/com/sincere/student/dto/UniversitySearchDto.java
src/main/java/com/sincere/student/dto/VideoSearchDto.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class Swagger2 {
     @Bean
-   public Docket createRestApi() {
+    public Docket createRestApi() {
         ParameterBuilder ticketPar = new ParameterBuilder();
         List<Parameter> pars = new ArrayList<Parameter>();
         ticketPar.name("X-Authorization").description("user token")
@@ -40,12 +40,13 @@ public class Swagger2 {
                 .build().globalOperationParameters(pars);
     }
-     private ApiInfo apiInfo() {
+
+    private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-               .title("Spring Boot中使用Swagger2构建RESTful APIs")
-                 .description("接口文档")
-                 .termsOfServiceUrl("")
+                .title("Spring Boot中使用Swagger2构建RESTful APIs")
+                .description("接口文档")
+                .termsOfServiceUrl("")
                 .version("1.0")
-              .build();
-     }
+                .build();
+    }
 }
 package com.sincere.student.access;
 import java.lang.annotation.*;
+
 /**
  * 方法上有这个注解就表示需要登录
  */
@@ -21,13 +21,13 @@ public class MemberInterceptor extends HandlerInterceptorAdapter {
         if (handler instanceof HandlerMethod) {
             HandlerMethod myHandlerMethod = (HandlerMethod) handler;
-            Method method= myHandlerMethod.getMethod();
-            Annotation methodAnnotation=method.getAnnotation(MemberAccess.class);//方法上有该标记
-            if(methodAnnotation != null){
-                boolean isLogin = isLogin(request) ;
-                if(isLogin){
+            Method method = myHandlerMethod.getMethod();
+            Annotation methodAnnotation = method.getAnnotation(MemberAccess.class);//方法上有该标记
+            if (methodAnnotation != null) {
+                boolean isLogin = isLogin(request);
+                if (isLogin) {
                     return true;
-                }else{//未登录
+                } else {//未登录
                     //Ajax请求返回JSON
                     BaseDto repVo = new BaseDto();
                     repVo.setSuccess(false);
@@ -43,18 +43,18 @@ public class MemberInterceptor extends HandlerInterceptorAdapter {
         return true;
     }
-    private boolean isLogin(HttpServletRequest request) throws  Exception{
+    private boolean isLogin(HttpServletRequest request) throws Exception {
         try {
             String token = request.getHeader("X-Authorization");
-            if( token != null){
-                try{
+            if (token != null) {
+                try {
                     TokenUtils.validToken(token);
                     return true;
-                }catch (ResultException e){
+                } catch (ResultException e) {
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return false;
         }
         return false;
@@ -28,34 +28,34 @@ import java.util.List;
 public class AdminController {
     @Autowired
-    ColumnService columnService ;
+    ColumnService columnService;
     @Autowired
-    AdvertService advertService ;
+    AdvertService advertService;
     @Autowired
-    ArticleService articleService ;
+    ArticleService articleService;
     @Autowired
-    MajorService majorService ;
+    MajorService majorService;
     @Autowired
-    UniversityService universityService ;
+    UniversityService universityService;
     @Autowired
     ParameterService parameterService;
     @Autowired
-    VideoService videoService ;
+    VideoService videoService;
     @Autowired
-    ConsultService consultService ;
+    ConsultService consultService;
     @Autowired
-    UserService userService ;
+    UserService userService;
     @Autowired
-    MessageService messageService ;
+    MessageService messageService;
     @Autowired
     SubmitService submitService;
@@ -65,68 +65,68 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("投档线列表接口")
-    @RequestMapping(value = "/submit/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<SubmitFile>> getFileList(@RequestBody MessageSearchDto messageSearchDto){
+    @RequestMapping(value = "/submit/getList", method = RequestMethod.POST)
+    public BaseDto<Page<SubmitFile>> getFileList(@RequestBody MessageSearchDto messageSearchDto) {
         BaseDto<Page<SubmitFile>> result = new BaseDto<>();
         result.setData(submitService.getAdminList(messageSearchDto));
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("投档线删除接口")
-    @RequestMapping(value = "/submit/delete" , method = RequestMethod.POST)
-    public BaseDto deleteFile(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/submit/delete", method = RequestMethod.POST)
+    public BaseDto deleteFile(@RequestBody IdDto idDto) {
         BaseDto result = new BaseDto<>();
         submitService.delete(idDto.getId());
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("投档线更新接口 ,如果文件没更新，fileUrl不用传")
-    @RequestMapping(value = "/submit/update" , method = RequestMethod.POST)
-    public BaseDto updateFile(@RequestBody SubmitFile submitFile){
+    @RequestMapping(value = "/submit/update", method = RequestMethod.POST)
+    public BaseDto updateFile(@RequestBody SubmitFile submitFile) {
         BaseDto result = new BaseDto<>();
-        if(!submitFile.getFileUrl().contains("xls")){
-            result.setSuccess(false) ;
-            result.setMessage("请上传excel") ;
-            return result ;
+        if (!submitFile.getFileUrl().contains("xls")) {
+            result.setSuccess(false);
+            result.setMessage("请上传excel");
+            return result;
         }
-        try{
+        try {
             SubmitFile beforeFile = submitService.getById(submitFile.getId());
-            if(beforeFile.getFileUrl().equals(submitFile.getFileUrl())){
+            if (beforeFile.getFileUrl().equals(submitFile.getFileUrl())) {
                 submitFile.setFileUrl(null);
-            }else {
+            } else {
                 List<Point> list = ExcelUtils.analysisExcel(submitFile.getFileUrl());
                 submitFile.setList(list);
             }
             submitService.update(submitFile);
-        }catch (ResultException e){
+        } catch (ResultException e) {
             result.setSuccess(false);
             result.setMessage(e.getMessage());
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("投档线创建接口")
-    @RequestMapping(value = "/submit/createFile" , method = RequestMethod.POST)
-    public BaseDto createFile(@RequestBody SubmitFile submitFile){
+    @RequestMapping(value = "/submit/createFile", method = RequestMethod.POST)
+    public BaseDto createFile(@RequestBody SubmitFile submitFile) {
         BaseDto result = new BaseDto();
-        if(!submitFile.getFileUrl().contains("xls")){
+        if (!submitFile.getFileUrl().contains("xls")) {
             result.setSuccess(false);
             result.setMessage("请上传excel");
-            return result ;
+            return result;
         }
-        try{
+        try {
             List<Point> list = ExcelUtils.analysisExcel(submitFile.getFileUrl());
             submitFile.setList(list);
             submitService.create(submitFile);
-        }catch (ResultException e){
+        } catch (ResultException e) {
             e.printStackTrace();
             result.setSuccess(false);
             result.setMessage(e.getMessage());
         }
-        return result ;
+        return result;
     }
@@ -135,73 +135,73 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("留言板列表接口")
-    @RequestMapping(value = "/message/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Message>> getMessageList(@RequestBody MessageSearchDto messageSearchDto){
+    @RequestMapping(value = "/message/getList", method = RequestMethod.POST)
+    public BaseDto<Page<Message>> getMessageList(@RequestBody MessageSearchDto messageSearchDto) {
         BaseDto<Page<Message>> result = new BaseDto<>();
         result.setData(messageService.getList(messageSearchDto));
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("留言板详情，管理回复 接口")
-    @RequestMapping(value = "/message/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/message/getDetail", method = RequestMethod.POST)
+    public BaseDto<Message> getMessageDetail(@RequestBody IdDto idDto) {
         BaseDto<Message> result = new BaseDto<>();
         result.setData(messageService.getDetail(idDto.getId()));
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("回复接口")
-    @RequestMapping(value = "/message/reply" , method = RequestMethod.POST)
-    public BaseDto getMessageDetail(@RequestBody Reply reply){
+    @RequestMapping(value = "/message/reply", method = RequestMethod.POST)
+    public BaseDto getMessageDetail(@RequestBody Reply reply) {
         messageService.reply(reply);
-        return new BaseDto() ;
+        return new BaseDto();
     }
     @MemberAccess
     @ApiOperation("删除某个回复 接口")
-    @RequestMapping(value = "/message/deleteReply" , method = RequestMethod.POST)
-    public BaseDto<Message> deleteReply(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/message/deleteReply", method = RequestMethod.POST)
+    public BaseDto<Message> deleteReply(@RequestBody IdDto idDto) {
         messageService.deleteReply(idDto.getId());
-        return new BaseDto<>() ;
+        return new BaseDto<>();
     }
     @MemberAccess
     @ApiOperation("删除留言 接口")
-    @RequestMapping(value = "/message/deleteMessage" , method = RequestMethod.POST)
-    public BaseDto<Message> deleteMessage(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/message/deleteMessage", method = RequestMethod.POST)
+    public BaseDto<Message> deleteMessage(@RequestBody IdDto idDto) {
         messageService.deleteMessage(idDto.getId());
-        return new BaseDto<>() ;
+        return new BaseDto<>();
     }
     /**
      * 登录 修改密码
      */
     @ApiOperation("登录")
-    @RequestMapping(value = "/login" , method = RequestMethod.POST)
-    public BaseDto<String> login(@RequestBody SysUser sysUser){
-        BaseDto<String> result = new BaseDto<>() ;
-       SysUser user = userService.getByUser();
-       if(user.getUserName().equals(sysUser.getUserName()) && user.getPassword().equals(sysUser.getPassword())){
-           String token = TokenUtils.buildToken(user.getUserName());
-           result.setData(token);
-       }else {
-           result.setSuccess(false);
-           result.setMessage("账号密码错误");
-       }
-       return result ;
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public BaseDto<String> login(@RequestBody SysUser sysUser) {
+        BaseDto<String> result = new BaseDto<>();
+        SysUser user = userService.getByUser();
+        if (user.getUserName().equals(sysUser.getUserName()) && user.getPassword().equals(sysUser.getPassword())) {
+            String token = TokenUtils.buildToken(user.getUserName());
+            result.setData(token);
+        } else {
+            result.setSuccess(false);
+            result.setMessage("账号密码错误");
+        }
+        return result;
     }
     @MemberAccess
     @ApiOperation("修改密码")
-    @RequestMapping(value = "/updatePassword" , method = RequestMethod.POST)
-    public BaseDto updatePassword(@RequestBody SysUser sysUser){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
+    public BaseDto updatePassword(@RequestBody SysUser sysUser) {
+        BaseDto result = new BaseDto();
         SysUser user = userService.getByUser();
         user.setPassword(sysUser.getPassword());
         userService.update(sysUser);
-        return result ;
+        return result;
     }
     /**
@@ -209,65 +209,65 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取招生咨询会相关接口")
-    @RequestMapping(value = "/consult/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Consult>> getConsultList(@RequestBody ConsultSearchDto consultSearchDto){
-        BaseDto<Page<Consult>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/consult/getList", method = RequestMethod.POST)
+    public BaseDto<Page<Consult>> getConsultList(@RequestBody ConsultSearchDto consultSearchDto) {
+        BaseDto<Page<Consult>> result = new BaseDto<>();
         consultSearchDto.setStatus(0);
         consultSearchDto.setColumnType(-1);
         Page<Consult> page = consultService.getList(consultSearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("获取招生咨询会详情相关接口")
-    @RequestMapping(value = "/consult/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Consult> getConsultDetail(@RequestBody IdDto idDto){
-        BaseDto<Consult> result = new BaseDto<>() ;
+    @RequestMapping(value = "/consult/getDetail", method = RequestMethod.POST)
+    public BaseDto<Consult> getConsultDetail(@RequestBody IdDto idDto) {
+        BaseDto<Consult> result = new BaseDto<>();
         result.setData(consultService.getDetail(idDto.getId()));
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("新建招生咨询会相关接口")
-    @RequestMapping(value = "/consult/createConsult" , method = RequestMethod.POST)
-    public BaseDto<ReturnDto> createConsult(@RequestBody UniversityConsult universityConsult){
-        BaseDto<ReturnDto> result = new BaseDto() ;
+    @RequestMapping(value = "/consult/createConsult", method = RequestMethod.POST)
+    public BaseDto<ReturnDto> createConsult(@RequestBody UniversityConsult universityConsult) {
+        BaseDto<ReturnDto> result = new BaseDto();
         ReturnDto dto = new ReturnDto();
-        List<Consult> list = consultService.selectByUniversityIdAndColumnType(universityConsult.getUniversityId(),universityConsult.getColumnType());
-        if(list != null && list.size() > 0){
+        List<Consult> list = consultService.selectByUniversityIdAndColumnType(universityConsult.getUniversityId(), universityConsult.getColumnType());
+        if (list != null && list.size() > 0) {
             result.setSuccess(false);
             result.setMessage("同一栏目下，已有该学校招生咨询");
-        }else {
+        } else {
             int id = consultService.create(universityConsult);
-            try{
+            try {
                 String name = universityService.getById(universityConsult.getUniversityId()).getName();
                 dto.setName(name);
-            }catch (Exception e){
+            } catch (Exception e) {
             }
             dto.setId(id);
             result.setData(dto);
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("修改招生咨询会相关接口")
-    @RequestMapping(value = "/consult/updateConsult" , method = RequestMethod.POST)
-    public BaseDto updateConsult(@RequestBody UniversityConsult universityConsult){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/consult/updateConsult", method = RequestMethod.POST)
+    public BaseDto updateConsult(@RequestBody UniversityConsult universityConsult) {
+        BaseDto result = new BaseDto();
         consultService.update(universityConsult);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除招生咨询会（传主键）")
-    @RequestMapping(value = "/consult/delete" , method = RequestMethod.POST)
-    public BaseDto deleteConsult(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/consult/delete", method = RequestMethod.POST)
+    public BaseDto deleteConsult(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         consultService.delete(idDto.getId());
-        return result ;
+        return result;
     }
     /**
@@ -275,49 +275,49 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取视频相关接口")
-    @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
-        BaseDto<Page<Video>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/video/getList", method = RequestMethod.POST)
+    public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto) {
+        BaseDto<Page<Video>> result = new BaseDto<>();
         Page<Video> page = videoService.getList(videoSearchDto);
         result.setData(page);
-        System.out.println("result:"+result.toString()+"----------page:"+page.toString());
-        return result ;
+        System.out.println("result:" + result.toString() + "----------page:" + page.toString());
+        return result;
     }
     @MemberAccess
     @ApiOperation("新建视频相关接口")
-    @RequestMapping(value = "/video/createVideo" , method = RequestMethod.POST)
-    public BaseDto<ReturnDto> createVideo(@RequestBody Video video){
-        BaseDto<ReturnDto> result = new BaseDto() ;
+    @RequestMapping(value = "/video/createVideo", method = RequestMethod.POST)
+    public BaseDto<ReturnDto> createVideo(@RequestBody Video video) {
+        BaseDto<ReturnDto> result = new BaseDto();
         ReturnDto dto = new ReturnDto();
         int id = videoService.create(video);
-        try{
+        try {
             String name = universityService.getById(video.getUniversityId()).getName();
             dto.setName(name);
             dto.setId(video.getUniversityId());
-        }catch (Exception e){
+        } catch (Exception e) {
         }
         result.setData(dto);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("修改视频相关接口")
-    @RequestMapping(value = "/video/updateVideo" , method = RequestMethod.POST)
-    public BaseDto updateVideo(@RequestBody Video video){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/video/updateVideo", method = RequestMethod.POST)
+    public BaseDto updateVideo(@RequestBody Video video) {
+        BaseDto result = new BaseDto();
         videoService.update(video);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除视频（传主键）")
-    @RequestMapping(value = "/video/delete" , method = RequestMethod.POST)
-    public BaseDto deleteVideo(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/video/delete", method = RequestMethod.POST)
+    public BaseDto deleteVideo(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         videoService.delete(idDto.getId());
-        return result ;
+        return result;
     }
     /**
@@ -325,35 +325,35 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("联系我们")
-    @RequestMapping(value = "/linkUs/getLinkUs" , method = RequestMethod.POST)
-    public BaseDto<String> getLinkUs(){
+    @RequestMapping(value = "/linkUs/getLinkUs", method = RequestMethod.POST)
+    public BaseDto<String> getLinkUs() {
         BaseDto<String> result = new BaseDto<>();
-        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us) ;
-        if(parameter != null){
+        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us);
+        if (parameter != null) {
             result.setData(parameter.getMessage());
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("还未设置联系我们的图片");
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("更新联系我们")
-    @RequestMapping(value = "/linkUs/updateLinkUs" , method = RequestMethod.POST)
-    public BaseDto updateLinkUs(@RequestBody LinkUsDto dto){
+    @RequestMapping(value = "/linkUs/updateLinkUs", method = RequestMethod.POST)
+    public BaseDto updateLinkUs(@RequestBody LinkUsDto dto) {
         BaseDto result = new BaseDto<>();
-        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us) ;
-        if(parameter == null){
+        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us);
+        if (parameter == null) {
             parameter = new Parameter();
             parameter.setCode(ParameterUtils.link_us);
             parameter.setMessage(dto.getUrl());
             parameterService.create(parameter);
-        }else {
+        } else {
             parameter.setMessage(dto.getUrl());
             parameterService.update(parameter);
         }
-        return result ;
+        return result;
     }
     /**
@@ -361,43 +361,43 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取高校相关接口")
-    @RequestMapping(value = "/university/getUniversityList" , method = RequestMethod.POST)
-    public BaseDto<Page<University>> getUniversityList(@RequestBody UniversitySearchDto universitySearchDto){
-        BaseDto<Page<University>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/university/getUniversityList", method = RequestMethod.POST)
+    public BaseDto<Page<University>> getUniversityList(@RequestBody UniversitySearchDto universitySearchDto) {
+        BaseDto<Page<University>> result = new BaseDto<>();
         Page<University> page = universityService.getList(universitySearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("创建高校相关接口")
-    @RequestMapping(value = "/university/createUniversity" , method = RequestMethod.POST)
-    public BaseDto createUniversity(@RequestBody University university){
+    @RequestMapping(value = "/university/createUniversity", method = RequestMethod.POST)
+    public BaseDto createUniversity(@RequestBody University university) {
         universityService.create(university);
-        return new BaseDto() ;
+        return new BaseDto();
     }
     @MemberAccess
     @ApiOperation("更新高校相关接口")
-    @RequestMapping(value = "/university/updateUniversity" , method = RequestMethod.POST)
-    public BaseDto updateUniversity(@RequestBody University university){
+    @RequestMapping(value = "/university/updateUniversity", method = RequestMethod.POST)
+    public BaseDto updateUniversity(@RequestBody University university) {
         universityService.update(university);
-        return new BaseDto() ;
+        return new BaseDto();
     }
     @MemberAccess
     @ApiOperation("删除高校相关接口")
-    @RequestMapping(value = "/university/delete" , method = RequestMethod.POST)
-    public BaseDto deleteUniversity(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/university/delete", method = RequestMethod.POST)
+    public BaseDto deleteUniversity(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         universityService.delete(idDto.getId());
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("高校添加专业相关接口")
-    @RequestMapping(value = "/university/addMajor" , method = RequestMethod.POST)
-    public BaseDto addMajor(@RequestBody List<UniversityMajor> list){
+    @RequestMapping(value = "/university/addMajor", method = RequestMethod.POST)
+    public BaseDto addMajor(@RequestBody List<UniversityMajor> list) {
         universityService.addMajor(list);
         return new BaseDto();
     }
@@ -407,102 +407,101 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取专业相关接口")
-    @RequestMapping(value = "/major/getMajorList" , method = RequestMethod.POST)
-    public BaseDto<Page<Major>> getMajorList(@RequestBody MajorSearchDto majorSearchDto){
+    @RequestMapping(value = "/major/getMajorList", method = RequestMethod.POST)
+    public BaseDto<Page<Major>> getMajorList(@RequestBody MajorSearchDto majorSearchDto) {
         BaseDto<Page<Major>> result = new BaseDto<>();
         Page<Major> page = majorService.getList(majorSearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("获取专业列表  一级二级关系列表")
-    @RequestMapping(value = "/major/getList" , method = RequestMethod.POST)
-    public BaseDto<List<Major>> majorGetList(){
+    @RequestMapping(value = "/major/getList", method = RequestMethod.POST)
+    public BaseDto<List<Major>> majorGetList() {
         BaseDto<List<Major>> result = new BaseDto<>();
         result.setData(majorService.selectMajor());
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("新增专业相关接口")
-    @RequestMapping(value = "/major/createMajor" , method = RequestMethod.POST)
-    public BaseDto createMajor(@RequestBody Major major){
+    @RequestMapping(value = "/major/createMajor", method = RequestMethod.POST)
+    public BaseDto createMajor(@RequestBody Major major) {
         majorService.create(major);
-        return new BaseDto() ;
+        return new BaseDto();
     }
     @MemberAccess
     @ApiOperation("修改专业相关接口")
-    @RequestMapping(value = "/major/updateMajor" , method = RequestMethod.POST)
-    public BaseDto updateMajor(@RequestBody Major major){
+    @RequestMapping(value = "/major/updateMajor", method = RequestMethod.POST)
+    public BaseDto updateMajor(@RequestBody Major major) {
         BaseDto result = new BaseDto();
         Major before = majorService.getById(major.getId());
-        if(before.getPid() == -1 && major.getPid() != -1){
+        if (before.getPid() == -1 && major.getPid() != -1) {
             result.setSuccess(false);
             result.setMessage("一级专业不能被设置成二级");
-        }else {
+        } else {
             majorService.update(major);
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除专业相关接口")
-    @RequestMapping(value = "/major/delete" , method = RequestMethod.POST)
-    public BaseDto deleteMajor(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/major/delete", method = RequestMethod.POST)
+    public BaseDto deleteMajor(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         majorService.delete(idDto.getId());
-        return result ;
+        return result;
     }
-
     /**
-     *权威解读(文章广告)相关接口
+     * 权威解读(文章广告)相关接口
      */
     @MemberAccess
     @ApiOperation("获取权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Article>> getArticleList(@RequestBody ArticleSearchDto articleSearchDto){
-        BaseDto<Page<Article>> result = new BaseDto<>() ;
+    @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.getAdminList(articleSearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("新建权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/createArticle" , method = RequestMethod.POST)
-    public BaseDto<Integer> createArticle(@RequestBody Article article){
-        BaseDto<Integer> result = new BaseDto() ;
-        if(StringUtils.isBlank(article.getImageUrl())){
+    @RequestMapping(value = "/article/createArticle", method = RequestMethod.POST)
+    public BaseDto<Integer> createArticle(@RequestBody Article article) {
+        BaseDto<Integer> result = new BaseDto();
+        if (StringUtils.isBlank(article.getImageUrl())) {
             result.setSuccess(false);
             result.setMessage("请上传封面图片");
-        }else {
+        } else {
             int id = articleService.create(article);
             result.setData(id);
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("修改权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/updateArticle" , method = RequestMethod.POST)
-    public BaseDto updateArticle(@RequestBody Article article){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/article/updateArticle", method = RequestMethod.POST)
+    public BaseDto updateArticle(@RequestBody Article article) {
+        BaseDto result = new BaseDto();
         articleService.update(article);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除权威解读(文章广告)（传主键）")
-    @RequestMapping(value = "/article/delete" , method = RequestMethod.POST)
-    public BaseDto deleteArticle(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/article/delete", method = RequestMethod.POST)
+    public BaseDto deleteArticle(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         articleService.delete(idDto.getId());
-        return result ;
+        return result;
     }
@@ -511,76 +510,76 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取开屏图片")
-    @RequestMapping(value = "/advert/getScreen" , method = RequestMethod.POST)
-    public BaseDto<Advert> getScreen(){
-        BaseDto<Advert> result = new BaseDto<>() ;
+    @RequestMapping(value = "/advert/getScreen", method = RequestMethod.POST)
+    public BaseDto<Advert> getScreen() {
+        BaseDto<Advert> result = new BaseDto<>();
         result.setData(advertService.getScreen());
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("更新上传开屏图片")
-    @RequestMapping(value = "/advert/updateScreen" , method = RequestMethod.POST)
-    public BaseDto updateScreen(@RequestBody LinkUsDto dto){
-        Advert advert = advertService.getScreen() ;
-        if(advert == null){
-            Advert temp =new Advert();
+    @RequestMapping(value = "/advert/updateScreen", method = RequestMethod.POST)
+    public BaseDto updateScreen(@RequestBody LinkUsDto dto) {
+        Advert advert = advertService.getScreen();
+        if (advert == null) {
+            Advert temp = new Advert();
             temp.setSort(1);
             temp.setType(AdvertEnums.screen.getType());
             temp.setImgUrl(dto.getUrl());
             temp.setUrlLink(dto.getUrlLink());
             advertService.create(temp);
-        }else {
-            if(StringUtils.isNotBlank(dto.getUrl())){
+        } else {
+            if (StringUtils.isNotBlank(dto.getUrl())) {
                 advert.setImgUrl(dto.getUrl());
             }
             advert.setUrlLink(dto.getUrlLink());
             advertService.update(advert);
         }
-        return new BaseDto() ;
+        return new BaseDto();
     }
     @MemberAccess
     @ApiOperation("获取banner")
-    @RequestMapping(value = "/advert/getBanner" , method = RequestMethod.POST)
-    public BaseDto<List<Advert>> getBanner(){
-        BaseDto<List<Advert>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/advert/getBanner", method = RequestMethod.POST)
+    public BaseDto<List<Advert>> getBanner() {
+        BaseDto<List<Advert>> result = new BaseDto<>();
         result.setData(advertService.getBanner());
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("上传banner")
-    @RequestMapping(value = "/advert/createBanner" , method = RequestMethod.POST)
-    public BaseDto createBanner(@RequestBody Advert advert){
+    @RequestMapping(value = "/advert/createBanner", method = RequestMethod.POST)
+    public BaseDto createBanner(@RequestBody Advert advert) {
         BaseDto result = new BaseDto();
-        if(StringUtils.isBlank(advert.getImgUrl())){
+        if (StringUtils.isBlank(advert.getImgUrl())) {
             result.setSuccess(false);
             result.setMessage("图片地址不能为空");
-        }else {
+        } else {
             advert.setType(AdvertEnums.banner.getType());
             advertService.create(advert);
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("更新banner")
-    @RequestMapping(value = "/advert/updateBanner" , method = RequestMethod.POST)
-    public BaseDto updateBanner(@RequestBody Advert advert){
+    @RequestMapping(value = "/advert/updateBanner", method = RequestMethod.POST)
+    public BaseDto updateBanner(@RequestBody Advert advert) {
         BaseDto result = new BaseDto();
         advert.setType(AdvertEnums.banner.getType());
         advertService.update(advert);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除banner（传主键）")
-    @RequestMapping(value = "/advert/delete" , method = RequestMethod.POST)
-    public BaseDto deleteBanner(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/advert/delete", method = RequestMethod.POST)
+    public BaseDto deleteBanner(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
         advertService.delete(idDto.getId());
-        return result ;
+        return result;
     }
@@ -589,94 +588,94 @@ public class AdminController {
      */
     @MemberAccess
     @ApiOperation("获取栏目列表（1 文章 2学校 3视频）")
-    @RequestMapping(value = "/column/getList" , method = RequestMethod.POST)
-    public BaseDto<List<ColumnType>> getColumnList(@RequestBody ColumnDto columnDto){
+    @RequestMapping(value = "/column/getList", method = RequestMethod.POST)
+    public BaseDto<List<ColumnType>> getColumnList(@RequestBody ColumnDto columnDto) {
         BaseDto<List<ColumnType>> result = new BaseDto<>();
         ColumnEnums columnEnums = ColumnEnums.getByType(columnDto.getType());
-        if(columnEnums != null){
+        if (columnEnums != null) {
             List<ColumnType> data = columnService.getList(columnDto);
             result.setData(data);
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("类型不匹配");
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("创建栏目（type : 1 文章 2学校 3视频）")
-    @RequestMapping(value = "/column/create" , method = RequestMethod.POST)
-    public BaseDto createColumn(@RequestBody ColumnType columnType){
-        BaseDto result = new BaseDto() ;
+    @RequestMapping(value = "/column/create", method = RequestMethod.POST)
+    public BaseDto createColumn(@RequestBody ColumnType columnType) {
+        BaseDto result = new BaseDto();
         columnService.create(columnType);
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("获取详情 栏目")
-    @RequestMapping(value = "/column/getDetail" , method = RequestMethod.POST)
-    public BaseDto createColumn(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
+    @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 ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("更新栏目（type : 1 文章 2学校 3视频）")
-    @RequestMapping(value = "/column/update" , method = RequestMethod.POST)
-    public BaseDto updateColumn(@RequestBody ColumnType columnType){
-        BaseDto result = new BaseDto() ;
-        if(columnType.getId() > 0){
+    @RequestMapping(value = "/column/update", method = RequestMethod.POST)
+    public BaseDto updateColumn(@RequestBody ColumnType columnType) {
+        BaseDto result = new BaseDto();
+        if (columnType.getId() > 0) {
             columnService.update(columnType);
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("id没传");
         }
-        return result ;
+        return result;
     }
     @MemberAccess
     @ApiOperation("删除栏目（传主键）")
-    @RequestMapping(value = "/column/delete" , method = RequestMethod.POST)
-    public BaseDto deleteColumn(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto() ;
-        int id = idDto.getId() ;
+    @RequestMapping(value = "/column/delete", method = RequestMethod.POST)
+    public BaseDto deleteColumn(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto();
+        int id = idDto.getId();
         ColumnType columnType = columnService.selectDetail(id);
-        if(columnType.getType() == ColumnEnums.article.getType()){
+        if (columnType.getType() == ColumnEnums.article.getType()) {
             ArticleSearchDto articleSearchDto = new ArticleSearchDto();
             articleSearchDto.setColumnType(columnType.getId());
             articleSearchDto.setPage(1);
             articleSearchDto.setPageSize(10);
             Page<Article> articlePage = articleService.getList(articleSearchDto);
-            if(articlePage.getCount() > 0){
+            if (articlePage.getCount() > 0) {
                 result.setSuccess(false);
                 result.setMessage("还有关联的权威解读，无法删除");
-            }else {
+            } else {
                 columnService.delete(id);
             }
-        }else if(columnType.getType() == ColumnEnums.university.getType()){
-            Page<Consult> consultPage =consultService.getColumnList(columnType.getId(),1,10);
-            if(consultPage.getCount() > 0){
+        } else if (columnType.getType() == ColumnEnums.university.getType()) {
+            Page<Consult> consultPage = consultService.getColumnList(columnType.getId(), 1, 10);
+            if (consultPage.getCount() > 0) {
                 result.setSuccess(false);
                 result.setMessage("还有关联的招生咨询会信息，无法删除");
-            }else {
+            } else {
                 columnService.delete(id);
             }
-        }else if(columnType.getType() == ColumnEnums.video.getType()){
+        } else if (columnType.getType() == ColumnEnums.video.getType()) {
             VideoSearchDto videoSearchDto = new VideoSearchDto();
             videoSearchDto.setColumnType(columnType.getId());
             videoSearchDto.setPage(1);
             videoSearchDto.setPageSize(10);
             Page<Video> videoPage = videoService.getList(videoSearchDto);
-            if(videoPage.getCount() > 0){
+            if (videoPage.getCount() > 0) {
                 result.setSuccess(false);
                 result.setMessage("还有关联的视频，无法删除");
-            }else {
+            } else {
                 columnService.delete(id);
             }
-        }else {
+        } else {
             columnService.delete(id);
         }
-        return result ;
+        return result;
     }
 }
@@ -25,34 +25,34 @@ public class AppController {
     @Autowired
-    ColumnService columnService ;
+    ColumnService columnService;
     @Autowired
-    AdvertService advertService ;
+    AdvertService advertService;
     @Autowired
-    ArticleService articleService ;
+    ArticleService articleService;
     @Autowired
-    MajorService majorService ;
+    MajorService majorService;
     @Autowired
-    UniversityService universityService ;
+    UniversityService universityService;
     @Autowired
     ParameterService parameterService;
     @Autowired
-    VideoService videoService ;
+    VideoService videoService;
     @Autowired
-    ConsultService consultService ;
+    ConsultService consultService;
     @Autowired
-    UserService userService ;
+    UserService userService;
     @Autowired
-    MessageService messageService ;
+    MessageService messageService;
     @Autowired
     SubmitService submitService;
@@ -62,55 +62,55 @@ public class AppController {
      * 广告相关接口
      */
     @ApiOperation("获取开屏图片")
-    @RequestMapping(value = "/advert/getScreen" , method = RequestMethod.POST)
-    public BaseDto<Advert> getScreen(){
-        BaseDto<Advert> result = new BaseDto<>() ;
+    @RequestMapping(value = "/advert/getScreen", method = RequestMethod.POST)
+    public BaseDto<Advert> getScreen() {
+        BaseDto<Advert> result = new BaseDto<>();
         result.setData(advertService.getScreen());
-        return result ;
+        return result;
     }
     @ApiOperation("获取banner")
-    @RequestMapping(value = "/advert/getBanner" , method = RequestMethod.POST)
-    public BaseDto<List<Advert>> getBanner(){
-        BaseDto<List<Advert>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/advert/getBanner", method = RequestMethod.POST)
+    public BaseDto<List<Advert>> getBanner() {
+        BaseDto<List<Advert>> result = new BaseDto<>();
         result.setData(advertService.getBanner());
-        return result ;
+        return result;
     }
     @ApiOperation("获取首页学校 咨询列表")
-    @RequestMapping(value = "/consult/getConsultList" , method = RequestMethod.POST)
-    public BaseDto<List<AppConsult>> getConsultList(){
+    @RequestMapping(value = "/consult/getConsultList", method = RequestMethod.POST)
+    public BaseDto<List<AppConsult>> getConsultList() {
         BaseDto<List<AppConsult>> result = new BaseDto<>();
         List<AppConsult> data = new ArrayList<>();
         ColumnDto columnDto = new ColumnDto();
         columnDto.setType(ColumnEnums.university.getType());
         List<ColumnType> columnTypes = columnService.getList(columnDto);
-        if(columnTypes != null && columnTypes.size() > 0){
-            for(ColumnType columnType : columnTypes){
+        if (columnTypes != null && columnTypes.size() > 0) {
+            for (ColumnType columnType : columnTypes) {
                 AppConsult appConsult = new AppConsult();
                 appConsult.setColumnTypeId(columnType.getId());
                 appConsult.setName(columnType.getName());
-                appConsult.setList(consultService.getColumnList(columnType.getId(),1,3).getList());
-                if(appConsult.getList() != null && appConsult.getList().size() > 0){
+                appConsult.setList(consultService.getColumnList(columnType.getId(), 1, 3).getList());
+                if (appConsult.getList() != null && appConsult.getList().size() > 0) {
                     data.add(appConsult);
-                    if(data.size() == 2){
+                    if (data.size() == 2) {
                         break;
                     }
-                }else {
+                } else {
                     continue;
                 }
             }
             result.setData(data);
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("后台暂未分配招生咨询会栏目");
         }
-        return result ;
+        return result;
     }
     @ApiOperation("首页 搜索 按钮  咨询列表")
-    @RequestMapping(value = "/consult/getConsultListSearch" , method = RequestMethod.POST)
-    public BaseDto<List<AppConsult>> getConsultListSearch(@RequestBody ConsultSearchDto consultSearchDto){
+    @RequestMapping(value = "/consult/getConsultListSearch", method = RequestMethod.POST)
+    public BaseDto<List<AppConsult>> getConsultListSearch(@RequestBody ConsultSearchDto consultSearchDto) {
         consultSearchDto.setStatus(1);
         consultSearchDto.setPage(1);
         consultSearchDto.setPageSize(3);
@@ -119,157 +119,157 @@ public class AppController {
         ColumnDto columnDto = new ColumnDto();
         columnDto.setType(ColumnEnums.university.getType());
         List<ColumnType> columnTypes = columnService.getList(columnDto);
-        if(columnTypes != null && columnTypes.size() > 0){
-            for(ColumnType columnType : columnTypes){
+        if (columnTypes != null && columnTypes.size() > 0) {
+            for (ColumnType columnType : columnTypes) {
                 consultSearchDto.setColumnType(columnType.getId());
                 Page<Consult> page = consultService.getList(consultSearchDto);
                 AppConsult appConsult = new AppConsult();
                 appConsult.setColumnTypeId(columnType.getId());
                 appConsult.setName(columnType.getName());
                 appConsult.setList(page.getList());
-                if(appConsult.getList() != null && appConsult.getList().size() > 0){
+                if (appConsult.getList() != null && appConsult.getList().size() > 0) {
                     data.add(appConsult);
                 }
             }
             result.setData(data);
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("后台暂未分配招生咨询会栏目");
         }
-        return result ;
+        return result;
     }
     @ApiOperation("获取首页学校 咨询列表 more")
-    @RequestMapping(value = "/consult/getConsultPage" , method = RequestMethod.POST)
-    public BaseDto<Page<Consult>> getConsultTypeList(@RequestBody ConsultPageDto consultPageDto){
+    @RequestMapping(value = "/consult/getConsultPage", method = RequestMethod.POST)
+    public BaseDto<Page<Consult>> getConsultTypeList(@RequestBody ConsultPageDto consultPageDto) {
         BaseDto<Page<Consult>> result = new BaseDto<>();
-        result.setData(consultService.getColumnList(consultPageDto.getColumnTypeId(),consultPageDto.getPage(),consultPageDto.getPageSize()));
-        return result ;
+        result.setData(consultService.getColumnList(consultPageDto.getColumnTypeId(), consultPageDto.getPage(), consultPageDto.getPageSize()));
+        return result;
     }
     /**
      * 招生咨询会
      */
     @ApiOperation("获取招生咨询会相关接口")
-    @RequestMapping(value = "/consult/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Consult>> getConsultList(@RequestBody ConsultSearchDto consultSearchDto){
-        BaseDto<Page<Consult>> result = new BaseDto<>() ;
+    @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 ;
+        return result;
     }
     @ApiOperation("获取招生咨询会详情相关接口")
-    @RequestMapping(value = "/consult/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Consult> getConsultDetail(@RequestBody IdDto id){
-        BaseDto<Consult> result = new BaseDto<>() ;
+    @RequestMapping(value = "/consult/getDetail", method = RequestMethod.POST)
+    public BaseDto<Consult> getConsultDetail(@RequestBody IdDto id) {
+        BaseDto<Consult> result = new BaseDto<>();
         result.setData(consultService.getDetail(id.getId()));
-        return result ;
+        return result;
     }
     /**
      * 栏目相关接口
      */
     @ApiOperation("获取栏目列表（1 文章 2学校 3视频）")
-    @RequestMapping(value = "/column/getList" , method = RequestMethod.POST)
-    public BaseDto<List<ColumnType>> getColumnList(@RequestBody IdDto idDto){
+    @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() ;
+        if (columnEnums != null) {
+            ColumnDto columnDto = new ColumnDto();
             columnDto.setType(type);
             List<ColumnType> data = columnService.getList(columnDto);
             result.setData(data);
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("类型不匹配");
         }
-        return result ;
+        return result;
     }
     /**
-     *权威解读(文章广告)相关接口
+     * 权威解读(文章广告)相关接口
      */
     @ApiOperation("获取权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Article>> getArticleList(@RequestBody ArticleSearchDto articleSearchDto){
-        BaseDto<Page<Article>> result = new BaseDto<>() ;
+    @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 ;
+        return result;
     }
     @ApiOperation("获取权威解读(文章广告)详情相关接口")
-    @RequestMapping(value = "/article/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Article> getDetail(@RequestBody IdDto idDto){
-        BaseDto<Article> result = new BaseDto<>() ;
-        Article article = articleService.selectById(idDto.getId()) ;
+    @RequestMapping(value = "/article/getDetail", method = RequestMethod.POST)
+    public BaseDto<Article> getDetail(@RequestBody IdDto idDto) {
+        BaseDto<Article> result = new BaseDto<>();
+        Article article = articleService.selectById(idDto.getId());
         result.setData(article);
         Article temp = new Article();
         temp.setId(idDto.getId());
-        temp.setLookNumber(article.getLookNumber()+1);
+        temp.setLookNumber(article.getLookNumber() + 1);
         temp.setStatus(-1);
         articleService.update(temp);
-        return result ;
+        return result;
     }
     @ApiOperation(" 点赞 权威解读(文章广告)相关接口")
-    @RequestMapping(value = "/article/good" , method = RequestMethod.POST)
-    public BaseDto good(@RequestBody IdDto idDto){
-        BaseDto result = new BaseDto<>() ;
-        Article article = articleService.selectById(idDto.getId()) ;
+    @RequestMapping(value = "/article/good", method = RequestMethod.POST)
+    public BaseDto good(@RequestBody IdDto idDto) {
+        BaseDto result = new BaseDto<>();
+        Article article = articleService.selectById(idDto.getId());
         Article temp = new Article();
         temp.setId(idDto.getId());
-        temp.setGoodNumber(article.getGoodNumber()+1);
+        temp.setGoodNumber(article.getGoodNumber() + 1);
         temp.setStatus(-1);
         articleService.update(temp);
-        return result ;
+        return result;
     }
     @ApiOperation("获取权威解读(文章广告) 相关咨询 相关接口 传学校id")
-    @RequestMapping(value = "/article/getRelation" , method = RequestMethod.POST)
-    public BaseDto<List<Article>> getRelation(@RequestBody IdDto idDto){
-        BaseDto<List<Article>> result = new BaseDto<>() ;
+    @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(idDto.getId()));
-        return result ;
+        return result;
     }
     @ApiOperation("联系我们")
-    @RequestMapping(value = "/linkUs/getLinkUs" , method = RequestMethod.POST)
-    public BaseDto<String> getLinkUs(){
+    @RequestMapping(value = "/linkUs/getLinkUs", method = RequestMethod.POST)
+    public BaseDto<String> getLinkUs() {
         BaseDto<String> result = new BaseDto<>();
-        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us) ;
-        if(parameter != null){
+        Parameter parameter = parameterService.getByCode(ParameterUtils.link_us);
+        if (parameter != null) {
             result.setData(parameter.getMessage());
-        }else {
+        } else {
             result.setSuccess(false);
             result.setMessage("还未设置联系我们的图片");
         }
-        return result ;
+        return result;
     }
     @ApiOperation("留言板，只传page,pageSize")
-    @RequestMapping(value = "/message/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Message>> insertMessage(@RequestBody MessageSearchDto messageSearchDto){
+    @RequestMapping(value = "/message/getList", method = RequestMethod.POST)
+    public BaseDto<Page<Message>> insertMessage(@RequestBody MessageSearchDto messageSearchDto) {
         BaseDto<Page<Message>> result = new BaseDto<>();
         result.setData(messageService.getList(messageSearchDto));
-        return result ;
+        return result;
     }
     @ApiOperation("留言")
-    @RequestMapping(value = "/message/create" , method = RequestMethod.POST)
-    public BaseDto insertMessage(@RequestBody Message message){
+    @RequestMapping(value = "/message/create", method = RequestMethod.POST)
+    public BaseDto insertMessage(@RequestBody Message message) {
         messageService.create(message);
         return new BaseDto();
     }
     @ApiOperation("留言详情")
-    @RequestMapping(value = "/message/detail" , method = RequestMethod.POST)
-    public BaseDto<Message> insertMessage(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/message/detail", method = RequestMethod.POST)
+    public BaseDto<Message> insertMessage(@RequestBody IdDto idDto) {
         BaseDto<Message> result = new BaseDto<>();
         result.setData(messageService.getDetail(idDto.getId()));
         return result;
@@ -277,55 +277,55 @@ public class AppController {
     @ApiOperation("获取视频相关接口")
-    @RequestMapping(value = "/video/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<Video>> getVideoList(@RequestBody VideoSearchDto videoSearchDto){
-        BaseDto<Page<Video>> result = new BaseDto<>() ;
+    @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.getUniversityList(videoSearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     @ApiOperation("获取视频相关接口")
-    @RequestMapping(value = "/video/getDetail" , method = RequestMethod.POST)
-    public BaseDto<Page<Video>> getVideoDetail(@RequestBody VideoSearchDto videoSearchDto){
-        BaseDto<Page<Video>> result = new BaseDto<>() ;
+    @RequestMapping(value = "/video/getDetail", method = RequestMethod.POST)
+    public BaseDto<Page<Video>> getVideoDetail(@RequestBody VideoSearchDto videoSearchDto) {
+        BaseDto<Page<Video>> result = new BaseDto<>();
         Page<Video> page = videoService.getList(videoSearchDto);
         result.setData(page);
-        return result ;
+        return result;
     }
     /**
      * 投档线
      */
     @ApiOperation("投档线列表接口")
-    @RequestMapping(value = "/submit/getList" , method = RequestMethod.POST)
-    public BaseDto<Page<SubmitLine>> getFileList(@RequestBody PointSearchDto pointSearchDto){
+    @RequestMapping(value = "/submit/getList", method = RequestMethod.POST)
+    public BaseDto<Page<SubmitLine>> getFileList(@RequestBody PointSearchDto pointSearchDto) {
         BaseDto<Page<SubmitLine>> result = new BaseDto<>();
         result.setData(submitService.getAppList(pointSearchDto));
-        return result ;
+        return result;
     }
     @ApiOperation("投档线首页列表接口")
-    @RequestMapping(value = "/submit/getSubmitList" , method = RequestMethod.POST)
-    public BaseDto<Page<SubmitFile>> getSubmitList(@RequestBody PageDto pageDto){
+    @RequestMapping(value = "/submit/getSubmitList", method = RequestMethod.POST)
+    public BaseDto<Page<SubmitFile>> getSubmitList(@RequestBody PageDto pageDto) {
         BaseDto<Page<SubmitFile>> result = new BaseDto<>();
         MessageSearchDto pointSearchDto = new MessageSearchDto();
         pointSearchDto.setPage(pageDto.getPage());
         pointSearchDto.setPageSize(pageDto.getPageSize());
         result.setData(submitService.getAdminList(pointSearchDto));
-        return result ;
+        return result;
     }
     @ApiOperation("具体某个投档线详情接口")
-    @RequestMapping(value = "/submit/getDetail" , method = RequestMethod.POST)
-    public BaseDto<SubmitLine> getSubmitDetail(@RequestBody IdDto idDto){
+    @RequestMapping(value = "/submit/getDetail", method = RequestMethod.POST)
+    public BaseDto<SubmitLine> getSubmitDetail(@RequestBody IdDto idDto) {
         BaseDto<SubmitLine> result = new BaseDto<>();
         PointSearchDto pointSearchDto = new PointSearchDto();
         pointSearchDto.setPage(1);
         pointSearchDto.setPageSize(9999);
         pointSearchDto.setSubmitId(idDto.getId());
         result.setData(submitService.getAppList(pointSearchDto).getList().get(0));
-        return result ;
+        return result;
     }
 }
@@ -30,38 +30,38 @@ import java.util.*;
 public class CommonController {
     @Autowired
-    CommonService commonService ;
+    CommonService commonService;
     @Autowired
-    ParameterService parameterService ;
+    ParameterService parameterService;
     private static List<Area> list = new ArrayList<>();
     private static List<Province> provinces = new ArrayList<>();
-    @RequestMapping(value = "GetWxSign",method = RequestMethod.GET)
+    @RequestMapping(value = "GetWxSign", method = RequestMethod.GET)
     @ApiOperation(value = "获取微信分享签名")
-    public BaseDto<WxSign> GetWxSign(String url){
+    public BaseDto<WxSign> GetWxSign(String url) {
         try {
             url = java.net.URLDecoder.decode(url, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        url=url.replaceAll("\\+", "%2B");
-        BaseDto<WxSign> result=new BaseDto<>();
+        url = url.replaceAll("\\+", "%2B");
+        BaseDto<WxSign> result = new BaseDto<>();
 //        String r=Get("http://114.55.30.100:1111/api/UserRegisterApp/GetWxShareSign","url="+url);
 //        JSONObject jsonObject= JSONObject.parseObject(r);
 //        String data = jsonObject.getString("result");
 //        WxSign wxSign=JSON.parseObject(data,new TypeReference<WxSign>(){});
 //        result.setData(wxSign);
-        WxSign wxSign1=new WxSign();
+        WxSign wxSign1 = new WxSign();
         wxSign1.setTimestamp(Long.toString(System.currentTimeMillis()));
         wxSign1.setNoncestr(UUID.randomUUID().toString());
         String token = getToken();
-        String js=Get("https://api.weixin.qq.com/cgi-bin/ticket/getticket","type=jsapi&access_token="+token);
-        JSONObject jsonObject= JSONObject.parseObject(js);
+        String js = Get("https://api.weixin.qq.com/cgi-bin/ticket/getticket", "type=jsapi&access_token=" + token);
+        JSONObject jsonObject = JSONObject.parseObject(js);
         wxSign1.setJsapi_ticket(jsonObject.getString("ticket"));
         String rawstring = "jsapi_ticket=" + wxSign1.getJsapi_ticket() + "&noncestr=" + wxSign1.getNoncestr() + "&timestamp=" + wxSign1.getTimestamp() + "&url=" + url + "";
         wxSign1.setSignature(SHA1(rawstring));
@@ -70,61 +70,61 @@ public class CommonController {
     }
     @ApiOperation("省份")
-    @RequestMapping(value = "getProvince",method = RequestMethod.GET)
-    public List<Area> getProvince(){
-        if(list.size() == 0){
+    @RequestMapping(value = "getProvince", method = RequestMethod.GET)
+    public List<Area> getProvince() {
+        if (list.size() == 0) {
             List<Area> areas = commonService.getProvince();
-            for(Area area : areas){
+            for (Area area : areas) {
                 List<Area> cityList = commonService.getCity(area.getCode());
-                if(area.getName().contains("市")){
+                if (area.getName().contains("市")) {
                     //获取全部
                     area.setList(cityList);
-                }else {
+                } else {
                     //获取4位的市
                     List<Area> trueCityList = new ArrayList<>();
-                    for(Area city : cityList){
-                        if(city.getCode().length() < 6){
+                    for (Area city : cityList) {
+                        if (city.getCode().length() < 6) {
                             trueCityList.add(city);
                         }
                     }
                     area.setList(trueCityList);
                 }
             }
-            list = areas ;
+            list = areas;
         }
-        return list ;
+        return list;
     }
     @ApiOperation("省份")
-    @RequestMapping(value = "getProvince2",method = RequestMethod.GET)
-    public List<Province> getProvince2(){
-        if(provinces.size() == 0){
-            if(list.size() == 0){
+    @RequestMapping(value = "getProvince2", method = RequestMethod.GET)
+    public List<Province> getProvince2() {
+        if (provinces.size() == 0) {
+            if (list.size() == 0) {
                 List<Area> areas = commonService.getProvince();
-                for(Area area : areas){
+                for (Area area : areas) {
                     List<Area> cityList = commonService.getCity(area.getCode());
-                    if(area.getName().contains("市")){
+                    if (area.getName().contains("市")) {
                         //获取全部
                         area.setList(cityList);
-                    }else {
+                    } else {
                         //获取4位的市
                         List<Area> trueCityList = new ArrayList<>();
-                        for(Area city : cityList){
-                            if(city.getCode().length() < 6){
+                        for (Area city : cityList) {
+                            if (city.getCode().length() < 6) {
                                 trueCityList.add(city);
                             }
                         }
                         area.setList(trueCityList);
                     }
                 }
-                list = areas ;
+                list = areas;
             }
-            for(Area area : list){
-                Province province = new Province() ;
+            for (Area area : list) {
+                Province province = new Province();
                 province.setValue(area.getName());
                 province.setLabel(area.getName());
                 List<Province> cityList = new ArrayList<>();
-                for(Area city : area.getList()){
+                for (Area city : area.getList()) {
                     Province newCity = new Province();
                     newCity.setLabel(city.getName());
                     newCity.setValue(city.getName());
@@ -134,30 +134,30 @@ public class CommonController {
                 provinces.add(province);
             }
         }
-        return provinces ;
+        return provinces;
     }
     @ApiOperation("市")
-    @RequestMapping(value = "getCity",method = RequestMethod.GET)
-    public List<Area> getCity(String code){
+    @RequestMapping(value = "getCity", method = RequestMethod.GET)
+    public List<Area> getCity(String code) {
         return commonService.getCity(code);
     }
     @ApiOperation("高校类型")
-    @RequestMapping(value = "getUniversityType",method = RequestMethod.GET)
-    public List<String> getUniversityType(){
-        String[] array = new String[]{"综合类","理工类","师范类","农林类","政法类","医药类"
-                ,"财经类","民族类","语言类","艺术类","体育类","军事类","旅游类"};
-        List<String> list =  Arrays.asList(array);
-        return list ;
+    @RequestMapping(value = "getUniversityType", method = RequestMethod.GET)
+    public List<String> getUniversityType() {
+        String[] array = new String[]{"综合类", "理工类", "师范类", "农林类", "政法类", "医药类"
+                , "财经类", "民族类", "语言类", "艺术类", "体育类", "军事类", "旅游类"};
+        List<String> list = Arrays.asList(array);
+        return list;
     }
     @ApiOperation("高校教学层次")
-    @RequestMapping(value = "getUniversityLevel",method = RequestMethod.GET)
-    public List<String> getUniversityLevel(){
-        String[] array = new String[]{"本科","高职"};
-        List<String> list =  Arrays.asList(array);
-        return list ;
+    @RequestMapping(value = "getUniversityLevel", method = RequestMethod.GET)
+    public List<String> getUniversityLevel() {
+        String[] array = new String[]{"本科", "高职"};
+        List<String> list = Arrays.asList(array);
+        return list;
     }
@@ -188,7 +188,7 @@ public class CommonController {
             }
             // 定义 BufferedReader输入流来读取URL的响应
             in = new BufferedReader(new InputStreamReader(
-                    connection.getInputStream(),"UTF-8"));
+                    connection.getInputStream(), "UTF-8"));
             String line;
             while ((line = in.readLine()) != null) {
                 result += line;
@@ -215,8 +215,8 @@ public class CommonController {
         String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appID + "&secret="
                 + appScret;
         try {
-            URL getUrl=new URL(url);
-            HttpURLConnection http=(HttpURLConnection)getUrl.openConnection();
+            URL getUrl = new URL(url);
+            HttpURLConnection http = (HttpURLConnection) getUrl.openConnection();
             http.setRequestMethod("GET");
             http.setRequestProperty("Content-Type",
                     "application/x-www-form-urlencoded");
@@ -4,16 +4,16 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 @ApiModel
-public class ArticleSearchDto extends PageDto{
+public class ArticleSearchDto extends PageDto {
     @ApiModelProperty(value = "文章类型 1广告文章  2权威解读 必传")
-    private int articleType ;
+    private int articleType;
     @ApiModelProperty(value = "标题")
-    private String title ;
+    private String title;
     @ApiModelProperty(value = "文章栏目")
-    private int columnType ;
+    private int columnType;
     @ApiModelProperty(value = "状态 0预览1发布 都不用传")
-    private int status ;
+    private int status;
     public int getStatus() {
         return status;
@@ -7,11 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
 public class BaseDto<T> {
     @ApiModelProperty(value = "接口成功与否")
-    private boolean success ;
+    private boolean success;
     @ApiModelProperty(value = "错误信息")
-    private String message ;
+    private String message;
     @ApiModelProperty(value = "数据")
-    private T data ;
+    private T data;
     public boolean isSuccess() {
         return success;
@@ -38,7 +38,7 @@ public class BaseDto&lt;T&gt; {
     }
     public BaseDto() {
-        this.success = true ;
+        this.success = true;
     }
     @Override
@@ -2,8 +2,8 @@ package com.sincere.student.dto;
 public class ColumnDto {
-    private int type ;
-    private String name ;
+    private int type;
+    private String name;
     public int getType() {
         return type;
@@ -7,17 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
 public class ConsultSearchDto extends PageDto {
     @ApiModelProperty(value = "栏目类型")
-    private int columnType ;
+    private int columnType;
     @ApiModelProperty(value = "查询学校")
-    private String universityName ;
+    private String universityName;
     @ApiModelProperty(value = "省")
-    private String province ;
+    private String province;
     @ApiModelProperty(value = "市")
-    private String city ;
+    private String city;
     @ApiModelProperty(value = "专业")
-    private String majorName ;
+    private String majorName;
     @ApiModelProperty(value = "状态 0预览1发布 都不用传")
-    private int status ;
+    private int status;
     public int getStatus() {
         return status;
@@ -2,7 +2,7 @@ package com.sincere.student.dto;
 public class IdDto {
-    private int id ;
+    private int id;
     public int getId() {
         return id;
@@ -2,8 +2,8 @@ package com.sincere.student.dto;
 public class LinkUsDto {
-    private String url ;
-    private String urlLink ;
+    private String url;
+    private String urlLink;
     public String getUrlLink() {
         return urlLink;
@@ -7,9 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 public class MajorSearchDto extends PageDto {
     @ApiModelProperty(value = "查询名称，或编码")
-    private String search ;
+    private String search;
     @ApiModelProperty(value = "父级专业id  查一级专业时，pid传-1")
-    private  int pid ;
+    private int pid;
     public int getPid() {
         return pid;
@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class MessageSearchDto extends PageDto {
     @ApiModelProperty(value = "搜索")
-    private String search ;
+    private String search;
     public String getSearch() {
         return search;
@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel
 public class PageDto {
     @ApiModelProperty(value = "页码")
-    private int page ;
+    private int page;
     @ApiModelProperty(value = "每页数量")
-    private int pageSize ;
+    private int pageSize;
     public int getPage() {
         return page;
@@ -7,19 +7,19 @@ import io.swagger.annotations.ApiModelProperty;
 public class PointSearchDto extends PageDto {
     @ApiModelProperty(value = "投档线主键")
-    private int submitId ;
+    private int submitId;
     @ApiModelProperty(value = "查询学校")
-    private String universityName ;
+    private String universityName;
     @ApiModelProperty(value = "省")
-    private String province ;
+    private String province;
     @ApiModelProperty(value = "市")
-    private String city ;
+    private String city;
     @ApiModelProperty(value = "专业")
-    private String majorName ;
+    private String majorName;
     @ApiModelProperty(value = "分数")
-    private int point ;
+    private int point;
     @ApiModelProperty(value = "位次")
-    private int rank ;
+    private int rank;
     public String getUniversityName() {
         return universityName;
@@ -4,9 +4,9 @@ import java.util.List;
 public class Province {
-    private String value ;
-    private String label ;
-    private List<Province> children ;
+    private String value;
+    private String label;
+    private List<Province> children;
     public String getValue() {
         return value;
@@ -2,8 +2,8 @@ package com.sincere.student.dto;
 public class ReturnDto {
-    private int id ;
-    private String name ;
+    private int id;
+    private String name;
     public int getId() {
         return id;
@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class UniversitySearchDto extends PageDto {
     @ApiModelProperty(value = "查询名称")
-    private String search ;
+    private String search;
     public String getSearch() {
         return search;
@@ -7,14 +7,14 @@ import io.swagger.annotations.ApiModelProperty;
 public class VideoSearchDto extends PageDto {
     @ApiModelProperty(value = "视频栏目主键")
-    private int columnType ;
+    private int columnType;
     @ApiModelProperty(value = "查询名称")
-    private String universityName ;
+    private String universityName;
     @ApiModelProperty(value = "学校主键")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "状态 0预览1发布 都不用传")
-    private int status ;
+    private int status;
     public int getUniversityId() {
         return universityId;
@@ -11,11 +11,11 @@ import java.util.List;
 public class AppConsult {
     @ApiModelProperty(value = "招生咨询栏目主键")
-    private int columnTypeId ;
+    private int columnTypeId;
     @ApiModelProperty(value = "招生咨询栏目名称")
-    private String name ;
+    private String name;
     @ApiModelProperty(value = "具体招生咨询 信息")
-    private List<Consult> list ;
+    private List<Consult> list;
     public int getColumnTypeId() {
         return columnTypeId;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 public class ConsultPageDto extends PageDto {
     @ApiModelProperty(value = "招生咨询栏目主键")
-    private int columnTypeId ;
+    private int columnTypeId;
     public int getColumnTypeId() {
         return columnTypeId;
@@ -9,11 +9,11 @@ import java.util.List;
 public class SubmitLine {
     @ApiModelProperty(value = "主键")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "标题")
-    private String title ;
+    private String title;
     @ApiModelProperty(value = "学校列表")
-    private List<SubmitUniv> universityList ;
+    private List<SubmitUniv> universityList;
     public int getId() {
         return id;
@@ -9,17 +9,17 @@ import java.util.List;
 public class SubmitUniv {
     @ApiModelProperty(value = "主键")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "学校名称")
-    private String universityName ;
+    private String universityName;
     @ApiModelProperty(value = "专业")
-    private String major ;
+    private String major;
     @ApiModelProperty(value = "分数")
-    private int grade ;
+    private int grade;
     @ApiModelProperty(value = "招收数量")
-    private int enrollNumber ;
+    private int enrollNumber;
     @ApiModelProperty(value = "位次号")
-    private int rank ;
+    private int rank;
     public String getMajor() {
         return major;
@@ -5,7 +5,7 @@ public enum AdvertEnums {
     screen(1),
     banner(2);
-    private int type ;
+    private int type;
     AdvertEnums(int type) {
         this.type = type;
@@ -5,7 +5,7 @@ public enum ArticleEnums {
     advert(1),
     article(2);
-    private int type ;
+    private int type;
     ArticleEnums(int type) {
         this.type = type;
@@ -2,12 +2,12 @@ package com.sincere.student.enums;
 public enum ColumnEnums {
-    article(1,"权威解读"),
-    university(2,"招生"),
-    video(3,"视频");
+    article(1, "权威解读"),
+    university(2, "招生"),
+    video(3, "视频");
-    private int type ;
-    private String message ;
+    private int type;
+    private String message;
     public int getType() {
         return type;
@@ -30,12 +30,12 @@ public enum ColumnEnums {
         this.message = message;
     }
-    public static ColumnEnums getByType(int type){
-        for(ColumnEnums columnEnums : ColumnEnums.values()){
-            if(columnEnums.getType() == type){
-                return columnEnums ;
+    public static ColumnEnums getByType(int type) {
+        for (ColumnEnums columnEnums : ColumnEnums.values()) {
+            if (columnEnums.getType() == type) {
+                return columnEnums;
             }
         }
-        return null ;
+        return null;
     }
 }
@@ -2,5 +2,5 @@ package com.sincere.student.enums;
 public class ParameterUtils {
-    public static String link_us = "link_us" ;
+    public static String link_us = "link_us";
 }
@@ -6,8 +6,10 @@ import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+
 /**
  * 用于解决跨域问题
+ *
  * @author chen
  * @version 1.0
  * @date 2019/10/11 0011 10:17
@@ -25,7 +27,8 @@ public class AllowOriginFilter implements Filter {
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Methods", "*");
         response.setHeader("Access-Control-Allow-Credentials", "true");
-        response.setHeader("Access-Control-Allow-Headers","*");
+        response.setHeader("Access-Control-Allow-Headers", "*");
+        response.setHeader("Access-Control-Request-Headers", "*");
         chain.doFilter(req, res);
     }
@@ -2,6 +2,7 @@ package com.sincere.student.mapper;
 import com.sincere.student.dto.ArticleSearchDto;
 import com.sincere.student.model.Article;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -22,4 +23,6 @@ public interface ArticleMapper {
     int update(Article article);
     Article getAdvert();
+
+    List<Article> countSort(@Param(value = "sort") int sort, @Param(value = "flag") int flag, @Param(value = "id") Integer id);
 }
@@ -2,6 +2,7 @@ package com.sincere.student.mapper;
 import com.sincere.student.dto.ColumnDto;
 import com.sincere.student.model.ColumnType;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -16,4 +17,6 @@ public interface ColumnMapper {
     int update(ColumnType columnType);
     int delete(int id);
+
+    List<ColumnType> countSort(@Param(value = "sort") int sort, @Param(value = "type") int type, @Param(value = "flag") int flag, @Param(value = "id") Integer id);
 }
@@ -3,6 +3,7 @@ package com.sincere.student.mapper;
 import com.sincere.student.dto.ConsultSearchDto;
 import com.sincere.student.model.Consult;
 import com.sincere.student.model.UniversityConsult;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -28,4 +29,8 @@ public interface UniversityConsultMapper {
     List<Consult> selectByUniversityIdAndColumnType(UniversityConsult consult);
+    List<Consult> countSort(@Param(value = "sort") int sort, @Param(value = "flag") int flag, @Param(value = "id") Integer id);
+
+    int updateSort(Consult consult);
+
 }
 \ No newline at end of file
@@ -14,5 +14,5 @@ public interface UniversityMajorMapper {
     List<Major> selectUniversityMajor(int universityId);
-    Integer selectIdByMajor(Map<String,String> map);
+    Integer selectIdByMajor(Map<String, String> map);
 }
@@ -2,6 +2,7 @@ package com.sincere.student.mapper;
 import com.sincere.student.dto.VideoSearchDto;
 import com.sincere.student.model.Video;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -24,4 +25,6 @@ public interface VideoMapper {
     Video getById(int id);
     int updateRead(int id);
+
+    List<Video> countSort(@Param(value = "sort") int sort, @Param(value = "flag") int flag, @Param(value = "id") Integer id);
 }
@@ -11,21 +11,21 @@ public class Advert implements Serializable {
     private static final long serialVersionUID = 765348013299664647L;
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "广告类型 1：开屏 2:banner  所有接口不用传")
-    private int type ;
+    private int type;
     @ApiModelProperty(value = "必传 图片地址")
-    private String imgUrl ;
+    private String imgUrl;
     @ApiModelProperty(value = "外链")
-    private String urlLink ;
+    private String urlLink;
     @ApiModelProperty(value = "必传 排序")
-    private int sort ;
+    private int sort;
     @ApiModelProperty(value = "状态  预留字段 所有接口不用传")
-    private int status ;
+    private int status;
     @ApiModelProperty(value = "创建时间 所有接口不用传")
-    private Date createTime ;
+    private Date createTime;
     @ApiModelProperty(value = "标题")
-    private String title ;
+    private String title;
     public int getId() {
         return id;
@@ -4,10 +4,10 @@ import java.util.List;
 public class Area {
-    private String code ;
-    private String name ;
+    private String code;
+    private String name;
-    private List<Area> list ;
+    private List<Area> list;
     public List<Area> getList() {
         return list;
@@ -10,41 +10,41 @@ import java.util.List;
 public class Article {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "必传 标题")
-    private String title ;
+    private String title;
     @ApiModelProperty(value = "栏目  type=1 不用传")
-    private int columnType ;
+    private int columnType;
     @ApiModelProperty(value = "栏目中文")
-    private String columnTypeString ;
+    private String columnTypeString;
     @ApiModelProperty(value = "必传 大学id")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "必传 排序")
-    private int sort ;
+    private int sort;
     @ApiModelProperty(value = "内容")
-    private String context ;
+    private String context;
     @ApiModelProperty(value = "必传 作者")
-    private String author ;
+    private String author;
     @ApiModelProperty(value = "封面图片")
-    private String imageUrl ;
+    private String imageUrl;
     @ApiModelProperty(value = "封面图片 展示用")
-    private List<String> imageUrlList ;
+    private List<String> imageUrlList;
     @ApiModelProperty(value = "封面图片数量  展示用")
-    private int imageCount ;
+    private int imageCount;
     @ApiModelProperty(value = "视频链接")
-    private String videoUrl ;
+    private String videoUrl;
     @ApiModelProperty(value = "外链")
-    private String articleLink ;
+    private String articleLink;
     @ApiModelProperty(value = "点赞数 不用传")
-    private int goodNumber ;
+    private int goodNumber;
     @ApiModelProperty(value = "浏览量 不用传")
-    private int lookNumber ;
+    private int lookNumber;
     @ApiModelProperty(value = "创建时间 不用传")
-    private Date createTime ;
+    private Date createTime;
     @ApiModelProperty(value = "文章类型 1广告文章  2权威解读 ")
-    private int type ;
+    private int type;
     @ApiModelProperty(value = "状态 0预览1发布")
-    private int status ;
+    private int status;
     public String getColumnTypeString() {
         return columnTypeString;
@@ -77,6 +77,7 @@ public class Article {
     public void setStatus(int status) {
         this.status = status;
     }
+
     public int getType() {
         return type;
     }
@@ -10,17 +10,17 @@ import java.util.Date;
 public class ColumnType implements Serializable {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "栏目类型（1 文章 2学校 3视频）")
-    private int type ;
+    private int type;
     @ApiModelProperty(value = "名称")
-    private String name ;
+    private String name;
     @ApiModelProperty(value = "排序")
-    private int sort ;
+    private int sort;
     @ApiModelProperty(value = "创建时间, 新增，修改接口不用传")
-    private Date createTime ;
+    private Date createTime;
     @ApiModelProperty(value = "外链,只有type=1传")
-    private String urlLink ;
+    private String urlLink;
     public int getId() {
         return id;
@@ -10,17 +10,17 @@ import java.util.List;
 public class Consult {
     @ApiModelProperty(value = "主键")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "学校主键")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "排序")
-    private int sort ;
+    private int sort;
     @ApiModelProperty(value = "图片地址")
-    private String imgUrl ;
+    private String imgUrl;
     @ApiModelProperty(value = "名称")
-    private String name ;
+    private String name;
     @ApiModelProperty(value = "编码")
-    private String code ;
+    private String code;
     @ApiModelProperty(value = "栏目分类")
     private Integer columnType;
     @ApiModelProperty(value = "栏目分类名称")
@@ -38,10 +38,31 @@ public class Consult {
     @ApiModelProperty(value = "状态")
     private Integer status;
     @ApiModelProperty(value = "4个栏目")
-    private List<UniversityConsultDetail> list ;
+    private List<UniversityConsultDetail> list;
     @ApiModelProperty(value = "阅读量")
     private int readNumber;
+    @ApiModelProperty(value = "背景图片地址")
+    private String background;
+    @ApiModelProperty(value = "模板排版信息")
+    private String modelList;
+
+    public String getBackground() {
+        return background;
+    }
+
+    public void setBackground(String background) {
+        this.background = background;
+    }
+
+    public String getModelList() {
+        return modelList;
+    }
+
+    public void setModelList(String modelList) {
+        this.modelList = modelList;
+    }
+
     public String getColumnTypeString() {
         return columnTypeString;
     }
@@ -10,17 +10,17 @@ import java.util.List;
 public class Major {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "必传 专业名")
-    private String major ;
+    private String major;
     @ApiModelProperty(value = "必传 专业编码")
-    private String majorCode ;
+    private String majorCode;
     @ApiModelProperty(value = "父级专业id") //-1 说明是一级专业
-    private int pid ;
+    private int pid;
     @ApiModelProperty(value = "创建时间")
-    private Date createTime ;
+    private Date createTime;
-    private List<Major> children ;
+    private List<Major> children;
     public List<Major> getChildren() {
         return children;
@@ -19,7 +19,7 @@ public class Message {
     @ApiModelProperty(value = "不用传")
     private Date createTime;
     @ApiModelProperty(value = "相差的时间")
-    private Long[] distanceTimes ;
+    private Long[] distanceTimes;
     public Long[] getDistanceTimes() {
         return distanceTimes;
@@ -29,7 +29,7 @@ public class Message {
         this.distanceTimes = distanceTimes;
     }
-    private List<Reply> list ;
+    private List<Reply> list;
     public List<Reply> getList() {
         return list;
@@ -2,8 +2,8 @@ package com.sincere.student.model;
 public class Parameter {
-    private String code ;
-    private String message ;
+    private String code;
+    private String message;
     public String getCode() {
         return code;
@@ -7,7 +7,7 @@ public class Point {
     private Integer submitId;
     private String universityName;
-    private String major ;
+    private String major;
     private Integer grade;
@@ -17,7 +17,7 @@ public class Point {
     private Date createTime;
     private String province;
-    private String city ;
+    private String city;
     public Integer getId() {
         return id;
@@ -17,7 +17,7 @@ public class Reply {
     private Date createTime;
     @ApiModelProperty(value = "相差的时间")
-    private Long[] distanceTimes ;
+    private Long[] distanceTimes;
     public Long[] getDistanceTimes() {
         return distanceTimes;
@@ -17,13 +17,13 @@ public class SubmitFile {
     @ApiModelProperty(value = " 排序")
     private Integer sort;
     @ApiModelProperty(value = " 文件路径")
-    private String fileUrl ;
+    private String fileUrl;
     @ApiModelProperty(value = " 文件名称  展示用")
-    private String fileName ;
+    private String fileName;
     @ApiModelProperty(value = "不用传")
     private Date createTime;
     @ApiModelProperty(value = "不用传")
-    private List<Point> list ;
+    private List<Point> list;
     public String getFileName() {
         return fileName;
@@ -10,29 +10,29 @@ import java.util.List;
 public class University {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "必传 学校名称")
-    private String name ;
+    private String name;
     @ApiModelProperty(value = "必传 学校编码")
-    private String code ;
+    private String code;
     @ApiModelProperty(value = "必传 高校学科类型")
-    private String universityType ;
+    private String universityType;
     @ApiModelProperty(value = "必传 主管部门")
     private String department;
     @ApiModelProperty(value = "必传 所在省")
-    private String province ;
+    private String province;
     @ApiModelProperty(value = "必传 所在市")
-    private String city ;
+    private String city;
     @ApiModelProperty(value = "必传 办学层次")
-    private String level ;
+    private String level;
     @ApiModelProperty(value = "联系方式")
-    private String phone ;
+    private String phone;
     @ApiModelProperty(value = "logo")
-    private String logoUrl ;
+    private String logoUrl;
     @ApiModelProperty(value = "创建时间")
-    private Date createTime ;
+    private Date createTime;
     @ApiModelProperty(value = "专业列表,展示用")
-    private List<Major> majorList ;
+    private List<Major> majorList;
     public String getLogoUrl() {
         return logoUrl;
@@ -18,6 +18,8 @@ public class UniversityConsult {
     private String videoUrl;
     @ApiModelProperty(value = "内容")
     private String context;
+    @ApiModelProperty(value = "背景图片地址")
+    private String background;
     @ApiModelProperty(value = "图片地址")
     private String imgUrl;
     @ApiModelProperty(value = "时间")
@@ -27,10 +29,29 @@ public class UniversityConsult {
     @ApiModelProperty(value = "4个栏目")
     private List<UniversityConsultDetail> list;
     @ApiModelProperty(value = "状态 0预览1发布")
-    private int status ;
-    private int readNumber ;
+    private int status;
+    private int readNumber;
     @ApiModelProperty(value = "栏目中文")
-    private String columnTypeString ;
+    private String columnTypeString;
+
+    @ApiModelProperty(value = "模板排版信息")
+    private String modelList;
+
+    public String getBackground() {
+        return background;
+    }
+
+    public void setBackground(String background) {
+        this.background = background;
+    }
+
+    public String getModelList() {
+        return modelList;
+    }
+
+    public void setModelList(String modelList) {
+        this.modelList = modelList;
+    }
     public int getReadNumber() {
         return readNumber;
@@ -55,6 +76,7 @@ public class UniversityConsult {
     public void setStatus(int status) {
         this.status = status;
     }
+
     public List<UniversityConsultDetail> getList() {
         return list;
     }
@@ -8,9 +8,9 @@ public class UniversityMajor {
     @ApiModelProperty(value = "高校id")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "专业id")
-    private int majorId ;
+    private int majorId;
     public int getUniversityId() {
         return universityId;
@@ -10,38 +10,38 @@ import java.util.List;
 public class Video {
     @ApiModelProperty(value = "主键 , 新增接口不用传")
-    private int id ;
+    private int id;
     @ApiModelProperty(value = "学校")
-    private int universityId ;
+    private int universityId;
     @ApiModelProperty(value = "栏目")
-    private int columnType ;
+    private int columnType;
     @ApiModelProperty(value = "栏目中文")
-    private String columnTypeString ;
+    private String columnTypeString;
     @ApiModelProperty(value = "视频路径")
-    private String videoUrl ;
+    private String videoUrl;
     @ApiModelProperty(value = "视频路径")
-    private List<String> videoUrlList ;
+    private List<String> videoUrlList;
     @ApiModelProperty(value = "排序")
-    private int sort ;
+    private int sort;
     @ApiModelProperty(value = "创建时间")
-    private Date createTime ;
+    private Date createTime;
     @ApiModelProperty(value = "学校名称  展示用")
     private String name;
     @ApiModelProperty(value = "学校编码  展示用")
     private String code;
     @ApiModelProperty(value = "状态 0预览1发布")
-    private int status ;
+    private int status;
     @ApiModelProperty(value = "图片地址 展示用  学校logo")
-    private String imgUrl ;
+    private String imgUrl;
     @ApiModelProperty(value = "视频时长")
-    private String duration ;
+    private String duration;
     @ApiModelProperty(value = "视频标题")
-    private String videoName ;
+    private String videoName;
     @ApiModelProperty(value = "视频封面")
-    private String coverUrl ;
+    private String coverUrl;
     @ApiModelProperty(value = "阅读量")
-    private int readNumber ;
+    private int readNumber;
     public String getColumnTypeString() {
         return columnTypeString;
@@ -15,5 +15,5 @@ public interface ColumnService {
     int update(ColumnType columnType);
-    int delete(int id) ;
+    int delete(int id);
 }
@@ -12,9 +12,9 @@ public interface ConsultService {
     Page<Consult> getList(ConsultSearchDto consultSearchDto);
-    List<Consult> selectByUniversityIdAndColumnType(int universityId , int columnType);
+    List<Consult> selectByUniversityIdAndColumnType(int universityId, int columnType);
-    Page<Consult> getColumnList(int columnType ,int page ,int pageSize);
+    Page<Consult> getColumnList(int columnType, int page, int pageSize);
     Consult getDetail(int id);
@@ -24,5 +24,5 @@ public interface UniversityService {
     Integer selectByName(String name);
-    Integer selectIdByMajor(String major , int id);
+    Integer selectIdByMajor(String major, int id);
 }
@@ -6,5 +6,5 @@ public interface UserService {
     SysUser getByUser();
-    int update (SysUser sysUser);
+    int update(SysUser sysUser);
 }
@@ -13,15 +13,15 @@ import java.util.List;
 public class AdvertServiceImpl implements AdvertService {
     @Autowired
-    AdvertMapper advertMapper ;
+    AdvertMapper advertMapper;
     @Override
     public Advert getScreen() {
         List<Advert> list = advertMapper.getList(AdvertEnums.screen.getType());
-        if(list != null && list.size() > 0){
+        if (list != null && list.size() > 0) {
             return list.get(0);
-        }else {
-            return null ;
+        } else {
+            return null;
         }
     }
@@ -4,11 +4,13 @@ import com.github.pagehelper.PageHelper;
 import com.sincere.student.dto.ArticleSearchDto;
 import com.sincere.student.mapper.ArticleMapper;
 import com.sincere.student.model.Article;
+import com.sincere.student.model.Consult;
 import com.sincere.student.service.ArticleService;
 import com.sincere.student.utils.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,28 +25,28 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public Page<Article> getList(ArticleSearchDto articleSearchDto) {
-        Page<Article> result = new Page<>(articleSearchDto.getPage(),articleSearchDto.getPageSize());
-        if(StringUtils.isNotBlank(articleSearchDto.getTitle())){
-            articleSearchDto.setTitle("%"+articleSearchDto.getTitle()+"%");
+        Page<Article> result = new Page<>(articleSearchDto.getPage(), articleSearchDto.getPageSize());
+        if (StringUtils.isNotBlank(articleSearchDto.getTitle())) {
+            articleSearchDto.setTitle("%" + articleSearchDto.getTitle() + "%");
         }
-        PageHelper.startPage(articleSearchDto.getPage(),articleSearchDto.getPageSize());
-        List<Article> list = articleMapper.getList(articleSearchDto) ;
-        for(Article article : list){
+        PageHelper.startPage(articleSearchDto.getPage(), articleSearchDto.getPageSize());
+        List<Article> list = articleMapper.getList(articleSearchDto);
+        for (Article article : list) {
             String[] urlList = article.getImageUrl().split(",");
             article.setImageUrlList(Arrays.asList(urlList));
             article.setImageCount(urlList.length);
         }
         List<Article> addAdvertList = new ArrayList<>();
-        for(int i = 0 ; i < list.size() ;i++){
+        for (int i = 0; i < list.size(); i++) {
             addAdvertList.add(list.get(i));
-            if(i % 6 ==5){
-                try{
-                    Article advert =articleMapper.getAdvert();
+            if (i % 6 == 5) {
+                try {
+                    Article advert = articleMapper.getAdvert();
                     String[] urlList = advert.getImageUrl().split(",");
                     advert.setImageUrlList(Arrays.asList(urlList));
                     advert.setImageCount(urlList.length);
                     addAdvertList.add(advert);
-                }catch (Exception e){
+                } catch (Exception e) {
                 }
             }
@@ -56,13 +58,13 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public Page<Article> getAdminList(ArticleSearchDto articleSearchDto) {
-        Page<Article> result = new Page<>(articleSearchDto.getPage(),articleSearchDto.getPageSize());
-        if(StringUtils.isNotBlank(articleSearchDto.getTitle())){
-            articleSearchDto.setTitle("%"+articleSearchDto.getTitle()+"%");
+        Page<Article> result = new Page<>(articleSearchDto.getPage(), articleSearchDto.getPageSize());
+        if (StringUtils.isNotBlank(articleSearchDto.getTitle())) {
+            articleSearchDto.setTitle("%" + articleSearchDto.getTitle() + "%");
         }
-        PageHelper.startPage(articleSearchDto.getPage(),articleSearchDto.getPageSize());
-        List<Article> list = articleMapper.getList(articleSearchDto) ;
-        for(Article article : list){
+        PageHelper.startPage(articleSearchDto.getPage(), articleSearchDto.getPageSize());
+        List<Article> list = articleMapper.getList(articleSearchDto);
+        for (Article article : list) {
             String[] urlList = article.getImageUrl().split(",");
             article.setImageUrlList(Arrays.asList(urlList));
             article.setImageCount(urlList.length);
@@ -83,16 +85,31 @@ public class ArticleServiceImpl implements ArticleService {
         String[] urlList = article.getImageUrl().split(",");
         article.setImageUrlList(Arrays.asList(urlList));
         article.setImageCount(urlList.length);
-        return  article ;
+        return article;
     }
     @Override
     public int create(Article article) {
-        if(article.getType() == 1){
+        if (article.getType() == 1) {
             article.setColumnType(0);
         }
+        //排序
+        Integer sort = article.getSort();
+        List<Article> articleList = articleMapper.countSort(sort.intValue(), 1, null);
+        if (!CollectionUtils.isEmpty(articleList)) {
+            int i = 1;
+            for (Article oldArticle : articleList) {
+                int add = i + sort;
+                if (add > oldArticle.getSort()) {
+                    //若已存在自增1
+                    oldArticle.setSort(oldArticle.getSort() + 1);
+                    articleMapper.update(oldArticle);
+                }
+                i++;
+            }
+        }
         articleMapper.create(article);
-        return  article.getId() ;
+        return article.getId();
     }
     @Override
@@ -102,9 +119,24 @@ public class ArticleServiceImpl implements ArticleService {
     @Override
     public int update(Article article) {
-        if(article.getType() == 1){
+        if (article.getType() == 1) {
             article.setColumnType(0);
         }
+        //排序
+        Integer sort = article.getSort();
+        List<Article> articleList = articleMapper.countSort(sort.intValue(), 2, article.getId());
+        if (!CollectionUtils.isEmpty(articleList)) {
+            int i = 1;
+            for (Article oldArticle : articleList) {
+                int add = i + sort;
+                if (add > oldArticle.getSort()) {
+                    //若已存在自增1
+                    oldArticle.setSort(oldArticle.getSort() + 1);
+                    articleMapper.update(oldArticle);
+                }
+                i++;
+            }
+        }
         return articleMapper.update(article);
     }
 }
@@ -7,6 +7,7 @@ import com.sincere.student.service.ColumnService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import java.util.List;
@@ -14,12 +15,12 @@ import java.util.List;
 public class ColumnServiceImpl implements ColumnService {
     @Autowired
-    ColumnMapper columnMapper ;
+    ColumnMapper columnMapper;
     @Override
     public List<ColumnType> getList(ColumnDto columnDto) {
-        if(StringUtils.isNotBlank(columnDto.getName())){
-            columnDto.setName("%"+columnDto.getName()+"%");
+        if (StringUtils.isNotBlank(columnDto.getName())) {
+            columnDto.setName("%" + columnDto.getName() + "%");
         }
         return columnMapper.getList(columnDto);
     }
@@ -31,11 +32,46 @@ public class ColumnServiceImpl implements ColumnService {
     @Override
     public int create(ColumnType columnType) {
+        //栏目类型
+        Integer type = columnType.getType();
+        //栏目排序
+        Integer sort = columnType.getSort();
+        List<ColumnType> countList = columnMapper.countSort(sort.intValue(), type.intValue(), 1, null);
+        if (!CollectionUtils.isEmpty(countList)) {
+            int i = 1;
+            for (ColumnType oldType : countList) {
+                int addSort = i + sort;
+                if (addSort > oldType.getSort()) {
+                    //若已存在自增1
+                    oldType.setSort(oldType.getSort() + 1);
+                    columnMapper.update(oldType);
+                }
+                i++;
+            }
+        }
         return columnMapper.create(columnType);
     }
     @Override
     public int update(ColumnType columnType) {
+        ColumnType colum = columnMapper.selectDetail(columnType.getId());
+        //栏目类型
+        Integer type = columnType.getType();
+        //栏目排序
+        Integer sort = columnType.getSort();
+        List<ColumnType> countList = columnMapper.countSort(sort.intValue(), type.intValue(), 2, columnType.getId());
+        if (!CollectionUtils.isEmpty(countList)) {
+            int i = 1;
+            for (ColumnType oldType : countList) {
+                int addSort = i + sort;
+                if (addSort > oldType.getSort()) {
+                    //若已存在自增1
+                    oldType.setSort(oldType.getSort() + 1);
+                    columnMapper.update(oldType);
+                }
+                i++;
+            }
+        }
         return columnMapper.update(columnType);
     }
@@ -12,7 +12,7 @@ import java.util.List;
 public class CommonServiceImpl implements CommonService {
     @Autowired
-    AreaMapper areaMapper ;
+    AreaMapper areaMapper;
     @Override
     public List<Area> getProvince() {
@@ -21,7 +21,7 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public List<Area> getCity(String code) {
-        code = code + "%" ;
+        code = code + "%";
         return areaMapper.getCity(code);
     }
 }
@@ -7,15 +7,13 @@ import com.sincere.student.enums.ColumnEnums;
 import com.sincere.student.mapper.ColumnMapper;
 import com.sincere.student.mapper.UniversityConsultDetailMapper;
 import com.sincere.student.mapper.UniversityConsultMapper;
-import com.sincere.student.model.ColumnType;
-import com.sincere.student.model.Consult;
-import com.sincere.student.model.UniversityConsult;
-import com.sincere.student.model.UniversityConsultDetail;
+import com.sincere.student.model.*;
 import com.sincere.student.service.ConsultService;
 import com.sincere.student.utils.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import java.util.Arrays;
 import java.util.List;
@@ -24,13 +22,13 @@ import java.util.List;
 public class ConsultServiceImpl implements ConsultService {
     @Autowired
-    UniversityConsultMapper universityConsultMapper ;
+    UniversityConsultMapper universityConsultMapper;
     @Autowired
-    UniversityConsultDetailMapper universityConsultDetailMapper ;
+    UniversityConsultDetailMapper universityConsultDetailMapper;
     @Autowired
-    ColumnMapper columnMapper ;
+    ColumnMapper columnMapper;
     @Override
     public List<Consult> selectByUniversityIdAndColumnType(int universityId, int columnType) {
@@ -42,21 +40,23 @@ public class ConsultServiceImpl implements ConsultService {
     @Override
     public Page<Consult> getList(ConsultSearchDto consultSearchDto) {
-        Page<Consult> page = new Page<>(consultSearchDto.getPage(),consultSearchDto.getPageSize());
-        if(StringUtils.isNotBlank(consultSearchDto.getUniversityName())){
-            consultSearchDto.setUniversityName("%"+consultSearchDto.getUniversityName()+"%");
+        Page<Consult> page = new Page<>(consultSearchDto.getPage(), consultSearchDto.getPageSize());
+        if (StringUtils.isNotBlank(consultSearchDto.getUniversityName())) {
+            consultSearchDto.setUniversityName("%" + consultSearchDto.getUniversityName() + "%");
         }
-        if(StringUtils.isNotBlank(consultSearchDto.getMajorName())){
-            consultSearchDto.setMajorName("%"+consultSearchDto.getMajorName()+"%");
+        if (StringUtils.isNotBlank(consultSearchDto.getMajorName())) {
+            consultSearchDto.setMajorName("%" + consultSearchDto.getMajorName() + "%");
         }
-        PageHelper.startPage(consultSearchDto.getPage(),consultSearchDto.getPageSize());
-        List<Consult> list =universityConsultMapper.getList(consultSearchDto) ;
+        PageHelper.startPage(consultSearchDto.getPage(), consultSearchDto.getPageSize());
+        List<Consult> list = universityConsultMapper.getList(consultSearchDto);
         ColumnDto columnDto = new ColumnDto();
         columnDto.setType(ColumnEnums.university.getType());
         List<ColumnType> columnTypes = columnMapper.getList(columnDto);
-        for(Consult consult : list){
-            for(ColumnType columnType :columnTypes){
-                if(consult.getColumnType() == columnType.getId()){
+        for (Consult consult : list) {
+            Consult newConsut = universityConsultMapper.selectByPrimaryKey(consult.getId());
+            consult.setModelList(newConsut.getModelList());
+            for (ColumnType columnType : columnTypes) {
+                if (consult.getColumnType() == columnType.getId()) {
                     consult.setColumnTypeName(columnType.getName());
                 }
             }
@@ -67,9 +67,9 @@ public class ConsultServiceImpl implements ConsultService {
     }
     @Override
-    public Page<Consult> getColumnList(int columnType , int page ,int pageSize) {
-        Page<Consult> result = new Page<>(page,pageSize);
-        PageHelper.startPage(page,pageSize);
+    public Page<Consult> getColumnList(int columnType, int page, int pageSize) {
+        Page<Consult> result = new Page<>(page, pageSize);
+        PageHelper.startPage(page, pageSize);
         result.setList(universityConsultMapper.getColumnList(columnType));
         result.setCount(universityConsultMapper.getColumnListCount(columnType));
         return result;
@@ -79,41 +79,71 @@ public class ConsultServiceImpl implements ConsultService {
     public Consult getDetail(int id) {
         Consult consult = universityConsultMapper.selectByPrimaryKey(id);
         universityConsultMapper.updateRead(id);
-        try{
+        try {
             consult.setVideoUrlList(Arrays.asList(consult.getVideoUrl().split(",")));
-        }catch (Exception e){
+        } catch (Exception e) {
         }
         consult.setList(universityConsultDetailMapper.selectByConsult(id));
-        return consult ;
+        return consult;
     }
     @Override
     public int create(UniversityConsult consult) {
+        //排序
+        Integer sort = consult.getSort();
+        List<Consult> consultList = universityConsultMapper.countSort(sort.intValue(), 1, null);
+        if (!CollectionUtils.isEmpty(consultList)) {
+            int i = 1;
+            for (Consult oldConsult : consultList) {
+                int addSort = i + sort;
+                if (addSort > oldConsult.getSort()) {
+                    //若已存在自增1
+                    oldConsult.setSort(oldConsult.getSort() + 1);
+                    universityConsultMapper.updateSort(oldConsult);
+                }
+                i++;
+            }
+        }
         universityConsultMapper.insert(consult);
-        for(UniversityConsultDetail detail : consult.getList()){
+        for (UniversityConsultDetail detail : consult.getList()) {
             detail.setConsultId(consult.getId());
             universityConsultDetailMapper.insert(detail);
         }
-        return consult.getId() ;
+        return consult.getId();
     }
     @Override
     public int update(UniversityConsult consult) {
+        //排序
+        Integer sort = consult.getSort();
+        List<Consult> consultList = universityConsultMapper.countSort(sort.intValue(), 2, consult.getId());
+        if (!CollectionUtils.isEmpty(consultList)) {
+            int i = 1;
+            for (Consult oldConsult : consultList) {
+                int addSort = i + sort;
+                if (addSort > oldConsult.getSort()) {
+                    //若已存在自增1
+                    oldConsult.setSort(oldConsult.getSort() + 1);
+                    universityConsultMapper.updateSort(oldConsult);
+                }
+                i++;
+            }
+        }
         universityConsultMapper.updateByPrimaryKeySelective(consult);
         universityConsultDetailMapper.deleteByPrimaryKey(consult.getId());
-        for(UniversityConsultDetail detail : consult.getList()){
+        for (UniversityConsultDetail detail : consult.getList()) {
             detail.setConsultId(consult.getId());
             universityConsultDetailMapper.insert(detail);
         }
-        return  1 ;
+        return 1;
     }
     @Override
     public int delete(int id) {
         universityConsultMapper.deleteByPrimaryKey(id);
         universityConsultDetailMapper.deleteByPrimaryKey(id);
-        return 1 ;
+        return 1;
     }
 }
@@ -16,23 +16,23 @@ import java.util.List;
 public class MajorServiceImpl implements MajorService {
     @Autowired
-    MajorMapper majorMapper ;
+    MajorMapper majorMapper;
     @Override
     public Page<Major> getList(MajorSearchDto majorSearchDto) {
-        Page<Major> page = new Page<>(majorSearchDto.getPage(),majorSearchDto.getPageSize());
-        Major major = new Major() ;
-        if(StringUtils.isNotBlank(majorSearchDto.getSearch())){
-            major.setMajor("%"+majorSearchDto.getSearch()+"%");
+        Page<Major> page = new Page<>(majorSearchDto.getPage(), majorSearchDto.getPageSize());
+        Major major = new Major();
+        if (StringUtils.isNotBlank(majorSearchDto.getSearch())) {
+            major.setMajor("%" + majorSearchDto.getSearch() + "%");
         }
-        if(majorSearchDto.getPid() != 0){
+        if (majorSearchDto.getPid() != 0) {
             major.setPid(majorSearchDto.getPid());
         }
-        PageHelper.startPage(majorSearchDto.getPage(),majorSearchDto.getPageSize());
+        PageHelper.startPage(majorSearchDto.getPage(), majorSearchDto.getPageSize());
         List<Major> list = majorMapper.getList(major);
         page.setList(list);
         page.setCount(majorMapper.getListCount(major));
-        return page ;
+        return page;
     }
     @Override
@@ -42,7 +42,7 @@ public class MajorServiceImpl implements MajorService {
     @Override
     public int create(Major major) {
-        if(major.getPid() == 0){ //说明是一级专业
+        if (major.getPid() == 0) { //说明是一级专业
             major.setPid(-1);
         }
         return majorMapper.create(major);
@@ -20,24 +20,24 @@ import java.util.List;
 public class MessageServiceImpl implements MessageService {
     @Autowired
-    UniversityMessageMapper messageMapper ;
+    UniversityMessageMapper messageMapper;
     @Autowired
-    UniversityReplyMapper replyMapper ;
+    UniversityReplyMapper replyMapper;
     @Override
     public Page<Message> getList(MessageSearchDto messageSearchDto) {
-        Page<Message> page = new Page<>(messageSearchDto.getPage(),messageSearchDto.getPageSize());
-        if(StringUtils.isNotBlank(messageSearchDto.getSearch())){
-            messageSearchDto.setSearch("%"+messageSearchDto.getSearch()+"%");
+        Page<Message> page = new Page<>(messageSearchDto.getPage(), messageSearchDto.getPageSize());
+        if (StringUtils.isNotBlank(messageSearchDto.getSearch())) {
+            messageSearchDto.setSearch("%" + messageSearchDto.getSearch() + "%");
         }
-        PageHelper.startPage(messageSearchDto.getPage(),messageSearchDto.getPageSize());
-        List<Message> list = messageMapper.getList(messageSearchDto) ;
-        for(Message message : list){
-            message.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),message.getCreateTime()));
+        PageHelper.startPage(messageSearchDto.getPage(), messageSearchDto.getPageSize());
+        List<Message> list = messageMapper.getList(messageSearchDto);
+        for (Message message : list) {
+            message.setDistanceTimes(DateUtils.getDistanceTimes(new Date(), message.getCreateTime()));
             List<Reply> replies = replyMapper.selectByMessageId(message.getId());
-            for(Reply reply : replies){
-                reply.setDistanceTimes(DateUtils.getDistanceTimes(new Date(),reply.getCreateTime()));
+            for (Reply reply : replies) {
+                reply.setDistanceTimes(DateUtils.getDistanceTimes(new Date(), reply.getCreateTime()));
             }
             message.setList(replies);
         }
@@ -67,7 +67,7 @@ public class MessageServiceImpl implements MessageService {
     public Message getDetail(int id) {
         Message message = messageMapper.getDetail(id);
         message.setList(replyMapper.selectByMessageId(id));
-        return message ;
+        return message;
     }
     @Override
@@ -13,12 +13,12 @@ import java.util.List;
 public class ParameterServiceImpl implements ParameterService {
     @Autowired
-    ParameterMapper parameterMapper ;
+    ParameterMapper parameterMapper;
     @Override
     public Parameter getByCode(String code) {
         List<Parameter> list = parameterMapper.getByCode(code);
-        if(list != null && list.size() > 0){
+        if (list != null && list.size() > 0) {
             return list.get(0);
         }
         return null;
@@ -35,9 +35,13 @@ public class ParameterServiceImpl implements ParameterService {
     }
     @Override
-    public int insertAccessToken(AccessToken accessToken){return parameterMapper.insertAccessToken(accessToken);}
+    public int insertAccessToken(AccessToken accessToken) {
+        return parameterMapper.insertAccessToken(accessToken);
+    }
     @Override
-    public AccessToken getAccessToken(){return parameterMapper.getAccessToken();}
+    public AccessToken getAccessToken() {
+        return parameterMapper.getAccessToken();
+    }
 }
@@ -21,18 +21,18 @@ import java.util.List;
 public class SubmitServiceImpl implements SubmitService {
     @Autowired
-    UniversityPointMapper pointMapper ;
+    UniversityPointMapper pointMapper;
     @Autowired
-    UniversitySubmitFileMapper submitFileMapper ;
+    UniversitySubmitFileMapper submitFileMapper;
     @Override
     public Page<SubmitFile> getAdminList(MessageSearchDto dto) {
-        Page<SubmitFile> result = new Page<>(dto.getPage(),dto.getPageSize());
-        PageHelper.startPage(dto.getPage(),dto.getPageSize());
-        List<SubmitFile> list = submitFileMapper.getList(dto) ;
-        for(SubmitFile submitFile : list){
-            String fileName = submitFile.getFileUrl().substring(submitFile.getFileUrl().lastIndexOf("/")+1);
+        Page<SubmitFile> result = new Page<>(dto.getPage(), dto.getPageSize());
+        PageHelper.startPage(dto.getPage(), dto.getPageSize());
+        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);
@@ -42,14 +42,14 @@ public class SubmitServiceImpl implements SubmitService {
     @Override
     public Page<SubmitLine> getAppList(PointSearchDto dto) {
-        Page<SubmitLine> result = new Page<>(dto.getPage(),dto.getPageSize());
-        if(StringUtils.isNotBlank(dto.getMajorName())){
-            dto.setMajorName("%"+dto.getMajorName()+"%");
+        Page<SubmitLine> result = new Page<>(dto.getPage(), dto.getPageSize());
+        if (StringUtils.isNotBlank(dto.getMajorName())) {
+            dto.setMajorName("%" + dto.getMajorName() + "%");
         }
-        if(StringUtils.isNotBlank(dto.getUniversityName())){
-            dto.setUniversityName("%"+dto.getUniversityName()+"%");
+        if (StringUtils.isNotBlank(dto.getUniversityName())) {
+            dto.setUniversityName("%" + dto.getUniversityName() + "%");
         }
-        PageHelper.startPage(dto.getPage(),dto.getPageSize());
+        PageHelper.startPage(dto.getPage(), dto.getPageSize());
         result.setList(submitFileMapper.getAppList(dto));
         result.setCount(submitFileMapper.getAppListCount(dto));
         return result;
@@ -58,18 +58,18 @@ public class SubmitServiceImpl implements SubmitService {
     @Override
     public int create(SubmitFile submitFile) {
         submitFileMapper.insert(submitFile);
-        int i = 0 ;
+        int i = 0;
         List<Point> 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 1;
@@ -83,7 +83,7 @@ public class SubmitServiceImpl implements SubmitService {
     }
     @Override
-    public int update(SubmitFile submitFile){
+    public int update(SubmitFile submitFile) {
         if (StringUtils.isNotBlank(submitFile.getFileUrl())) {
             int i = 0;
             pointMapper.deleteBySubmit(submitFile.getId());
@@ -22,21 +22,21 @@ import java.util.logging.Handler;
 public class UniversityServiceImpl implements UniversityService {
     @Autowired
-    UniversityMapper universityMapper ;
+    UniversityMapper universityMapper;
     @Autowired
-    UniversityMajorMapper universityMajorMapper ;
+    UniversityMajorMapper universityMajorMapper;
     @Override
     public Page<University> getList(UniversitySearchDto universitySearchDto) {
-        Page<University> page = new Page<>(universitySearchDto.getPage(),universitySearchDto.getPageSize());
-        PageHelper.startPage(universitySearchDto.getPage(),universitySearchDto.getPageSize());
-        if(StringUtils.isNotBlank(universitySearchDto.getSearch())){
-            universitySearchDto.setSearch("%"+universitySearchDto.getSearch()+"%");
+        Page<University> page = new Page<>(universitySearchDto.getPage(), universitySearchDto.getPageSize());
+        PageHelper.startPage(universitySearchDto.getPage(), universitySearchDto.getPageSize());
+        if (StringUtils.isNotBlank(universitySearchDto.getSearch())) {
+            universitySearchDto.setSearch("%" + universitySearchDto.getSearch() + "%");
         }
         List<University> list = universityMapper.getList(universitySearchDto);
-        for(University university : list){
+        for (University university : list) {
             university.setMajorList(universityMajorMapper.selectUniversityMajor(university.getId()));
         }
         page.setList(list);
@@ -69,16 +69,16 @@ public class UniversityServiceImpl implements UniversityService {
     public int addMajor(List<UniversityMajor> list) {
         universityMajorMapper.deleteByUniversityId(list.get(0).getUniversityId());
         List<UniversityMajor> result = new ArrayList<>();
-        int i = 0 ;
-        for(UniversityMajor universityMajor :list){
-            i++ ;
+        int i = 0;
+        for (UniversityMajor universityMajor : list) {
+            i++;
             result.add(universityMajor);
-            if(i % 100 == 0){
+            if (i % 100 == 0) {
                 universityMajorMapper.insertBatch(result);
                 result = new ArrayList<>();
             }
         }
-        if(result.size() > 0){
+        if (result.size() > 0) {
             universityMajorMapper.insertBatch(result);
         }
         return 1;
@@ -90,10 +90,10 @@ public class UniversityServiceImpl implements UniversityService {
     }
     @Override
-    public Integer selectIdByMajor(String major , int id) {
-        Map<String ,String> map = new HashMap<>();
-        map.put("major",major);
-        map.put("id",id+"");
+    public Integer selectIdByMajor(String major, int id) {
+        Map<String, String> map = new HashMap<>();
+        map.put("major", major);
+        map.put("id", id + "");
         return universityMajorMapper.selectIdByMajor(map);
     }
 }
@@ -3,12 +3,14 @@ package com.sincere.student.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.sincere.student.dto.VideoSearchDto;
 import com.sincere.student.mapper.VideoMapper;
+import com.sincere.student.model.ColumnType;
 import com.sincere.student.model.Video;
 import com.sincere.student.service.VideoService;
 import com.sincere.student.utils.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import java.util.Arrays;
 import java.util.List;
@@ -18,15 +20,15 @@ public class VideoServiceImpl implements VideoService {
     @Autowired
-    VideoMapper videoMapper ;
+    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()+"%");
+        Page<Video> page = new Page<>(dto.getPage(), dto.getPageSize());
+        if (StringUtils.isNotBlank(dto.getUniversityName())) {
+            dto.setUniversityName("%" + dto.getUniversityName() + "%");
         }
-        PageHelper.startPage(dto.getPage(),dto.getPageSize());
+        PageHelper.startPage(dto.getPage(), dto.getPageSize());
         page.setList(videoMapper.getUniversityList(dto));
         page.setCount(videoMapper.getUniversityListCount(dto));
         return page;
@@ -34,17 +36,17 @@ public class VideoServiceImpl implements VideoService {
     @Override
     public Page<Video> getList(VideoSearchDto dto) {
-        Page<Video> page = new Page<>(dto.getPage(),dto.getPageSize());
-        if(StringUtils.isNotBlank(dto.getUniversityName())){
-            dto.setUniversityName("%"+dto.getUniversityName()+"%");
+        Page<Video> page = new Page<>(dto.getPage(), dto.getPageSize());
+        if (StringUtils.isNotBlank(dto.getUniversityName())) {
+            dto.setUniversityName("%" + dto.getUniversityName() + "%");
         }
-        PageHelper.startPage(dto.getPage(),dto.getPageSize());
+        PageHelper.startPage(dto.getPage(), dto.getPageSize());
         List<Video> list = videoMapper.getList(dto);
-        for(Video video : list){
+        for (Video video : list) {
             videoMapper.updateRead(video.getId());
         }
-        for(Video video : list){
+        for (Video video : list) {
             String[] array = video.getVideoUrl().split(",");
             video.setVideoUrlList(Arrays.asList(array));
         }
@@ -60,12 +62,42 @@ public class VideoServiceImpl implements VideoService {
     @Override
     public int create(Video video) {
+        //排序
+        Integer sort = video.getSort();
+        List<Video> videoList = videoMapper.countSort(sort.intValue(), 1, null);
+        if (!CollectionUtils.isEmpty(videoList)) {
+            int i = 1;
+            for (Video oldVideo : videoList) {
+                int add = i + sort;
+                if (add > oldVideo.getSort()) {
+                    //若已存在自增1
+                    oldVideo.setSort(oldVideo.getSort() + 1);
+                    videoMapper.update(oldVideo);
+                }
+                i++;
+            }
+        }
         videoMapper.create(video);
         return video.getId();
     }
     @Override
     public int update(Video video) {
+        //排序
+        Integer sort = video.getSort();
+        List<Video> videoList = videoMapper.countSort(sort.intValue(), 2, video.getId());
+        if (!CollectionUtils.isEmpty(videoList)) {
+            int i = 1;
+            for (Video oldVideo : videoList) {
+                int add = i + sort;
+                if (add > oldVideo.getSort()) {
+                    //若已存在自增1
+                    oldVideo.setSort(oldVideo.getSort() + 1);
+                    videoMapper.update(oldVideo);
+                }
+                i++;
+            }
+        }
         return videoMapper.update(video);
     }
@@ -25,7 +25,7 @@ public class DateUtils {
         min = ((diff / (60 * 1000)) - day * 24 * 60 - hour * 60);
         sec = (diff / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-        Long[] times = { day, hour, min, sec };
+        Long[] times = {day, hour, min, sec};
         return times;
     }
@@ -3,6 +3,7 @@ package com.sincere.student.utils;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.OSSObject;
 import com.sincere.student.model.Point;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -14,13 +15,13 @@ import java.util.List;
 public class ExcelUtils {
-    public static OSSClient ossClient = null ;
+    public static OSSClient ossClient = null;
-    private static final String key = "QiuM3PwHTnVotcGy" ;
-    private static final String secret = "Yqs7RlaC1MioZu2YYJ6u0TdeO13VFC" ;
-    private static final String endPoint = "http://oss-cn-hangzhou.aliyuncs.com" ;
-    private static final String bucketName = "szyundisk" ;
-    private static final String domain = "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/" ;
+    private static final String key = "QiuM3PwHTnVotcGy";
+    private static final String secret = "Yqs7RlaC1MioZu2YYJ6u0TdeO13VFC";
+    private static final String endPoint = "http://oss-cn-hangzhou.aliyuncs.com";
+    private static final String bucketName = "szyundisk";
+    private static final String domain = "https://szyundisk.oss-cn-hangzhou.aliyuncs.com/";
     public static synchronized OSSClient getInstance() {
         if (ossClient == null) {
@@ -33,18 +34,18 @@ public class ExcelUtils {
         return ossClient;
     }
-    public static List<Point> analysisExcel(String url) throws ResultException{
-        InputStream inputStream = null ;
+    public static List<Point> analysisExcel(String url) throws ResultException {
+        InputStream inputStream = null;
         OSSClient ossClient = getInstance();
-        OSSObject object = ossClient.getObject(bucketName,url.replace(domain,""));
-        try{
+        OSSObject object = ossClient.getObject(bucketName, url.replace(domain, ""));
+        try {
             File excelFile = new File(url);
             // 获得工作簿
             String file = excelFile.getName();
             Workbook workbook = null;
             inputStream = object.getObjectContent();
-            if(inputStream == null){
-                throw new ResultException(901,"路径错误");
+            if (inputStream == null) {
+                throw new ResultException(901, "路径错误");
             }
             if (file.endsWith("xls")) {
                 workbook = new HSSFWorkbook(inputStream);
@@ -58,55 +59,67 @@ public class ExcelUtils {
             for (int i = 1; i <= rows; i++) {
                 // 获取第i行数据
                 Row sheetRow = sheet.getRow(i);
-                if(sheetRow != null){
+                if (sheetRow != null) {
                     Point point = new Point();
                     Cell cell1 = sheetRow.getCell(0);
-                    if(cell1 != null){
+                    if (cell1 != null) {
                         cell1.setCellType(CellType.STRING);
                         point.setUniversityName(cell1.getStringCellValue().trim());
                     }
                     Cell cell2 = sheetRow.getCell(1);
-                    if(cell2 != null){
+                    if (cell2 != null) {
                         cell2.setCellType(CellType.STRING);
                         point.setMajor(cell2.getStringCellValue().trim());
                     }
                     Cell cell3 = sheetRow.getCell(2);
-                    if(cell3 != null){
+                    if (cell3 != null) {
                         cell3.setCellType(CellType.STRING);
-                        point.setEnrollNumber(Integer.valueOf(cell3.getStringCellValue().trim()));
+                        if(StringUtils.isNotBlank(cell3.getStringCellValue())){
+                            point.setEnrollNumber(Integer.valueOf(cell3.getStringCellValue().trim()));
+                        }else{
+                            point.setEnrollNumber(null);
+                        }
                     }
                     Cell cell4 = sheetRow.getCell(3);
-                    if(cell4 != null){
+                    if (cell4 != null) {
                         cell4.setCellType(CellType.STRING);
-                        point.setGrade(Integer.valueOf(cell4.getStringCellValue().trim()));
+                        if(StringUtils.isNotBlank(cell4.getStringCellValue())){
+                            point.setGrade(Integer.valueOf(cell4.getStringCellValue().trim()));
+                        }else{
+                            point.setGrade(null);
+                        }
                     }
                     Cell cell5 = sheetRow.getCell(4);
-                    if(cell5 != null){
+                    if (cell5 != null) {
                         cell5.setCellType(CellType.STRING);
-                        point.setRank(Integer.valueOf(cell5.getStringCellValue().trim()));
+                        if(StringUtils.isNotBlank(cell5.getStringCellValue())){
+                            point.setRank(Integer.valueOf(cell5.getStringCellValue().trim()));
+                        }else{
+                            point.setRank(null);
+                        }
                     }
                     Cell cell6 = sheetRow.getCell(5);
-                    if(cell6 != null){
+                    if (cell6 != null) {
                         cell6.setCellType(CellType.STRING);
                         point.setProvince(cell6.getStringCellValue().trim());
                     }
                     Cell cell7 = sheetRow.getCell(6);
-                    if(cell7 != null){
+                    if (cell7 != null) {
                         cell7.setCellType(CellType.STRING);
                         point.setCity(cell7.getStringCellValue());
                     }
                     list.add(point);
                 }
             }
-            return list ;
-        }catch (Exception e){
+            return list;
+        } catch (Exception e) {
             e.printStackTrace();
-            throw new ResultException(999,"系统错误");
-        }finally {
-            try{
+            throw new ResultException(999, "系统错误");
+        } finally {
+            try {
                 inputStream.close();
                 object.close();
-            }catch (Exception e){
+            } catch (Exception e) {
             }
@@ -19,6 +19,7 @@ import java.net.URL;
 /**
  * HttpClient4.3工具类
+ *
  * @author chen
  * @version 1.0
  * @date 2019/10/11 0011 10:17
@@ -38,7 +39,8 @@ public class HttpClientUtils {
     /**
      * post请求传输json参数
-     * @param url  url地址
+     *
+     * @param url       url地址
      * @param jsonParam 参数
      * @return
      */
@@ -78,8 +80,9 @@ public class HttpClientUtils {
     /**
      * post请求传输String参数 例如：name=Jack&sex=1&type=2
      * Content-type:application/x-www-form-urlencoded
-     * @param url            url地址
-     * @param strParam       参数
+     *
+     * @param url      url地址
+     * @param strParam 参数
      * @return
      */
     public static JSONObject httpPost(String url, String strParam) {
@@ -115,6 +118,7 @@ public class HttpClientUtils {
     /**
      * 发送get请求
+     *
      * @param url 路径
      * @return
      */
@@ -146,7 +150,7 @@ public class HttpClientUtils {
     public static String httpGet2(String url) {
         // get请求返回结果
         JSONObject jsonResult = null;
-        String result = "" ;
+        String result = "";
         CloseableHttpClient client = HttpClients.createDefault();
         // 发送get请求
         HttpGet request = new HttpGet(url);
@@ -171,20 +175,20 @@ public class HttpClientUtils {
     }
-    public static InputStream GetFileInputStream(String fileUrl){
-        try{
+    public static InputStream GetFileInputStream(String fileUrl) {
+        try {
             URL url = new URL(fileUrl);
-            HttpURLConnection conn = (HttpURLConnection)url.openConnection();
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             //设置超时间为3秒
-            conn.setConnectTimeout(8*1000);
+            conn.setConnectTimeout(8 * 1000);
             //得到输入流
             InputStream inputStream = conn.getInputStream();
-            return inputStream ;
-        }catch (Exception e){
+            return inputStream;
+        } catch (Exception e) {
         }
-        return null ;
+        return null;
     }
 }
@@ -9,12 +9,12 @@ import java.util.List;
 public class Page<T> {
     @ApiModelProperty(value = "页码")
-    private int page ;
+    private int page;
     @ApiModelProperty(value = "每页数量")
-    private int pageSize ;
+    private int pageSize;
     @ApiModelProperty(value = "总数")
-    private int count ;
-    private List<T> list ;
+    private int count;
+    private List<T> list;
     public int getCount() {
         return count;
@@ -2,8 +2,8 @@ package com.sincere.student.utils;
 public class ResultException extends Exception {
-    private int code ;
-    private String message ;
+    private int code;
+    private String message;
     public int getCode() {
         return code;
@@ -25,6 +25,7 @@ public class TokenUtils {
     /**
      * 生成Token
+     *
      * @param account
      * @return
      */
@@ -39,7 +40,7 @@ public class TokenUtils {
              */
             JWTClaimsSet claimsSet = new JWTClaimsSet.Builder()
                     .expirationTime(new Date(System.currentTimeMillis() + EXPIRE_TIME))
-                    .claim("ACCOUNT",account)
+                    .claim("ACCOUNT", account)
                     .build();
             /**
@@ -63,6 +64,7 @@ public class TokenUtils {
     /**
      * 校验token
+     *
      * @param token
      * @return
      */
@@ -84,7 +86,7 @@ public class TokenUtils {
             //获取载体中的数据
             Object account = jwt.getJWTClaimsSet().getClaim("ACCOUNT");
             //是否有openUid
-            if (Objects.isNull(account)){
+            if (Objects.isNull(account)) {
                 throw new ResultException(-3, "账号为空");
             }
             return account.toString();
@@ -3,9 +3,9 @@
         PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-    <classPathEntry location="C://root//sqljdbc4-4.0.jar" />
+    <classPathEntry location="C://root//sqljdbc4-4.0.jar"/>
-    <context  targetRuntime="MyBatis3" id="a">
+    <context targetRuntime="MyBatis3" id="a">
         <!--<commentGenerator>
             <!– 去除自动生成的注释 –>
@@ -21,7 +21,7 @@
         <jdbcConnection driverClass="com.microsoft.sqlserver.jdbc.SQLServerDriver"
                         connectionURL="jdbc:sqlserver://60.190.202.57:14333;database=consultative"
                         userId="SZJXTUSER"
-                        password="xst200919" />
+                        password="xst200919"/>
         <!-- 非必需，类型处理器，在数据库类型和java类型之间的转换控制-->
         <javaTypeResolver>
@@ -32,16 +32,18 @@
             targetPackage：生成的实体包位置，默认存放在src目录下
             targetProject：目标工程名
          -->
-        <javaModelGenerator targetPackage="com.sincere.student.model" targetProject="src/main/java" />
+        <javaModelGenerator targetPackage="com.sincere.student.model" targetProject="src/main/java"/>
         <!-- 实体包对应映射文件位置及名称，默认存放在src目录下 -->
-        <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources" />
+        <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources"/>
         <!--生成Dao类存放位置-->
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.sincere.student.mapper" targetProject="src/main/java">
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <!--生成对应表及类名-->
-        <table tableName="university_submit_file" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" enableSelectByPrimaryKey="true"
+        <table tableName="university_submit_file" enableCountByExample="false" enableUpdateByExample="false"
+               enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"
+               enableSelectByPrimaryKey="true"
                enableUpdateByPrimaryKey="true"
                enableDeleteByPrimaryKey="true"></table>
     </context>
@@ -21,7 +21,7 @@
         select * from university_advert where id=#{id}
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Advert" >
+    <insert id="create" parameterType="com.sincere.student.model.Advert">
         insert into university_advert (type,img_url,url_link,sort,status,create_time,title)
         values (#{type},#{imgUrl},#{urlLink},#{sort},#{status},GETDATE(),#{title})
     </insert>
@@ -7,7 +7,7 @@
         <result column="area_name" property="name"/>
     </resultMap>
-    <select id="getProvince"  resultMap="AreaMap">
+    <select id="getProvince" resultMap="AreaMap">
         select * from sys_area where len(area_code)=2
     </select>
@@ -17,8 +17,8 @@
         <result column="look_number" property="lookNumber"/>
         <result column="create_time" property="createTime"/>
         <result column="type" property="type"/>
-        <result column="status" property="status" />
-        <result column="columnTypeString" property="columnTypeString" />
+        <result column="status" property="status"/>
+        <result column="columnTypeString" property="columnTypeString"/>
     </resultMap>
@@ -44,31 +44,46 @@
     </select>
     <select id="getList" parameterType="com.sincere.student.dto.ArticleSearchDto" resultMap="ArticleMap">
-        select university_article.* , university_column_type.name as columnTypeString from university_article left join university_column_type on university_article.column_type = university_column_type.id
-         <where>
-             <if test="title != null and title != ''">
-                 and university_article.title like #{title}
-             </if>
-             <if test="columnType != 0">
-                 and university_article.column_type = #{columnType}
-             </if>
-             <if test="articleType != 0">
-                 and university_article.type = #{articleType}
-             </if>
-             <if test="status == 1">
-                 and university_article.status = 1
-             </if>
-             <if test="status != 1">
-                 and 1 = 1
-             </if>
-         </where>
-         order by university_article.sort
+        select university_article.* , university_column_type.name as columnTypeString from university_article left join
+        university_column_type on university_article.column_type = university_column_type.id
+        <where>
+            <if test="title != null and title != ''">
+                and university_article.title like #{title}
+            </if>
+            <if test="columnType != 0">
+                and university_article.column_type = #{columnType}
+            </if>
+            <if test="articleType != 0">
+                and university_article.type = #{articleType}
+            </if>
+            <if test="status == 1">
+                and university_article.status = 1
+            </if>
+            <if test="status != 1">
+                and 1 = 1
+            </if>
+        </where>
+        order by university_article.sort
     </select>
     <select id="getAdvert" resultMap="ArticleMap">
-        select top 1 * from university_article  where type = 1 ORDER BY NEWID()
+        select top 1 * from university_article where type = 1 ORDER BY NEWID()
+    </select>
+
+    <select id="countSort" resultMap="ArticleMap">
+        select * from university_article where
+        <choose>
+            <when test="flag ==1">
+                sort >= #{sort}
+            </when>
+            <when test="flag ==2">
+                sort >= #{sort} and id != #{id}
+            </when>
+        </choose>
+        order by sort asc
     </select>
+
     <select id="getRelationList" parameterType="java.lang.Integer" resultMap="ArticleMap">
         select top 3 * from university_article where university_id = #{universityId}
     </select>
@@ -77,9 +92,11 @@
         select * from university_article where id = #{id}
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Article"  useGeneratedKeys="true" keyProperty="id">
-        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 id="create" parameterType="com.sincere.student.model.Article" useGeneratedKeys="true" keyProperty="id">
+        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">
@@ -126,6 +143,6 @@
                 status=#{status},
             </if>
         </trim>
-         where id = #{id}
+        where id = #{id}
     </update>
 </mapper>
@@ -10,8 +10,8 @@
         <result column="create_time" property="createTime"/>
         <result column="url_link" property="urlLink"/>
     </resultMap>
-    
-    
+
+
     <select id="getList" parameterType="com.sincere.student.dto.ColumnDto" resultMap="ColumnMap">
         select * from university_column_type
         <where>
@@ -33,7 +33,20 @@
         insert into university_column_type(type,name,sort,create_time,url_link)
         values (#{type},#{name},#{sort},GETDATE(),#{urlLink})
     </insert>
-    
+
+    <select id="countSort" resultMap="ColumnMap">
+        select * from university_column_type where type = #{type}
+        <choose>
+            <when test="flag ==1">
+                and sort >= #{sort}
+            </when>
+            <when test="flag ==2">
+                and sort >= #{sort} and id != #{id}
+            </when>
+        </choose>
+        order by sort asc
+    </select>
+
     <insert id="update" parameterType="com.sincere.student.model.ColumnType">
         update university_column_type
         <trim prefix="set" suffixOverrides=",">
@@ -17,14 +17,14 @@
     <select id="getList" parameterType="com.sincere.student.model.Major" resultMap="MajorMap">
         select * from university_major
-         <where>
-             <if test="pid != 0">
+        <where>
+            <if test="pid != 0">
                 and p_id = #{pid}
-             </if>
-             <if test="major != null and major != ''">
+            </if>
+            <if test="major != null and major != ''">
                 and major like #{major}
-             </if>
-         </where>
+            </if>
+        </where>
     </select>
     <select id="getListCount" parameterType="com.sincere.student.model.Major" resultType="java.lang.Integer">
@@ -39,7 +39,7 @@
         </where>
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Major" >
+    <insert id="create" parameterType="com.sincere.student.model.Major">
         insert into university_major (major,major_code,p_id,create_time)
         values (#{major},#{majorCode},#{pid},GETDATE())
     </insert>
@@ -77,10 +77,10 @@
         </collection>
     </resultMap>
-    <select id="selectMajor"  resultMap="MajorMap2" >
-                select f.id as f_id , f.major as f_major , s.id as s_id  , s.major as s_major from
-         university_major s
-				join university_major f on f.id = s.p_id
+    <select id="selectMajor" resultMap="MajorMap2">
+        select f.id as f_id , f.major as f_major , s.id as s_id , s.major as s_major from
+        university_major s
+        join university_major f on f.id = s.p_id
     </select>
 </mapper>
@@ -7,11 +7,11 @@
         <result column="message" property="message"/>
     </resultMap>
-    <select id="getByCode"  resultMap="ParameterMap">
+    <select id="getByCode" resultMap="ParameterMap">
         select * from sys_parameter where code = #{code}
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Parameter" >
+    <insert id="create" parameterType="com.sincere.student.model.Parameter">
         insert into sys_parameter values (#{code},#{message})
     </insert>
@@ -21,15 +21,15 @@
     </update>
     <resultMap id="AccessTokenMap" type="com.sincere.student.model.AccessToken">
-        <id column="id" jdbcType="INTEGER" property="id" />
-        <result column="access_token" jdbcType="VARCHAR" property="accessToken" />
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="access_token" jdbcType="VARCHAR" property="accessToken"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>
     <insert id="insertAccessToken" parameterType="com.sincere.student.model.AccessToken">
-    insert into access_token (access_token)
-    values (#{accessToken,jdbcType=VARCHAR}
-      )
+        insert into access_token (access_token)
+        values (#{accessToken,jdbcType=VARCHAR}
+        )
     </insert>
     <select id="getAccessToken" resultMap="AccessTokenMap">
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.SysUserMapper">
-  <resultMap id="BaseResultMap" type="com.sincere.student.model.SysUser">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, user_name, password, create_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from sys_user
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from sys_user
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.SysUser">
-    insert into sys_user (id, user_name, password, 
-      create_time)
-    values (#{id,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.SysUser">
-    insert into sys_user
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="userName != null">
-        user_name,
-      </if>
-      <if test="password != null">
-        password,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="userName != null">
-        #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.SysUser">
-    update sys_user
-    <set>
-      <if test="userName != null">
-        user_name = #{userName,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
+    <resultMap id="BaseResultMap" type="com.sincere.student.model.SysUser">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="user_name" jdbcType="VARCHAR" property="userName"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, user_name, password, create_time
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from sys_user
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from sys_user
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.sincere.student.model.SysUser">
+        insert into sys_user (id, user_name, password,
+        create_time)
+        values (#{id,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+        #{createTime,jdbcType=TIMESTAMP})
+    </insert>
+    <insert id="insertSelective" parameterType="com.sincere.student.model.SysUser">
+        insert into sys_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="userName != null">
+                user_name,
+            </if>
+            <if test="password != null">
+                password,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="userName != null">
+                #{userName,jdbcType=VARCHAR},
+            </if>
+            <if test="password != null">
+                #{password,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.SysUser">
+        update sys_user
+        <set>
+            <if test="userName != null">
+                user_name = #{userName,jdbcType=VARCHAR},
+            </if>
+            <if test="password != null">
+                password = #{password,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.SysUser">
+        update sys_user
+        set user_name = #{userName,jdbcType=VARCHAR},
         password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.SysUser">
-    update sys_user
-    set user_name = #{userName,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+        create_time = #{createTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 </mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversityConsultDetailMapper">
-  <resultMap id="BaseResultMap" type="com.sincere.student.model.UniversityConsultDetail">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="consult_id" jdbcType="INTEGER" property="consultId" />
-    <result column="column_name" jdbcType="VARCHAR" property="columnName" />
-    <result column="column_url" jdbcType="VARCHAR" property="columnUrl" />
-    <result column="sort" jdbcType="INTEGER" property="sort" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, consult_id, column_name, column_url, sort
-  </sql>
-  <select id="selectByConsult" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from university_consult_detail
-    where consult_id = #{id,jdbcType=INTEGER}
-    order by sort
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from university_consult_detail
-    where consult_id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.UniversityConsultDetail">
-    insert into university_consult_detail ( consult_id, column_name,
-      column_url, sort)
-    values ( #{consultId,jdbcType=INTEGER}, #{columnName,jdbcType=VARCHAR},
-      #{columnUrl,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.UniversityConsultDetail">
-    insert into university_consult_detail
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="consultId != null">
-        consult_id,
-      </if>
-      <if test="columnName != null">
-        column_name,
-      </if>
-      <if test="columnUrl != null">
-        column_url,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="consultId != null">
-        #{consultId,jdbcType=INTEGER},
-      </if>
-      <if test="columnName != null">
-        #{columnName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnUrl != null">
-        #{columnUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsultDetail">
-    update university_consult_detail
-    <set>
-      <if test="consultId != null">
-        consult_id = #{consultId,jdbcType=INTEGER},
-      </if>
-      <if test="columnName != null">
+    <resultMap id="BaseResultMap" type="com.sincere.student.model.UniversityConsultDetail">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="consult_id" jdbcType="INTEGER" property="consultId"/>
+        <result column="column_name" jdbcType="VARCHAR" property="columnName"/>
+        <result column="column_url" jdbcType="VARCHAR" property="columnUrl"/>
+        <result column="sort" jdbcType="INTEGER" property="sort"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, consult_id, column_name, column_url, sort
+    </sql>
+    <select id="selectByConsult" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from university_consult_detail
+        where consult_id = #{id,jdbcType=INTEGER}
+        order by sort
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from university_consult_detail
+        where consult_id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.sincere.student.model.UniversityConsultDetail">
+        insert into university_consult_detail ( consult_id, column_name,
+        column_url, sort)
+        values ( #{consultId,jdbcType=INTEGER}, #{columnName,jdbcType=VARCHAR},
+        #{columnUrl,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER})
+    </insert>
+    <insert id="insertSelective" parameterType="com.sincere.student.model.UniversityConsultDetail">
+        insert into university_consult_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="consultId != null">
+                consult_id,
+            </if>
+            <if test="columnName != null">
+                column_name,
+            </if>
+            <if test="columnUrl != null">
+                column_url,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="consultId != null">
+                #{consultId,jdbcType=INTEGER},
+            </if>
+            <if test="columnName != null">
+                #{columnName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnUrl != null">
+                #{columnUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                #{sort,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsultDetail">
+        update university_consult_detail
+        <set>
+            <if test="consultId != null">
+                consult_id = #{consultId,jdbcType=INTEGER},
+            </if>
+            <if test="columnName != null">
+                column_name = #{columnName,jdbcType=VARCHAR},
+            </if>
+            <if test="columnUrl != null">
+                column_url = #{columnUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                sort = #{sort,jdbcType=INTEGER},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.UniversityConsultDetail">
+        update university_consult_detail
+        set consult_id = #{consultId,jdbcType=INTEGER},
         column_name = #{columnName,jdbcType=VARCHAR},
-      </if>
-      <if test="columnUrl != null">
         column_url = #{columnUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.UniversityConsultDetail">
-    update university_consult_detail
-    set consult_id = #{consultId,jdbcType=INTEGER},
-      column_name = #{columnName,jdbcType=VARCHAR},
-      column_url = #{columnUrl,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+        sort = #{sort,jdbcType=INTEGER}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 </mapper>
 \ No newline at end of file
@@ -2,179 +2,212 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversityConsultMapper">
-  <resultMap id="ListMap" type="com.sincere.student.model.Consult">
-    <result column="id" property="id" />
-    <result column="column_type" property="columnType" />
-    <result column="universityId" property="universityId" />
-    <result column="name"  property="name" />
-    <result column="code" property="code" />
-    <result column="sort" property="sort" />
-    <result column="img_url"  property="imgUrl" />
-    <result column="status" property="status" />
-    <result column="read_number" property="readNumber" />
-    <result column="columnTypeString" property="columnTypeString" />
-  </resultMap>
+    <resultMap id="ListMap" type="com.sincere.student.model.Consult">
+        <result column="id" property="id"/>
+        <result column="column_type" property="columnType"/>
+        <result column="universityId" property="universityId"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="sort" property="sort"/>
+        <result column="img_url" property="imgUrl"/>
+        <result column="status" property="status"/>
+        <result column="read_number" property="readNumber"/>
+        <result column="columnTypeString" property="columnTypeString"/>
+        <result column="background" property="background"/>
+        <result column="model_list" property="modelList"/>
+    </resultMap>
-  <select id="getListCount" parameterType="com.sincere.student.dto.ConsultSearchDto" resultType="java.lang.Integer">
-    select count(DISTINCT c.id) from university_consult c
-    join university_info info on c.university_id = info.id
-    left join university_relate_major r on info.id = r.university_id
-    left join university_major m on m.id = r.major_id
-    <where>
-      <if test="columnType > 0">
-        and c.column_type = #{columnType}
-      </if>
-      <if test="columnType == 0">
-        and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort)
-      </if>
-      <if test="columnType == -1">
-        and 1=1
-      </if>
-      <if test="province != null and province != '' ">
-        and info.province = #{province}
-      </if>
-      <if test="city != null and city != '' ">
-        and info.city = #{city}
-      </if>
-      <if test="universityName != null and universityName != ''">
-        and info.name like #{universityName}
-      </if>
-      <if test="majorName != null and majorName != ''">
-        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>
+    <select id="getListCount" parameterType="com.sincere.student.dto.ConsultSearchDto" resultType="java.lang.Integer">
+        select count(DISTINCT c.id) from university_consult c
+        join university_info info on c.university_id = info.id
+        left join university_relate_major r on info.id = r.university_id
+        left join university_major m on m.id = r.major_id
+        <where>
+            <if test="columnType > 0">
+                and c.column_type = #{columnType}
+            </if>
+            <if test="columnType == 0">
+                and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort)
+            </if>
+            <if test="columnType == -1">
+                and 1=1
+            </if>
+            <if test="province != null and province != '' ">
+                and info.province = #{province}
+            </if>
+            <if test="city != null and city != '' ">
+                and info.city = #{city}
+            </if>
+            <if test="universityName != null and universityName != ''">
+                and info.name like #{universityName}
+            </if>
+            <if test="majorName != null and majorName != ''">
+                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>
-  <select id="getList" parameterType="com.sincere.student.dto.ConsultSearchDto" resultMap="ListMap">
-    select DISTINCT c.id , c.column_type , info.id as universityId ,c.read_number , 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
-    left join university_relate_major r on info.id = r.university_id
-    left join university_major m on m.id = r.major_id
-    <where>
-      <if test="columnType > 0">
-        and c.column_type = #{columnType}
-      </if>
-      <if test="columnType == 0">
-        and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort)
-      </if>
-      <if test="columnType == -1">
-        and 1=1
-      </if>
-      <if test="province != null and province != '' ">
-        and info.province = #{province}
-      </if>
-      <if test="city != null and city != '' ">
-        and info.city = #{city}
-      </if>
-      <if test="universityName != null and universityName != ''">
-        and info.name like #{universityName}
-      </if>
-      <if test="majorName != null and majorName != ''">
-        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>
+    <select id="getList" parameterType="com.sincere.student.dto.ConsultSearchDto" resultMap="ListMap">
+        select DISTINCT c.id , c.column_type , info.id as universityId ,c.read_number , c.img_url ,c.sort , info.name ,
+        info.code ,c.status
+        ,c.background from university_consult c
+        join university_info info on c.university_id = info.id
+        left join university_relate_major r on info.id = r.university_id
+        left join university_major m on m.id = r.major_id
+        <where>
+            <if test="columnType > 0">
+                and c.column_type = #{columnType}
+            </if>
+            <if test="columnType == 0">
+                and c.column_type = (select top 1 id from university_column_type where type = 2 order by sort)
+            </if>
+            <if test="columnType == -1">
+                and 1=1
+            </if>
+            <if test="province != null and province != '' ">
+                and info.province = #{province}
+            </if>
+            <if test="city != null and city != '' ">
+                and info.city = #{city}
+            </if>
+            <if test="universityName != null and universityName != ''">
+                and info.name like #{universityName}
+            </if>
+            <if test="majorName != null and majorName != ''">
+                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>
-  <select id="selectByUniversityIdAndColumnType" parameterType="com.sincere.student.model.UniversityConsult" resultMap="DetailMap">
-    select * from university_consult
-    where university_id =#{universityId} and column_type = #{columnType}
-  </select>
+    <select id="selectByUniversityIdAndColumnType" parameterType="com.sincere.student.model.UniversityConsult"
+            resultMap="DetailMap">
+        select * from university_consult
+        where university_id =#{universityId} and column_type = #{columnType}
+    </select>
-  <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} and c.status = 1
-  </select>
+    <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} 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.read_number ,c.sort , info.name , info.code ,university_column_type.name as columnTypeString from university_consult c
-    join university_info info on c.university_id = info.id
-    left join university_column_type on c.column_type = university_column_type.id
-    where c.column_type = #{columnType} and c.status = 1
-    order by c.sort
-  </select>
+    <select id="getColumnList" parameterType="java.lang.Integer" resultMap="ListMap">
+        select DISTINCT c.id , info.id as universityId , c.img_url ,c.read_number ,c.sort , info.name , info.code
+        ,university_column_type.name as columnTypeString from university_consult c
+        join university_info info on c.university_id = info.id
+        left join university_column_type on c.column_type = university_column_type.id
+        where c.column_type = #{columnType} and c.status = 1
+        order by c.sort
+    </select>
-  <resultMap id="DetailMap" type="com.sincere.student.model.Consult">
-    <result column="id" property="id" />
-    <result column="universityId" property="universityId" />
-    <result column="name"  property="name" />
-    <result column="code" property="code" />
-    <result column="sort" property="sort" />
-    <result column="img_url"  property="imgUrl" />
-    <result column="column_type" property="columnType" />
-    <result column="video_url" property="videoUrl" />
-    <result column="context"  property="context" />
-    <result column="phone"  property="phone" />
-    <result column="read_number" property="readNumber"/>
-  </resultMap>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="DetailMap">
-      select * from university_consult c
-      join university_info info on c.university_id = info.id
-      where c.id =#{id}
-  </select>
+    <resultMap id="DetailMap" type="com.sincere.student.model.Consult">
+        <result column="id" property="id"/>
+        <result column="universityId" property="universityId"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="sort" property="sort"/>
+        <result column="img_url" property="imgUrl"/>
+        <result column="column_type" property="columnType"/>
+        <result column="video_url" property="videoUrl"/>
+        <result column="context" property="context"/>
+        <result column="phone" property="phone"/>
+        <result column="read_number" property="readNumber"/>
+        <result column="background" property="background"/>
+        <result column="model_list" property="modelList"/>
+    </resultMap>
-  <update id="updateRead" parameterType="java.lang.Integer">
-    update university_consult set read_number = read_number+1 where id=#{id}
-  </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="DetailMap">
+        select * from university_consult c
+        join university_info info on c.university_id = info.id
+        where c.id =#{id}
+    </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from university_consult
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.UniversityConsult" useGeneratedKeys="true" keyProperty="id">
-    insert into university_consult (university_id, column_type,
-      video_url, context, img_url, 
-      create_time, sort,status,read_number)
-    values (#{universityId,jdbcType=INTEGER}, #{columnType,jdbcType=INTEGER},
-      #{videoUrl,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, 
-      GETDATE(), #{sort,jdbcType=INTEGER},#{status},#{readNumber})
-  </insert>
+    <select id="countSort" resultMap="DetailMap">
+        select * from university_consult where
+        <choose>
+            <when test="flag ==1">
+                sort >= #{sort}
+            </when>
+            <when test="flag ==2">
+                sort >= #{sort} and id != #{id}
+            </when>
+        </choose>
+        order by sort asc
+    </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsult">
-    update university_consult
-    <set>
-      <if test="universityId != null">
-        university_id = #{universityId,jdbcType=INTEGER},
-      </if>
-      <if test="columnType != null">
-        column_type = #{columnType,jdbcType=INTEGER},
-      </if>
-      <if test="videoUrl != null">
-        video_url = #{videoUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="context != null">
-        context = #{context,jdbcType=VARCHAR},
-      </if>
-      <if test="imgUrl != null">
-        img_url = #{imgUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="sort != null">
-        sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        status = #{status},
-      </if>
-      <if test="readNumber != 0">
-        read_number = #{readNumber},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+    <update id="updateRead" parameterType="java.lang.Integer">
+        update university_consult set read_number = read_number+1 where id=#{id}
+    </update>
+
+    <update id="updateSort" parameterType="com.sincere.student.model.Consult">
+        update university_consult set sort = #{sort} where id=#{id}
+    </update>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from university_consult
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.sincere.student.model.UniversityConsult" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into university_consult (university_id, column_type,
+        video_url, context, img_url,create_time, sort,status,read_number,background,model_list)
+        values (#{universityId,jdbcType=INTEGER}, #{columnType,jdbcType=INTEGER},
+        #{videoUrl,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR},
+        GETDATE(),
+        #{sort,jdbcType=INTEGER},#{status},#{readNumber},#{background,jdbcType=VARCHAR},#{modelList,jdbcType=VARCHAR})
+    </insert>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.UniversityConsult">
+        update university_consult
+        <set>
+            <if test="universityId != null">
+                university_id = #{universityId,jdbcType=INTEGER},
+            </if>
+            <if test="columnType != null">
+                column_type = #{columnType,jdbcType=INTEGER},
+            </if>
+            <if test="videoUrl != null">
+                video_url = #{videoUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="context != null">
+                context = #{context,jdbcType=VARCHAR},
+            </if>
+            <if test="imgUrl != null">
+                img_url = #{imgUrl,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="sort != null">
+                sort = #{sort,jdbcType=INTEGER},
+            </if>
+            <if test="status != null">
+                status = #{status},
+            </if>
+            <if test="readNumber != 0">
+                read_number = #{readNumber},
+            </if>
+            <if test="background != null">
+                background = #{background},
+            </if>
+            <if test="readNumber != 0">
+                model_list = #{modelList}
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 </mapper>
 \ No newline at end of file
@@ -28,14 +28,14 @@
         delete university_relate_major where university_id = #{universityId}
     </delete>
-    <select id="selectUniversityMajor" parameterType="java.lang.Integer" resultMap="MajorMap" >
-                select f.id as f_id , f.major as f_major , s.id as s_id  , s.major as s_major from
-         university_major s
-				join university_major f on f.id = s.p_id
-				join university_relate_major r on s.id = r.major_id
+    <select id="selectUniversityMajor" parameterType="java.lang.Integer" resultMap="MajorMap">
+        select f.id as f_id , f.major as f_major , s.id as s_id , s.major as s_major from
+        university_major s
+        join university_major f on f.id = s.p_id
+        join university_relate_major r on s.id = r.major_id
         where r.university_id = #{id}
     </select>
-    
+
     <select id="selectIdByMajor" parameterType="java.util.Map" resultType="java.lang.Integer">
         select m.id from university_info info join university_relate_major rm on info.id=rm.university_id
         join university_major m on rm.major_id = m.id
@@ -16,7 +16,8 @@
         <result column="logo_url" property="logoUrl"/>
     </resultMap>
-    <select id="getListCount" parameterType="com.sincere.student.dto.UniversitySearchDto" resultType="java.lang.Integer">
+    <select id="getListCount" parameterType="com.sincere.student.dto.UniversitySearchDto"
+            resultType="java.lang.Integer">
         select count(0) from university_info
         <where>
             <if test="search != null and search != ''">
@@ -39,9 +40,11 @@
         select * from university_info where id = #{id}
     </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,logo_url)
-        values (#{name},#{code},#{universityType},#{department},#{province},#{city},#{level},GETDATE(),#{phone},#{logoUrl})
+    <insert id="create" parameterType="com.sincere.student.model.University">
+        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">
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversityMessageMapper">
-  <resultMap id="BaseResultMap" type="com.sincere.student.model.Message">
-    <result column="id" jdbcType="INTEGER" property="id" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="context" jdbcType="VARCHAR" property="context" />
-    <result column="phone" jdbcType="VARCHAR" property="phone" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-  </resultMap>
+    <resultMap id="BaseResultMap" type="com.sincere.student.model.Message">
+        <result column="id" jdbcType="INTEGER" property="id"/>
+        <result column="title" jdbcType="VARCHAR" property="title"/>
+        <result column="context" jdbcType="VARCHAR" property="context"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+    </resultMap>
-  <select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
-    select count(0) from university_message
-    <where>
-      <if test="search != null and search != ''">
-        and title like #{search}
-      </if>
-    </where>
-  </select>
+    <select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
+        select count(0) from university_message
+        <where>
+            <if test="search != null and search != ''">
+                and title like #{search}
+            </if>
+        </where>
+    </select>
-  <select id="getList" parameterType="com.sincere.student.dto.MessageSearchDto" resultMap="BaseResultMap">
-    select * from university_message
-    <where>
-      <if test="search != null and search != ''">
-        and title like #{search}
-      </if>
-    </where>
-  </select>
+    <select id="getList" parameterType="com.sincere.student.dto.MessageSearchDto" resultMap="BaseResultMap">
+        select * from university_message
+        <where>
+            <if test="search != null and search != ''">
+                and title like #{search}
+            </if>
+        </where>
+    </select>
-  <select id="getDetail" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select * from university_message m
-    where m.id=#{id}
-  </select>
+    <select id="getDetail" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select * from university_message m
+        where m.id=#{id}
+    </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from university_message
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from university_message
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.Message">
-    insert into university_message (title, context,
-      phone, create_time)
-    values (#{title,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR},
-      #{phone,jdbcType=VARCHAR}, GETDATE())
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.Message">
-    insert into university_message
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="context != null">
-        context,
-      </if>
-      <if test="phone != null">
-        phone,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="context != null">
-        #{context,jdbcType=VARCHAR},
-      </if>
-      <if test="phone != null">
-        #{phone,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
+    <insert id="insert" parameterType="com.sincere.student.model.Message">
+        insert into university_message (title, context,
+        phone, create_time)
+        values (#{title,jdbcType=VARCHAR}, #{context,jdbcType=VARCHAR},
+        #{phone,jdbcType=VARCHAR}, GETDATE())
+    </insert>
+    <insert id="insertSelective" parameterType="com.sincere.student.model.Message">
+        insert into university_message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="title != null">
+                title,
+            </if>
+            <if test="context != null">
+                context,
+            </if>
+            <if test="phone != null">
+                phone,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="title != null">
+                #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="context != null">
+                #{context,jdbcType=VARCHAR},
+            </if>
+            <if test="phone != null">
+                #{phone,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
 </mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversityPointMapper">
-  <resultMap id="BaseResultMap" type="com.sincere.student.model.Point">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="submit_id" jdbcType="INTEGER" property="submitId" />
-    <result column="university" jdbcType="VARCHAR" property="universityName" />
-    <result column="major" jdbcType="VARCHAR" property="major" />
-    <result column="grade" jdbcType="VARCHAR" property="grade" />
-    <result column="enroll_number" jdbcType="INTEGER" property="enrollNumber" />
-    <result column="rank" jdbcType="INTEGER" property="rank" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="province" jdbcType="VARCHAR" property="province" />
-    <result column="city" jdbcType="VARCHAR" property="city" />
-  </resultMap>
+    <resultMap id="BaseResultMap" type="com.sincere.student.model.Point">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="submit_id" jdbcType="INTEGER" property="submitId"/>
+        <result column="university" jdbcType="VARCHAR" property="universityName"/>
+        <result column="major" jdbcType="VARCHAR" property="major"/>
+        <result column="grade" jdbcType="VARCHAR" property="grade"/>
+        <result column="enroll_number" jdbcType="INTEGER" property="enrollNumber"/>
+        <result column="rank" jdbcType="INTEGER" property="rank"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="province" jdbcType="VARCHAR" property="province"/>
+        <result column="city" jdbcType="VARCHAR" property="city"/>
+    </resultMap>
-  <insert id="insertBatch" parameterType="java.util.List">
-    insert into university_point (submit_id, university , major ,grade ,enroll_number ,rank,create_time,province,city)
-    values
-    <foreach collection="list" item="emp" separator=",">
-      (#{emp.submitId}, #{emp.universityName}, #{emp.major}, #{emp.grade}, #{emp.enrollNumber}, #{emp.rank},GETDATE(),#{emp.province},#{emp.city})
-    </foreach>
-  </insert>
+    <insert id="insertBatch" parameterType="java.util.List">
+        insert into university_point (submit_id, university , major ,grade ,enroll_number
+        ,rank,create_time,province,city)
+        values
+        <foreach collection="list" item="emp" separator=",">
+            (#{emp.submitId}, #{emp.universityName}, #{emp.major}, #{emp.grade}, #{emp.enrollNumber},
+            #{emp.rank},GETDATE(),#{emp.province},#{emp.city})
+        </foreach>
+    </insert>
-  <delete id="deleteBySubmit" parameterType="java.lang.Integer">
-    delete from university_point
-    where submit_id = #{id,jdbcType=INTEGER}
-  </delete>
+    <delete id="deleteBySubmit" parameterType="java.lang.Integer">
+        delete from university_point
+        where submit_id = #{id,jdbcType=INTEGER}
+    </delete>
 </mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversityReplyMapper">
-  <resultMap id="BaseResultMap" type="com.sincere.student.model.Reply">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="message_id" jdbcType="INTEGER" property="messageId" />
-    <result column="context" jdbcType="VARCHAR" property="context" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, message_id, context, create_time
-  </sql>
-  <select id="selectByMessageId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from university_reply
-    where message_id = #{id,jdbcType=INTEGER}
-    order by create_time desc
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from university_reply
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
+    <resultMap id="BaseResultMap" type="com.sincere.student.model.Reply">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="message_id" jdbcType="INTEGER" property="messageId"/>
+        <result column="context" jdbcType="VARCHAR" property="context"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id, message_id, context, create_time
+    </sql>
+    <select id="selectByMessageId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from university_reply
+        where message_id = #{id,jdbcType=INTEGER}
+        order by create_time desc
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from university_reply
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
-  <delete id="deleteByMessageId" parameterType="java.lang.Integer">
-    delete from university_reply
-    where message_id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.Reply">
-    insert into university_reply (message_id, context,
-      create_time)
-    values (#{messageId,jdbcType=INTEGER}, #{context,jdbcType=VARCHAR},
-      GETDATE())
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.Reply">
-    insert into university_reply
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="messageId != null">
-        message_id,
-      </if>
-      <if test="context != null">
-        context,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="messageId != null">
-        #{messageId,jdbcType=INTEGER},
-      </if>
-      <if test="context != null">
-        #{context,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.Reply">
-    update university_reply
-    <set>
-      <if test="messageId != null">
-        message_id = #{messageId,jdbcType=INTEGER},
-      </if>
-      <if test="context != null">
+    <delete id="deleteByMessageId" parameterType="java.lang.Integer">
+        delete from university_reply
+        where message_id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.sincere.student.model.Reply">
+        insert into university_reply (message_id, context,
+        create_time)
+        values (#{messageId,jdbcType=INTEGER}, #{context,jdbcType=VARCHAR},
+        GETDATE())
+    </insert>
+    <insert id="insertSelective" parameterType="com.sincere.student.model.Reply">
+        insert into university_reply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="messageId != null">
+                message_id,
+            </if>
+            <if test="context != null">
+                context,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="messageId != null">
+                #{messageId,jdbcType=INTEGER},
+            </if>
+            <if test="context != null">
+                #{context,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.Reply">
+        update university_reply
+        <set>
+            <if test="messageId != null">
+                message_id = #{messageId,jdbcType=INTEGER},
+            </if>
+            <if test="context != null">
+                context = #{context,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.Reply">
+        update university_reply
+        set message_id = #{messageId,jdbcType=INTEGER},
         context = #{context,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.Reply">
-    update university_reply
-    set message_id = #{messageId,jdbcType=INTEGER},
-      context = #{context,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+        create_time = #{createTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 </mapper>
 \ No newline at end of file
@@ -2,181 +2,181 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sincere.student.mapper.UniversitySubmitFileMapper">
-  <resultMap id="LineMap" type="com.sincere.student.dto.submit.SubmitLine">
-    <result column="id"  property="id" />
-    <result column="title"  property="title" />
-    <collection property="universityList" ofType="com.sincere.student.dto.submit.SubmitUniv">
-      <result column="universityId"  property="universityId" />
-      <result column="name"  property="universityName" />
-      <result column="major"  property="major" />
-      <result column="grade"  property="grade" />
-      <result column="enroll_number"  property="enrollNumber" />
-      <result column="rank"  property="rank" />
-    </collection>
-  </resultMap>
+    <resultMap id="LineMap" type="com.sincere.student.dto.submit.SubmitLine">
+        <result column="id" property="id"/>
+        <result column="title" property="title"/>
+        <collection property="universityList" ofType="com.sincere.student.dto.submit.SubmitUniv">
+            <result column="universityId" property="universityId"/>
+            <result column="name" property="universityName"/>
+            <result column="major" property="major"/>
+            <result column="grade" property="grade"/>
+            <result column="enroll_number" property="enrollNumber"/>
+            <result column="rank" property="rank"/>
+        </collection>
+    </resultMap>
-  <select id="getAppListCount" parameterType="com.sincere.student.dto.PointSearchDto" resultType="java.lang.Integer">
-    select count(DISTINCT(sf.id))
-    from university_submit_file sf join university_point p on sf.id = p.submit_id
-    <where>
-      <if test="submitId != 0">
-        and sf.id = #{submitId}
-      </if>
-      <if test="majorName != null and majorName != '' ">
-        and p.major like #{majorName}
-      </if>
-      <if test="universityName != null and universityName != '' ">
-        and p.university like #{universityName}
-      </if>
-      <if test="province != null and province != '' ">
-        and p.province = #{province}
-      </if>
-      <if test="city != null and city != '' ">
-        and p.city = #{city}
-      </if>
-      <if test="point != 0 ">
-        <![CDATA[ and p.grade > #{point}-5 and p.grade < #{point} +5  ]]>
-      </if>
-      <if test="rank != 0 ">
-        <![CDATA[ and p.rank > #{rank}-100 and p.rank < #{rank} +100  ]]>
-      </if>
-    </where>
-  </select>
+    <select id="getAppListCount" parameterType="com.sincere.student.dto.PointSearchDto" resultType="java.lang.Integer">
+        select count(DISTINCT(sf.id))
+        from university_submit_file sf join university_point p on sf.id = p.submit_id
+        <where>
+            <if test="submitId != 0">
+                and sf.id = #{submitId}
+            </if>
+            <if test="majorName != null and majorName != '' ">
+                and p.major like #{majorName}
+            </if>
+            <if test="universityName != null and universityName != '' ">
+                and p.university like #{universityName}
+            </if>
+            <if test="province != null and province != '' ">
+                and p.province = #{province}
+            </if>
+            <if test="city != null and city != '' ">
+                and p.city = #{city}
+            </if>
+            <if test="point != 0 ">
+                <![CDATA[ and p.grade > #{point}-5 and p.grade < #{point} +5  ]]>
+            </if>
+            <if test="rank != 0 ">
+                <![CDATA[ and p.rank > #{rank}-100 and p.rank < #{rank} +100  ]]>
+            </if>
+        </where>
+    </select>
-  <select id="getAppList" parameterType="com.sincere.student.dto.PointSearchDto" resultMap="LineMap">
-    select sf.id , sf.title , p.university as name , p.major , p.enroll_number , p.rank , p.grade
-    from university_submit_file sf join university_point p on sf.id = p.submit_id
-    <where>
-        <if test="submitId != 0">
-          and sf.id = #{submitId}
-        </if>
-        <if test="majorName != null and majorName != '' ">
-          and p.major like #{majorName}
-        </if>
-      <if test="universityName != null and universityName != '' ">
-        and p.university like #{universityName}
-      </if>
-      <if test="province != null and province != '' ">
-        and p.province = #{province}
-      </if>
-      <if test="city != null and city != '' ">
-        and p.city = #{city}
-      </if>
-        <if test="point != 0 ">
-          <![CDATA[ and p.grade >= #{point}-5 and p.grade <= #{point} +5  ]]>
-        </if>
-        <if test="rank != 0 ">
-          <![CDATA[ and p.rank >= #{rank}-100 and p.rank <= #{rank} +100  ]]>
-        </if>
-    </where>
-    order by sf.id
-  </select>
+    <select id="getAppList" parameterType="com.sincere.student.dto.PointSearchDto" resultMap="LineMap">
+        select sf.id , sf.title , p.university as name , p.major , p.enroll_number , p.rank , p.grade
+        from university_submit_file sf join university_point p on sf.id = p.submit_id
+        <where>
+            <if test="submitId != 0">
+                and sf.id = #{submitId}
+            </if>
+            <if test="majorName != null and majorName != '' ">
+                and p.major like #{majorName}
+            </if>
+            <if test="universityName != null and universityName != '' ">
+                and p.university like #{universityName}
+            </if>
+            <if test="province != null and province != '' ">
+                and p.province = #{province}
+            </if>
+            <if test="city != null and city != '' ">
+                and p.city = #{city}
+            </if>
+            <if test="point != 0 ">
+                <![CDATA[ and p.grade >= #{point}-5 and p.grade <= #{point} +5  ]]>
+            </if>
+            <if test="rank != 0 ">
+                <![CDATA[ and p.rank >= #{rank}-100 and p.rank <= #{rank} +100  ]]>
+            </if>
+        </where>
+        order by sf.id
+    </select>
-  <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" />
-  </resultMap>
+    <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"/>
+    </resultMap>
-  <select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
-    select count(0) from university_submit_file
-    <where>
-      <if test="search != null and search != '' ">
-        title like #{search}
-      </if>
-    </where>
-  </select>
+    <select id="getListCount" parameterType="com.sincere.student.dto.MessageSearchDto" resultType="java.lang.Integer">
+        select count(0) from university_submit_file
+        <where>
+            <if test="search != null and search != '' ">
+                title like #{search}
+            </if>
+        </where>
+    </select>
-  <select id="getList" parameterType="com.sincere.student.dto.MessageSearchDto" resultMap="BaseResultMap">
-    select * from university_submit_file
-    <where>
-      <if test="search != null and search != '' ">
-        title like #{search}
-      </if>
-    </where>
-    order by sort
-  </select>
+    <select id="getList" parameterType="com.sincere.student.dto.MessageSearchDto" resultMap="BaseResultMap">
+        select * from university_submit_file
+        <where>
+            <if test="search != null and search != '' ">
+                title like #{search}
+            </if>
+        </where>
+        order by sort
+    </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select *
-    from university_submit_file
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from university_submit_file
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.sincere.student.model.SubmitFile" useGeneratedKeys="true" keyProperty="id">
-    insert into university_submit_file (title, year,
-      sort, create_time,file_url)
-    values (#{title,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR},
-      #{sort,jdbcType=INTEGER}, GETDATE(),#{fileUrl})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sincere.student.model.SubmitFile">
-    insert into university_submit_file
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="year != null">
-        year,
-      </if>
-      <if test="sort != null">
-        sort,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="year != null">
-        #{year,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != null">
-        #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.SubmitFile">
-    update university_submit_file
-    <set>
-      <if test="title != null and title != ''">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="year != null and year != ''">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select *
+        from university_submit_file
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        delete from university_submit_file
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" parameterType="com.sincere.student.model.SubmitFile" useGeneratedKeys="true" keyProperty="id">
+        insert into university_submit_file (title, year,
+        sort, create_time,file_url)
+        values (#{title,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR},
+        #{sort,jdbcType=INTEGER}, GETDATE(),#{fileUrl})
+    </insert>
+    <insert id="insertSelective" parameterType="com.sincere.student.model.SubmitFile">
+        insert into university_submit_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="title != null">
+                title,
+            </if>
+            <if test="year != null">
+                year,
+            </if>
+            <if test="sort != null">
+                sort,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="title != null">
+                #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="year != null">
+                #{year,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != null">
+                #{sort,jdbcType=INTEGER},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sincere.student.model.SubmitFile">
+        update university_submit_file
+        <set>
+            <if test="title != null and title != ''">
+                title = #{title,jdbcType=VARCHAR},
+            </if>
+            <if test="year != null and year != ''">
+                year = #{year,jdbcType=VARCHAR},
+            </if>
+            <if test="sort != 0">
+                sort = #{sort,jdbcType=INTEGER},
+            </if>
+            <if test="fileUrl != null and fileUrl != ''">
+                file_url = #{fileUrl,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.SubmitFile">
+        update university_submit_file
+        set title = #{title,jdbcType=VARCHAR},
         year = #{year,jdbcType=VARCHAR},
-      </if>
-      <if test="sort != 0">
         sort = #{sort,jdbcType=INTEGER},
-      </if>
-      <if test="fileUrl != null and fileUrl != ''">
-        file_url = #{fileUrl,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sincere.student.model.SubmitFile">
-    update university_submit_file
-    set title = #{title,jdbcType=VARCHAR},
-      year = #{year,jdbcType=VARCHAR},
-      sort = #{sort,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
+        create_time = #{createTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
 </mapper>
 \ No newline at end of file
@@ -11,13 +11,13 @@
         <result column="create_time" property="createTime"/>
         <result column="name" property="name"/>
         <result column="code" property="code"/>
-        <result column="status" property="status" />
-        <result column="logo_url" property="imgUrl" />
-        <result column="duration" property="duration" />
-        <result column="cover_url" property="coverUrl" />
-        <result column="video_name" property="videoName" />
-        <result column="read_number" property="readNumber" />
-        <result column="columnTypeString" property="columnTypeString" />
+        <result column="status" property="status"/>
+        <result column="logo_url" property="imgUrl"/>
+        <result column="duration" property="duration"/>
+        <result column="cover_url" property="coverUrl"/>
+        <result column="video_name" property="videoName"/>
+        <result column="read_number" property="readNumber"/>
+        <result column="columnTypeString" property="columnTypeString"/>
     </resultMap>
@@ -29,9 +29,23 @@
         select * from university_video where id = #{id}
     </select>
+    <select id="countSort" resultMap="VideoMap">
+        select * from university_video where
+        <choose>
+            <when test="flag ==1">
+                sort >= #{sort}
+            </when>
+            <when test="flag ==2">
+                sort >= #{sort} and id != #{id}
+            </when>
+        </choose>
+        order by sort asc
+    </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
+    <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}
@@ -52,7 +66,8 @@
     </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
+        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}
@@ -95,7 +110,8 @@
     </select>
     <select id="getList" parameterType="com.sincere.student.dto.VideoSearchDto" resultMap="VideoMap">
-        select v.*,info.name,info.code ,info.logo_url , university_column_type.name as columnTypeString  from university_video v join university_info info on v.university_id = info.id
+        select v.*,info.name,info.code ,info.logo_url , university_column_type.name as columnTypeString from
+        university_video v join university_info info on v.university_id = info.id
         left join university_column_type on v.column_type = university_column_type.id
         <where>
             <if test="columnType != 0">
@@ -114,12 +130,14 @@
                 and 1 = 1
             </if>
         </where>
-         order by v.sort
+        order by v.sort
     </select>
-    <insert id="create" parameterType="com.sincere.student.model.Video"  useGeneratedKeys="true" keyProperty="id">
-        insert into university_video (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name,read_number)
-        values (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName},#{readNumber})
+    <insert id="create" parameterType="com.sincere.student.model.Video" useGeneratedKeys="true" keyProperty="id">
+        insert into university_video
+        (column_type,university_id,sort,video_url,create_time,status,duration,cover_url,video_name,read_number)
+        values
+        (#{columnType},#{universityId},#{sort},#{videoUrl},GETDATE(),#{status},#{duration},#{coverUrl},#{videoName},#{readNumber})
     </insert>
     <delete id="delete" parameterType="java.lang.Integer">
@@ -157,6 +175,6 @@
                 read_number=#{readNumber},
             </if>
         </trim>
-         where id = #{id}
+        where id = #{id}
     </update>
 </mapper>
1	package com.sincere.student.access;	1	package com.sincere.student.access;
2		2
3	import java.lang.annotation.*;	3	import java.lang.annotation.*;
		4	+
4	/**	5	/**
5	* 方法上有这个注解就表示需要登录	6	* 方法上有这个注解就表示需要登录
6	*/	7	*/
	@@ -4,16 +4,16 @@ import io.swagger.annotations.ApiModel;		@@ -4,16 +4,16 @@ import io.swagger.annotations.ApiModel;
4	import io.swagger.annotations.ApiModelProperty;	4	import io.swagger.annotations.ApiModelProperty;
5		5
6	@ApiModel	6	@ApiModel
7	-public class ArticleSearchDto extends PageDto{	7	+public class ArticleSearchDto extends PageDto {
8		8
9	@ApiModelProperty(value = "文章类型 1广告文章 2权威解读必传")	9	@ApiModelProperty(value = "文章类型 1广告文章 2权威解读必传")
10	- private int articleType ;	10	+ private int articleType;
11	@ApiModelProperty(value = "标题")	11	@ApiModelProperty(value = "标题")
12	- private String title ;	12	+ private String title;
13	@ApiModelProperty(value = "文章栏目")	13	@ApiModelProperty(value = "文章栏目")
14	- private int columnType ;	14	+ private int columnType;
15	@ApiModelProperty(value = "状态 0预览1发布都不用传")	15	@ApiModelProperty(value = "状态 0预览1发布都不用传")
16	- private int status ;	16	+ private int status;
17		17
18	public int getStatus() {	18	public int getStatus() {
19	return status;	19	return status;
	@@ -7,11 +7,11 @@ import io.swagger.annotations.ApiModelProperty;		@@ -7,11 +7,11 @@ import io.swagger.annotations.ApiModelProperty;
7	public class BaseDto<T> {	7	public class BaseDto<T> {
8		8
9	@ApiModelProperty(value = "接口成功与否")	9	@ApiModelProperty(value = "接口成功与否")
10	- private boolean success ;	10	+ private boolean success;
11	@ApiModelProperty(value = "错误信息")	11	@ApiModelProperty(value = "错误信息")
12	- private String message ;	12	+ private String message;
13	@ApiModelProperty(value = "数据")	13	@ApiModelProperty(value = "数据")
14	- private T data ;	14	+ private T data;
15		15
16	public boolean isSuccess() {	16	public boolean isSuccess() {
17	return success;	17	return success;
	@@ -38,7 +38,7 @@ public class BaseDto<T> {		@@ -38,7 +38,7 @@ public class BaseDto<T> {
38	}	38	}
39		39
40	public BaseDto() {	40	public BaseDto() {
41	- this.success = true ;	41	+ this.success = true;
42	}	42	}
43		43
44	@Override	44	@Override
	@@ -2,8 +2,8 @@ package com.sincere.student.dto;		@@ -2,8 +2,8 @@ package com.sincere.student.dto;
2		2
3	public class ColumnDto {	3	public class ColumnDto {
4		4
5	- private int type ;
6	- private String name ;	5	+ private int type;
		6	+ private String name;
7		7
8	public int getType() {	8	public int getType() {
9	return type;	9	return type;
	@@ -7,17 +7,17 @@ import io.swagger.annotations.ApiModelProperty;		@@ -7,17 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
7	public class ConsultSearchDto extends PageDto {	7	public class ConsultSearchDto extends PageDto {
8		8
9	@ApiModelProperty(value = "栏目类型")	9	@ApiModelProperty(value = "栏目类型")
10	- private int columnType ;	10	+ private int columnType;
11	@ApiModelProperty(value = "查询学校")	11	@ApiModelProperty(value = "查询学校")
12	- private String universityName ;	12	+ private String universityName;
13	@ApiModelProperty(value = "省")	13	@ApiModelProperty(value = "省")
14	- private String province ;	14	+ private String province;
15	@ApiModelProperty(value = "市")	15	@ApiModelProperty(value = "市")
16	- private String city ;	16	+ private String city;
17	@ApiModelProperty(value = "专业")	17	@ApiModelProperty(value = "专业")
18	- private String majorName ;	18	+ private String majorName;
19	@ApiModelProperty(value = "状态 0预览1发布都不用传")	19	@ApiModelProperty(value = "状态 0预览1发布都不用传")
20	- private int status ;	20	+ private int status;
21		21
22	public int getStatus() {	22	public int getStatus() {
23	return status;	23	return status;
	@@ -2,7 +2,7 @@ package com.sincere.student.dto;		@@ -2,7 +2,7 @@ package com.sincere.student.dto;
2		2
3	public class IdDto {	3	public class IdDto {
4		4
5	- private int id ;	5	+ private int id;
6		6
7	public int getId() {	7	public int getId() {
8	return id;	8	return id;
	@@ -2,8 +2,8 @@ package com.sincere.student.dto;		@@ -2,8 +2,8 @@ package com.sincere.student.dto;
2		2
3	public class LinkUsDto {	3	public class LinkUsDto {
4		4
5	- private String url ;
6	- private String urlLink ;	5	+ private String url;
		6	+ private String urlLink;
7		7
8	public String getUrlLink() {	8	public String getUrlLink() {
9	return urlLink;	9	return urlLink;
	@@ -7,9 +7,9 @@ import io.swagger.annotations.ApiModelProperty;		@@ -7,9 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
7	public class MajorSearchDto extends PageDto {	7	public class MajorSearchDto extends PageDto {
8		8
9	@ApiModelProperty(value = "查询名称，或编码")	9	@ApiModelProperty(value = "查询名称，或编码")
10	- private String search ;	10	+ private String search;
11	@ApiModelProperty(value = "父级专业id 查一级专业时，pid传-1")	11	@ApiModelProperty(value = "父级专业id 查一级专业时，pid传-1")
12	- private int pid ;	12	+ private int pid;
13		13
14	public int getPid() {	14	public int getPid() {
15	return pid;	15	return pid;
	@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;		@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
7	public class MessageSearchDto extends PageDto {	7	public class MessageSearchDto extends PageDto {
8		8
9	@ApiModelProperty(value = "搜索")	9	@ApiModelProperty(value = "搜索")
10	- private String search ;	10	+ private String search;
11		11
12	public String getSearch() {	12	public String getSearch() {
13	return search;	13	return search;
	@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiModelProperty;		@@ -6,9 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
6	@ApiModel	6	@ApiModel
7	public class PageDto {	7	public class PageDto {
8	@ApiModelProperty(value = "页码")	8	@ApiModelProperty(value = "页码")
9	- private int page ;	9	+ private int page;
10	@ApiModelProperty(value = "每页数量")	10	@ApiModelProperty(value = "每页数量")
11	- private int pageSize ;	11	+ private int pageSize;
12		12
13	public int getPage() {	13	public int getPage() {
14	return page;	14	return page;