From c95dbf50917e691127293a9c385471c346573d34 Mon Sep 17 00:00:00 2001 From: wanghb <17803890193@163.com> Date: Tue, 12 Sep 2023 18:38:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8=E4=B8=80?= =?UTF-8?q?=E5=AF=B9=E5=A4=9A=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AcademicController.java | 9 + .../academic/service/AcademicService.java | 2 + .../service/impl/AcademicServiceImpl.java | 15 +- .../controller/ApplicationController.java | 31 ++-- .../application/entity/Application.java | 11 +- .../application/entity/Directory.java | 9 + .../application/mapper/ApplicationMapper.java | 3 + .../service/ApplicationService.java | 7 +- .../service/impl/ApplicationServiceImpl.java | 112 ++++++++---- .../application/vo/AppCourseDirectoryVo.java | 12 ++ .../application/vo/ApplicationVo.java | 4 +- .../application/vo/ClientApplicationVo.java | 2 + .../course/controller/CourseController.java | 23 ++- .../zhiyun03/course/mapper/CourseMapper.java | 3 + .../course/service/CourseService.java | 4 + .../service/impl/CourseServiceImpl.java | 40 ++++- .../controller/DownloadController.java | 8 + .../download/service/DownloadService.java | 2 + .../service/impl/DownloadServiceImpl.java | 9 + .../game/controller/GameController.java | 9 + .../zhiyun03/game/service/GameService.java | 2 + .../game/service/impl/GameServiceImpl.java | 17 +- .../invite/controller/InviteController.java | 10 +- .../invite/service/InviteService.java | 2 + .../invite/service/impl/InviteServieImpl.java | 10 ++ .../controller/KnowledgeController.java | 9 + .../knowledge/service/KnowledgeService.java | 2 + .../service/impl/KnowledgeServiceImpl.java | 18 +- .../serve/controller/ServeController.java | 8 + .../zhiyun03/serve/service/ServeService.java | 2 + .../serve/service/impl/ServeServiceImpl.java | 15 ++ .../textual/controller/TextualController.java | 8 + .../textual/service/TextualService.java | 2 + .../service/impl/TextualServiceImpl.java | 17 +- .../user/controller/UserController.java | 2 - src/main/resources/application.yml | 4 +- .../resources/mapper/ApplicationMapper.xml | 15 ++ src/main/resources/mapper/CourseMapper.xml | 16 +- src/main/resources/mapper/DirectoryMapper.xml | 8 +- .../static/layui-v2.6.8/applicationList.html | 53 +++++- .../static/layui-v2.6.8/courseList.html | 166 ++++++++++++++++-- .../static/layui-v2.6.8/downloadList.html | 6 +- .../static/layui-v2.6.8/serveList.html | 4 +- 43 files changed, 614 insertions(+), 97 deletions(-) create mode 100644 src/main/java/com/zhiyun/zhiyun03/application/vo/AppCourseDirectoryVo.java diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java b/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java index 6d52f7f..cb50a80 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/controller/AcademicController.java @@ -139,4 +139,13 @@ public class AcademicController { } return JsonResult.error(ResultCode.Fail,"失败"); } + + + + @ApiOperation("目录删除") + @GetMapping("/delDownloadDirectory") + public JsonResult delAcademicDirectory(String name){ + academicService.delCourseDirectory(name); + return JsonResult.success("删除成功"); + } } diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/service/AcademicService.java b/src/main/java/com/zhiyun/zhiyun03/academic/service/AcademicService.java index 60bd5d2..ac852f6 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/service/AcademicService.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/service/AcademicService.java @@ -28,4 +28,6 @@ public interface AcademicService extends IService { int addDirectory(Directory directory); List queryAcademicClient(); + + void delCourseDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java index 12030b1..0145495 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java @@ -79,7 +79,7 @@ public class AcademicServiceImpl extends ServiceImpl i } QueryWrapper qwa=new QueryWrapper<>(); - qwa.lambda().eq(Academic::getAcademicName,academicVo.getAcademicName()).or().eq(Academic::getAcademicUrl,academicVo.getAcademicUrl()); + qwa.lambda().eq(Academic::getAcademicName,academicVo.getAcademicName()); Academic academic1 = academicMapper.selectOne(qwa); if(academic1!=null){ throw new ServiceException("403","学术名称或链接已存在"); @@ -209,6 +209,7 @@ public class AcademicServiceImpl extends ServiceImpl i directory.setDirAddtime(new Date()); directory.setId(uuid); directory.setDirIden(6); + directory.setSequence(0); int insert = directoryMapper.insert(directory); return insert; } @@ -239,5 +240,17 @@ public class AcademicServiceImpl extends ServiceImpl i return clientApplicationVos; } + @Override + public void delCourseDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,6); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(Academic::getDirId,directory.getId()); + academicMapper.delete(qw); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java b/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java index 8c426a1..3eb3b6b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/controller/ApplicationController.java @@ -1,14 +1,11 @@ package com.zhiyun.zhiyun03.application.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.util.StringUtil; -import com.zhiyun.zhiyun03.academic.vo.AcademicVo; -import com.zhiyun.zhiyun03.application.config.HospConfig; import com.zhiyun.zhiyun03.application.entity.Application; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.service.ApplicationService; import com.zhiyun.zhiyun03.application.vo.ApplicationVo; import com.zhiyun.zhiyun03.application.vo.ClientApplicationVo; +import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.utils.common.JsonResult; import com.zhiyun.zhiyun03.utils.common.ResultCode; @@ -16,14 +13,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.annotation.ApplicationScope; -import springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; import java.util.List; -import static com.alibaba.druid.sql.ast.TDDLHint.Type.JSON; - @Api("应用中心") @RestController @RequestMapping("/application") @@ -42,14 +35,15 @@ public class ApplicationController { return JsonResult.success(lists).setCount(lists.getTotal()); } - @GetMapping ("/queryDir") + @GetMapping ("/queryAppCourseDirectory") @ApiOperation("查询目录") - public JsonResult queryDir(){ - List list = applicationService.queryDir(); + public JsonResult queryAppCourseDirectory(){ + List list = applicationService.queryDirectory(); return JsonResult.success(list); } + @PostMapping ("/queryApp") @ApiOperation("客户端应用中心模块查询") public JsonResult queryApp(){ @@ -61,7 +55,7 @@ public class ApplicationController { @RequestMapping(value = "/addApplication",method = RequestMethod.POST) @ApiOperation("新增应用") - public JsonResult addApplication(ApplicationVo applicationVo){ + public JsonResult addApplication(@RequestBody ApplicationVo applicationVo){ int result = applicationService.addApplication(applicationVo); if(result>0){ return JsonResult.success(ResultCode.SUCCESS); @@ -81,7 +75,7 @@ public class ApplicationController { @PostMapping("/updateApplication") @ApiOperation("更新应用") - public JsonResult updateApplication(ApplicationVo applicationVo){ + public JsonResult updateApplication(@RequestBody ApplicationVo applicationVo){ int result = applicationService.updateApplication(applicationVo); if(result>0){ return JsonResult.success(ResultCode.SUCCESS); @@ -108,4 +102,15 @@ public class ApplicationController { } return JsonResult.error(ResultCode.Fail,"失败"); } + + @PostMapping("/dirSequence") + @ApiOperation("目录排序") + public JsonResult dirSequence(Application application){ + applicationService.dirSequence(application); + return JsonResult.success(ResultCode.SUCCESS); + } + + + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/entity/Application.java b/src/main/java/com/zhiyun/zhiyun03/application/entity/Application.java index 55a08d7..9ca7102 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/entity/Application.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/entity/Application.java @@ -47,7 +47,7 @@ public class Application { * 目录id */ @TableField(value = "dir_id") - private int dirId; + private String dirId; /** * icon @@ -71,4 +71,13 @@ public class Application { @TableField(value = "app_updatetime") private Date appUpdatetime; + + + /** + * 目录排序 + */ + @TableField(value = "sequence") + private Integer sequence; + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java b/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java index 30b3fd3..2ceee05 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhiyun.zhiyun03.course.entity.Course; +import io.swagger.models.auth.In; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -60,4 +61,12 @@ public class Directory { private Date dirAddtime; + + /** + * 目录排序 + */ + @TableField(value = "sequence") + private Integer sequence; + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/mapper/ApplicationMapper.java b/src/main/java/com/zhiyun/zhiyun03/application/mapper/ApplicationMapper.java index 3433f81..fa97b94 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/mapper/ApplicationMapper.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/mapper/ApplicationMapper.java @@ -2,6 +2,7 @@ package com.zhiyun.zhiyun03.application.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhiyun.zhiyun03.application.entity.Application; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.vo.ApplicationVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,4 +15,6 @@ public interface ApplicationMapper extends BaseMapper { List queryApplication(); int findByNameAndId(@Param("id") Integer id,@Param("appName") String appName); + + int updateSequence(Application application); } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/service/ApplicationService.java b/src/main/java/com/zhiyun/zhiyun03/application/service/ApplicationService.java index 9670a72..835b923 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/service/ApplicationService.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/service/ApplicationService.java @@ -1,7 +1,5 @@ package com.zhiyun.zhiyun03.application.service; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.zhiyun.zhiyun03.application.entity.Application; import com.zhiyun.zhiyun03.application.entity.Directory; @@ -16,7 +14,6 @@ public interface ApplicationService extends IService { int addApplication(ApplicationVo applicationVo); - List queryDir(); ApplicationVo selectByIdApplication(Integer id); @@ -27,4 +24,8 @@ public interface ApplicationService extends IService { int addDirectory(Directory directory); List queryApp(); + + List queryDirectory(); + + void dirSequence(Application application); } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java index d68977c..5be5785 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java @@ -1,29 +1,23 @@ package com.zhiyun.zhiyun03.application.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.databind.util.BeanUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.zhiyun.zhiyun03.academic.vo.AcademicVo; import com.zhiyun.zhiyun03.application.entity.Application; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.ApplicationMapper; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; import com.zhiyun.zhiyun03.application.service.ApplicationService; import com.zhiyun.zhiyun03.application.vo.ClientApplicationVo; +import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.utils.convert.ConvertUtil; import com.zhiyun.zhiyun03.application.vo.ApplicationVo; -import com.zhiyun.zhiyun03.utils.convert.Switch; import com.zhiyun.zhiyun03.utils.exception.ServiceException; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.time.LocalTime; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -43,9 +37,27 @@ public class ApplicationServiceImpl extends ServiceImpl queryApplication(Integer page, Integer limit) { - PageHelper.startPage(page,limit); + String orderBy = "sequence desc"; + PageHelper.startPage(page,limit,orderBy); //查询所有课程 - List applicationVos = applicationMapper.queryApplication(); +// List applicationVos = applicationMapper.queryApplication(); + QueryWrapper qwa=new QueryWrapper<>(); + List applications = applicationMapper.selectList(qwa); + ConvertUtil convertUtil=new ConvertUtil(); + List applicationVos = convertUtil.entityToVoList(applications, ApplicationVo.class); + List list=null; + for (int i = 0; i qwd=new QueryWrapper<>(); + qwd.lambda().eq(Directory::getId,split[j]); + Directory directory = directoryMapper.selectOne(qwd); + list.add(directory.getDirName()); + applicationVos.get(i).setAppCourseDirectoryVos(list); + } + } + if (applicationVos.isEmpty()) { throw new ServiceException("400","应用数据为空"); @@ -62,13 +74,14 @@ public class ApplicationServiceImpl extends ServiceImpl queryDir() { + public List queryDirectory() { QueryWrapper qwd=new QueryWrapper<>(); - qwd.lambda().eq(Directory::getDirIden,2); + qwd.select("directory_name").lambda().eq(Directory::getDirIden,2); List list = directoryMapper.selectList(qwd); if(list.isEmpty()){ throw new ServiceException("400","目录数据为空"); @@ -76,6 +89,15 @@ public class ApplicationServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Application::getAppName,application.getAppName()); + Application application1 = applicationMapper.selectOne(queryWrapper); + + applicationMapper.updateSequence(application1); + } + /** * 根据id查询应用中心 @@ -86,14 +108,19 @@ public class ApplicationServiceImpl extends ServiceImpl qwa=new QueryWrapper<>(); qwa.lambda().eq(Application::getId,id); Application application = applicationMapper.selectOne(qwa); - //查询目录 - QueryWrapper qwd=new QueryWrapper<>(); - qwd.lambda().eq(Directory::getId,application.getDirId()); - Directory directory = directoryMapper.selectOne(qwd); ConvertUtil convertUtil=new ConvertUtil(); ApplicationVo applicationVo = convertUtil.entityToVo(application, ApplicationVo.class); + //查询目录 + List list=new ArrayList(); + String[] split = application.getDirId().split(","); + for (int i = 0; i < split.length; i++) { + QueryWrapper qwd=new QueryWrapper<>(); + qwd.lambda().eq(Directory::getId,split[i]); + Directory directory = directoryMapper.selectOne(qwd); + list.add(directory.getDirName()); + } //给目录名称赋值 - applicationVo.setDirName(directory.getDirName()); + applicationVo.setAppCourseDirectoryVos(list); return applicationVo; } @@ -108,7 +135,7 @@ public class ApplicationServiceImpl extends ServiceImpl0) { - throw new ServiceException("300","课程名已存在"); + throw new ServiceException("300","应用名已存在"); } - ConvertUtil convertUtil=new ConvertUtil(); Application application = convertUtil.VoToEntity(applicationVo, Application.class); - QueryWrapper qwd=new QueryWrapper<>(); - qwd.lambda().eq(Directory::getDirName,applicationVo.getDirName()).eq(Directory::getDirIden,2); - Directory directory = directoryMapper.selectOne(qwd); - application.setDirId(directory.getId()); + String arr=""; + for (int i = 0; i < applicationVo.getAppCourseDirectoryVos().size(); i++) { + QueryWrapper qwd=new QueryWrapper<>(); + qwd.lambda().eq(Directory::getDirIden,2).eq(Directory::getDirName,applicationVo.getAppCourseDirectoryVos().get(i).getDirectoryName()); + Directory directory = directoryMapper.selectOne(qwd); + if(i==applicationVo.getAppCourseDirectoryVos().size()-1){ + arr=arr+directory.getId(); + }else { + arr=directory.getId()+","; + } + } + + application.setDirId(arr); application.setAppUpdatetime(new Date()); int update = applicationMapper.updateById(application); return update; @@ -174,6 +209,7 @@ public class ApplicationServiceImpl extends ServiceImpl qwa=new QueryWrapper<>(); - qwa.lambda().eq(Application::getAppName,applicationVo.getAppName()).or().eq(Application::getAppUrl,applicationVo.getAppUrl()); + qwa.lambda().eq(Application::getAppName,applicationVo.getAppName()); List applications = applicationMapper.selectList(qwa); if(applications.size()!=0){ - throw new ServiceException("403","应用名称或链接已存在"); + throw new ServiceException("403","应用名称已存在"); } ConvertUtil convertUtil=new ConvertUtil(); Application application = convertUtil.VoToEntity(applicationVo, Application.class); - QueryWrapper qwd=new QueryWrapper<>(); - qwd.lambda().eq(Directory::getDirName,applicationVo.getDirName()).eq(Directory::getDirIden,2); - Directory directory = directoryMapper.selectOne(qwd); - application.setDirId(directory.getId()); + String arr=""; + for (int i = 0; i < applicationVo.getAppCourseDirectoryVos().size(); i++) { + QueryWrapper qwd=new QueryWrapper<>(); + qwd.lambda().eq(Directory::getDirName,applicationVo.getAppCourseDirectoryVos().get(i).getDirectoryName()).eq(Directory::getDirIden,2); + Directory directory = directoryMapper.selectOne(qwd); + if (i==applicationVo.getAppCourseDirectoryVos().size()-1){ + arr=arr+directory.getId(); + }else { + arr=directory.getId()+","; + } + } + Integer uuid= UUID.randomUUID().toString().replaceAll("-","").hashCode(); + uuid = uuid < 0 ? -uuid : uuid;//String.hashCode() 值会为空 + application.setId(uuid); + application.setDirId(arr); application.setAppAddtime(new Date()); + application.setSequence(0); int insert = applicationMapper.insert(application); return insert; } @@ -229,7 +277,7 @@ public class ApplicationServiceImpl extends ServiceImpl appCourseDirectoryVos; //应用图标 private String appIcon; } diff --git a/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java b/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java index 64942b5..9fae2f3 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java @@ -10,5 +10,7 @@ public class ClientApplicationVo { private String dirIcon; + private String sequence; + private List applicationVos; } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java index 5b729a6..55182f7 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java @@ -14,6 +14,7 @@ import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.utils.common.JsonResult; +import com.zhiyun.zhiyun03.utils.common.ResultCode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -44,7 +45,7 @@ public class CourseController { @ApiOperation("查询课程") @GetMapping("/queryCourse") public JsonResult> queryCourse(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, - @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "5")Integer limit ){ + @ApiParam @RequestParam(value = "limit",required = false,defaultValue = "10")Integer limit ){ PageVO lists = courseService.queryCourse(page,limit); @@ -128,4 +129,24 @@ public class CourseController { } + @PostMapping("/dirSequence") + @ApiOperation("目录排序") + public JsonResult dirSequence(Course course){ + courseService.dirSequence(course); + + return JsonResult.success(ResultCode.SUCCESS); + + } + + /** + * 课程添加 + */ + @ApiOperation("目录删除") + @GetMapping("/delCourseDirectory") + public JsonResult delCourseDirectory(String name){ + courseService.delCourseDirectory(name); + return JsonResult.success("删除成功"); + } + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java b/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java index 715e18f..bf345bc 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/mapper/CourseMapper.java @@ -1,6 +1,7 @@ package com.zhiyun.zhiyun03.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.vo.ClientCourseVo; import com.zhiyun.zhiyun03.course.vo.CourseVo; @@ -37,4 +38,6 @@ public interface CourseMapper extends BaseMapper { int findByNameAndId(@Param("id") Integer id, @Param("courseName") String courseName); + + int updateSequence(Directory directory); } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java b/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java index 03c523a..dc39bdb 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java @@ -56,4 +56,8 @@ public interface CourseService extends IService { List queryCourseByDir(); List queryCourseClient(); + + void dirSequence(Course course); + + void delCourseDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java index a268de6..e07acb1 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/impl/CourseServiceImpl.java @@ -50,8 +50,8 @@ public class CourseServiceImpl extends ServiceImpl implemen */ @Override public PageVO queryCourse(Integer page, Integer limit) { - //开启分页 - PageHelper.startPage(page,limit); + String orderBy = "sequence desc"; + PageHelper.startPage(page,limit,orderBy); //查询所有课程 List courseVoList = courseMapper.queryCourse(); PageInfo pageInfo = new PageInfo(courseVoList); @@ -226,6 +226,7 @@ public class CourseServiceImpl extends ServiceImpl implemen } directory.setDirAddtime(new Date()); directory.setId(uuid); + directory.setSequence(0); directoryMapper.addCourseDirectory(directory); } /** @@ -250,7 +251,7 @@ public class CourseServiceImpl extends ServiceImpl implemen public List queryCourseClient() { //查询对应模块目录 QueryWrapper qwd=new QueryWrapper<>(); - qwd.lambda().eq(Directory::getDirIden,1); + qwd.lambda().eq(Directory::getDirIden,1).orderByDesc(true,Directory::getSequence);; List directories = directoryMapper.selectList(qwd); //转成vo类 ConvertUtil convertUtil=new ConvertUtil(); @@ -270,4 +271,37 @@ public class CourseServiceImpl extends ServiceImpl implemen } return clientApplicationVos; } + + @Override + public void dirSequence(Course course) { + + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Course::getCourseName,course.getCourseName()); + Course course1 = courseMapper.selectOne(queryWrapper); + + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().eq(Directory::getId,course1.getDirId()).eq(Directory::getDirIden,1); + Directory directory = directoryMapper.selectOne(wrapper); + + + courseMapper.updateSequence(directory); + + + } + + /** + * 删除目录 + * @param name 目录名 + * @return + */ + @Override + public void delCourseDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,1); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java b/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java index 779e5b8..5ff502c 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java @@ -136,4 +136,12 @@ public class DownloadController { + @ApiOperation("目录删除") + @GetMapping("/delDownloadDirectory") + public JsonResult delDownloadDirectory(String name){ + downloadService.delCourseDirectory(name); + return JsonResult.success("删除成功"); + } + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java b/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java index 3e504bb..8c3e572 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java @@ -31,4 +31,6 @@ public interface DownloadService extends IService { List queryDownloadDirectory(); List queryDown(); + + void delCourseDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/download/service/impl/DownloadServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/download/service/impl/DownloadServiceImpl.java index 882d60a..292c8c7 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/service/impl/DownloadServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/service/impl/DownloadServiceImpl.java @@ -193,6 +193,7 @@ public class DownloadServiceImpl extends ServiceImpl i } directory.setDirAddtime(new Date()); directory.setId(uuid); + directory.setSequence(0); /*添加下载*/ directoryMapper.addDownloadDirectory(directory); } @@ -230,4 +231,12 @@ public class DownloadServiceImpl extends ServiceImpl i return clientApplicationVos; } + @Override + public void delCourseDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,3); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java b/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java index c6075b2..8a054f7 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/controller/GameController.java @@ -140,4 +140,13 @@ public class GameController { return JsonResult.error(ResultCode.Fail,"失败"); } + + + @ApiOperation("目录删除") + @GetMapping("/delGameDirectory") + public JsonResult delGameDirectory(String name){ + gameService.delGameDirectory(name); + return JsonResult.success("删除成功"); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/game/service/GameService.java b/src/main/java/com/zhiyun/zhiyun03/game/service/GameService.java index 2af4be6..e3ba3e1 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/service/GameService.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/service/GameService.java @@ -26,4 +26,6 @@ public interface GameService extends IService { int addDirectory(Directory directory); List queryGameClient(); + + void delGameDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java index c7718d7..190b18b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zhiyun.zhiyun03.academic.entity.Academic; import com.zhiyun.zhiyun03.application.entity.Application; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; @@ -84,7 +85,7 @@ public class GameServiceImpl extends ServiceImpl implements Ga throw new ServiceException("400","结束时间不能为空"); } QueryWrapper qwg=new QueryWrapper<>(); - qwg.lambda().eq(Game::getGameName,gameVo.getGameName()).or().eq(Game::getGameUrl,gameVo.getGameUrl()); + qwg.lambda().eq(Game::getGameName,gameVo.getGameName()); List games = gameMapper.selectList(qwg); if (games.size()!=0){ throw new ServiceException("403","大赛名称或链接已存在"); @@ -207,6 +208,7 @@ public class GameServiceImpl extends ServiceImpl implements Ga directory.setDirAddtime(new Date()); directory.setId(uuid); directory.setDirIden(5); + directory.setSequence(0); int insert = directoryMapper.insert(directory); return insert; } @@ -236,4 +238,17 @@ public class GameServiceImpl extends ServiceImpl implements Ga return clientApplicationVos; } + + @Override + public void delGameDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,5); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + + + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(Game::getDirId,directory.getId()); + gameMapper.delete(qw); + } } diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java b/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java index 61ad89d..aa526dd 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java @@ -92,11 +92,19 @@ public class InviteController { @ApiOperation("查询目录") @GetMapping("/queryInviteDirectory") - public JsonResult queryInviteDirectory(){ + public JsonResult querycDirectory(){ List directory = inviteService.queryInviteDirectory(); return JsonResult.success(directory); } + @ApiOperation("目录删除") + @GetMapping("/delInviteDirectory") + public JsonResult delInviteDirectory(String name){ + inviteService.delInviteDirectory(name); + return JsonResult.success("删除成功"); + } + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java b/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java index 194033c..25cb717 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java @@ -27,4 +27,6 @@ public interface InviteService extends IService { List queryInviteDirectory(); List queryInviteClient(); + + void delInviteDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/service/impl/InviteServieImpl.java b/src/main/java/com/zhiyun/zhiyun03/invite/service/impl/InviteServieImpl.java index 3abb5c7..3099cc0 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/service/impl/InviteServieImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/service/impl/InviteServieImpl.java @@ -184,6 +184,7 @@ public class InviteServieImpl extends ServiceImpl implemen } directory.setDirAddtime(new Date()); directory.setId(uuid); + directory.setSequence(0); directoryMapper.addInviteDirectory(directory); } @@ -221,4 +222,13 @@ public class InviteServieImpl extends ServiceImpl implemen return clientApplicationVos; } + + @Override + public void delInviteDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,8); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java index 4578548..f11eb65 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/controller/KnowledgeController.java @@ -141,4 +141,13 @@ public class KnowledgeController { List list = knowledgeService.queryDir(); return JsonResult.success(list); } + + + @ApiOperation("目录删除") + @GetMapping("/delKnowledgeDirectory") + public JsonResult delKnowledgeDirectory(String name){ + knowledgeService.delKnowledgeDirectory(name); + return JsonResult.success("删除成功"); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/KnowledgeService.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/KnowledgeService.java index d6830c5..85eef22 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/KnowledgeService.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/KnowledgeService.java @@ -26,4 +26,6 @@ public interface KnowledgeService extends IService { List queryDir(); List queryKnowledgeClient(); + + void delKnowledgeDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java index 00c8602..a131157 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java @@ -82,7 +82,7 @@ public class KnowledgeServiceImpl extends ServiceImpl QueryWrapper qwk=new QueryWrapper<>(); - qwk.lambda().eq(Knowledge::getKnowledgeBrief,knowledgeVo.getKnowledgeBrief()).or().eq(Knowledge::getKnowledgeUrl,knowledgeVo.getKnowledgeUrl()); + qwk.lambda().eq(Knowledge::getKnowledgeBrief,knowledgeVo.getKnowledgeBrief()); List knowledges = knowledgeMapper.selectList(qwk); if(knowledges.size()!=0){ @@ -202,6 +202,7 @@ public class KnowledgeServiceImpl extends ServiceImpl directory.setDirAddtime(new Date()); directory.setId(uuid); directory.setDirIden(7); + directory.setSequence(0); int insert = directoryMapper.insert(directory); return insert; } @@ -226,8 +227,13 @@ public class KnowledgeServiceImpl extends ServiceImpl //转成vo类 ConvertUtil convertUtil=new ConvertUtil(); List clientApplicationVos = convertUtil.entityToVoList(directories, ClientKnowledgeVo.class); - List applicationVoList = knowledgeMapper.queryKnowledge(); + if (clientApplicationVos == null) + { + throw new RuntimeException("数据为空"); + } + + List applicationVoList = knowledgeMapper.queryKnowledge(); //向clientApplicationVos中赋值 for (int j = 0; j < clientApplicationVos.size(); j++) { List list=new ArrayList(); @@ -242,4 +248,12 @@ public class KnowledgeServiceImpl extends ServiceImpl return clientApplicationVos; } + + @Override + public void delKnowledgeDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,7); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + } } diff --git a/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java b/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java index aded211..917e2e4 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java @@ -136,4 +136,12 @@ public class ServeController { return JsonResult.success(directory); } + + @ApiOperation("目录删除") + @GetMapping("/delServiceDirectory") + public JsonResult delServiceDirectory(String name){ + serveService.delServiceDirectory(name); + return JsonResult.success("删除成功"); + } + } \ No newline at end of file diff --git a/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java b/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java index 24c7270..308525b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java @@ -29,4 +29,6 @@ public interface ServeService extends IService { List queryServiceDirectory(); List queryServeClient(); + + void delServiceDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/serve/service/impl/ServeServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/serve/service/impl/ServeServiceImpl.java index d720760..967a35d 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/service/impl/ServeServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/service/impl/ServeServiceImpl.java @@ -16,6 +16,7 @@ import com.zhiyun.zhiyun03.serve.mapper.ServeMapper; import com.zhiyun.zhiyun03.serve.service.ServeService; import com.zhiyun.zhiyun03.serve.vo.ClientServeVo; import com.zhiyun.zhiyun03.serve.vo.ServeVo; +import com.zhiyun.zhiyun03.textual.entity.Textual; import com.zhiyun.zhiyun03.utils.convert.ConvertUtil; import com.zhiyun.zhiyun03.utils.exception.ServiceException; import org.springframework.beans.BeanUtils; @@ -201,6 +202,7 @@ public class ServeServiceImpl extends ServiceImpl implements } directory.setDirAddtime(new Date()); directory.setId(uuid); + directory.setSequence(0); directoryMapper.addServiceDirectory(directory); } /* @@ -246,4 +248,17 @@ public class ServeServiceImpl extends ServiceImpl implements return clientApplicationVos; } + + @Override + public void delServiceDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,9); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + + + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(Serve::getDirId,directory.getId()); + serveMapper.delete(qw); + } } diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java b/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java index ef30058..ba1c9ee 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/controller/TextualController.java @@ -96,4 +96,12 @@ public class TextualController { } return JsonResult.error(ResultCode.Fail,"失败"); } + + @ApiOperation("目录删除") + @GetMapping("/delTextualDirectory") + public JsonResult delTextualDirectory(String name){ + textualService.delTextualDirectory(name); + return JsonResult.success("删除成功"); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/service/TextualService.java b/src/main/java/com/zhiyun/zhiyun03/textual/service/TextualService.java index 1f01c6e..866515c 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/service/TextualService.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/service/TextualService.java @@ -27,4 +27,6 @@ public interface TextualService extends IService { List queryTextualClient(); + + void delTextualDirectory(String name); } diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java index 3f521d3..895a68b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zhiyun.zhiyun03.academic.entity.Academic; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; import com.zhiyun.zhiyun03.course.vo.PageVO; @@ -78,7 +79,7 @@ public class TextualServiceImpl extends ServiceImpl impl } QueryWrapper qwt=new QueryWrapper<>(); - qwt.lambda().eq(Textual::getTextualName,textualVo.getTextualName()).or().eq(Textual::getTextualUrl,textualVo.getTextualUrl()); + qwt.lambda().eq(Textual::getTextualName,textualVo.getTextualName()); List textuals = textualMapper.selectList(qwt); if(textuals.size()!=0) { throw new ServiceException("403","考证名称或链接已存在"); @@ -203,6 +204,7 @@ public class TextualServiceImpl extends ServiceImpl impl directory.setDirAddtime(new Date()); directory.setId(uuid); directory.setDirIden(4); + directory.setSequence(0); int insert = directoryMapper.insert(directory); return insert; } @@ -231,4 +233,17 @@ public class TextualServiceImpl extends ServiceImpl impl } return clientApplicationVos; } + + @Override + public void delTextualDirectory(String name) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Directory::getDirName,name).eq(Directory::getDirIden,4); + Directory directory = directoryMapper.selectOne(queryWrapper); + directoryMapper.deleteById(directory.getId()); + + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(Textual::getDirId,directory.getId()); + textualMapper.delete(qw); + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java index ca53c77..059140b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java @@ -20,7 +20,6 @@ import java.io.IOException; public class UserController { @Autowired UserService userService; - @NoLoginCheck @RequestMapping(path = "/login") public JsonResult login(HttpSession session, @RequestParam(name = "userName") String username, @RequestParam(name = "password") String password) { @@ -36,7 +35,6 @@ public class UserController { } return JsonResult.error(ResultCode.USER_ACCOUNT_ERROR, "账号或密码错误"); } - //退出 @RequestMapping("/logout") public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 09a77fd..371bf1e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,8 +28,8 @@ spring: mode: HTML #模板 servlet: multipart: - max-file-size: 50MB - max-request-size: 50MB + max-file-size: 200MB + max-request-size: 500MB web: resources: static-locations: classpath:/static/ diff --git a/src/main/resources/mapper/ApplicationMapper.xml b/src/main/resources/mapper/ApplicationMapper.xml index 0a37091..93860f1 100644 --- a/src/main/resources/mapper/ApplicationMapper.xml +++ b/src/main/resources/mapper/ApplicationMapper.xml @@ -1,6 +1,20 @@ + + UPDATE + application + SET + sequence = + (SELECT + se + 1 + FROM + (SELECT + MAX(sequence) AS se + FROM + application) IP) + WHERE id = #{id} + @@ -56,7 +70,7 @@ c.course_updatetime from course as c inner join - (select id,dir_name,dir_img,dir_addtime,dir_iden from directory) as d + (select id,dir_name,dir_img,dir_addtime,dir_iden,sequence from directory) as d on c.dir_id = d.id WHERE d.dir_iden = 1 diff --git a/src/main/resources/mapper/DirectoryMapper.xml b/src/main/resources/mapper/DirectoryMapper.xml index bbeff48..3f8787d 100644 --- a/src/main/resources/mapper/DirectoryMapper.xml +++ b/src/main/resources/mapper/DirectoryMapper.xml @@ -4,16 +4,16 @@ - insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime) values (#{id},#{dirName},#{dirIcon},1,#{dirAddtime}) + insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime,sequence) values (#{id},#{dirName},#{dirIcon},1,#{dirAddtime},#{sequence}) - insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime) values (#{id},#{dirName},#{dirIcon},3,#{dirAddtime}) + insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime,sequence) values (#{id},#{dirName},#{dirIcon},3,#{dirAddtime},#{sequence}) - insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime,dir_brief) values (#{id},#{dirName},#{dirIcon},8,#{dirAddtime},#{dirBrief}) + insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime,dir_brief,sequence) values (#{id},#{dirName},#{dirIcon},8,#{dirAddtime},#{dirBrief},#{sequence}) - insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime) values (#{id},#{dirName},#{dirIcon},9,#{dirAddtime}) + insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime,sequence) values (#{id},#{dirName},#{dirIcon},9,#{dirAddtime},#{sequence})