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 7c2442f..5f6b7bb 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 @@ -186,7 +186,7 @@ public class AcademicServiceImpl extends ServiceImpl i if (directory.getDirName().isEmpty()){ throw new ServiceException("400","目录名称不能为空"); } - if (directory.getDirImg().isEmpty()){ + if (directory.getDirIcon().isEmpty()){ throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/vo/ClientAcademicVo.java b/src/main/java/com/zhiyun/zhiyun03/academic/vo/ClientAcademicVo.java index 1678907..70b2dd2 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/vo/ClientAcademicVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/vo/ClientAcademicVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientAcademicVo { private String dirName; - private String dirImg; + private String dirIcon; private List academicVos; } \ No newline at end of file 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 f2e0f2f..30b3fd3 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java @@ -35,11 +35,20 @@ public class Directory { @TableField(value = "dir_iden") private Integer dirIden; + + /** + * 目录简介 + */ + @TableField(value = "dir_brief") + private String dirBrief; + + + /** * 目录图片 */ @TableField(value = "dir_img") - private String dirImg; + private String dirIcon; /** 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 915d2a3..826f11a 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 @@ -147,7 +147,7 @@ public class ApplicationServiceImpl extends ServiceImpl qwd=new QueryWrapper<>(); 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 33f607a..64942b5 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/vo/ClientApplicationVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientApplicationVo { private String dirName; - private String dirImg; + private String dirIcon; private List applicationVos; } 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 9ad1f38..3204225 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 @@ -195,7 +195,7 @@ public class CourseServiceImpl extends ServiceImpl implemen throw new ServiceException("400","目录名称不能为空"); } /*判断目录图标是否为空*/ - if (directory.getDirImg().isEmpty()) + if (directory.getDirIcon().isEmpty()) { throw new ServiceException("400","请选择一个icon"); } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/vo/ClientCourseVo.java b/src/main/java/com/zhiyun/zhiyun03/course/vo/ClientCourseVo.java index 8404961..1e6f896 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/vo/ClientCourseVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/vo/ClientCourseVo.java @@ -23,7 +23,7 @@ public class ClientCourseVo { /** * 目录图片 */ - private String dirImg; + private String dirIcon; private List courseVos; 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 8ac407e..e4d90a5 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 @@ -164,7 +164,7 @@ public class DownloadServiceImpl extends ServiceImpl i if (directory.getDirName().isEmpty()) { throw new ServiceException("400", "目录名称不能为空"); } - if (directory.getDirImg().isEmpty()) { + if (directory.getDirIcon().isEmpty()) { throw new ServiceException("400", "请选择一个icon"); } /*查询目录名是否存在*/ diff --git a/src/main/java/com/zhiyun/zhiyun03/download/vo/ClientDownloadVo.java b/src/main/java/com/zhiyun/zhiyun03/download/vo/ClientDownloadVo.java index 82d3606..25086c5 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/vo/ClientDownloadVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/vo/ClientDownloadVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientDownloadVo { private String dirName; - private String dirImg; + private String dirIcon; private List downloadVos; } diff --git a/src/main/java/com/zhiyun/zhiyun03/game/entity/Game.java b/src/main/java/com/zhiyun/zhiyun03/game/entity/Game.java index bd3b0b4..c4609b2 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/entity/Game.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/entity/Game.java @@ -53,6 +53,23 @@ public class Game { @TableField(value = "game_img") private String gameImg; + /** + * 开始时间 + */ + @TableField(value = "start_time") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private String startTime; + + /** + * 结束时间 + */ + @TableField(value = "end_time") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private String endTime; + + /** * 添加时间 */ 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 b847122..986765a 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 @@ -75,6 +75,14 @@ public class GameServiceImpl extends ServiceImpl implements Ga if (gameVo.getGameImg().isEmpty()){ throw new ServiceException("400","大赛图片不能为空"); } + if (gameVo.getStartTime().isEmpty()) + { + throw new ServiceException("400","开始时间不能为空"); + } + if (gameVo.getEndTime().isEmpty()) + { + throw new ServiceException("400","结束时间不能为空"); + } QueryWrapper qwg=new QueryWrapper<>(); qwg.lambda().eq(Game::getGameName,gameVo.getGameName()).or().eq(Game::getGameUrl,gameVo.getGameUrl()); List games = gameMapper.selectList(qwg); @@ -174,7 +182,7 @@ public class GameServiceImpl extends ServiceImpl implements Ga if (directory.getDirName().isEmpty()){ throw new ServiceException("400","目录名称不能为空"); } - if (directory.getDirImg().isEmpty()){ + if (directory.getDirIcon().isEmpty()){ throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); diff --git a/src/main/java/com/zhiyun/zhiyun03/game/vo/ClientGameVo.java b/src/main/java/com/zhiyun/zhiyun03/game/vo/ClientGameVo.java index 5b909af..b6ba8e9 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/vo/ClientGameVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/vo/ClientGameVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientGameVo { private String dirName; - private String dirImg; + private String dirIcon; private List gameVos; } \ No newline at end of file diff --git a/src/main/java/com/zhiyun/zhiyun03/game/vo/GameVo.java b/src/main/java/com/zhiyun/zhiyun03/game/vo/GameVo.java index c6e6978..fd88dc3 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/vo/GameVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/vo/GameVo.java @@ -42,6 +42,18 @@ public class GameVo { */ private String dirName; + /** + * 开始时间 + */ + @TableField(value = "start_time") + private String startTime; + + /** + * 结束时间 + */ + @TableField(value = "end_time") + private String endTime; + /** * 大赛图片 */ 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 0a42dd0..215ac6c 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 @@ -160,7 +160,7 @@ public class InviteServieImpl extends ServiceImpl implemen if (directory.getDirName().isEmpty()) { throw new ServiceException("400", "目录名称不能为空"); } - if (directory.getDirImg().isEmpty()) { + if (directory.getDirIcon().isEmpty()) { throw new ServiceException("400", "请选择一个icon"); } diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/vo/ClientInviteVo.java b/src/main/java/com/zhiyun/zhiyun03/invite/vo/ClientInviteVo.java index aad6408..9d93e05 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/vo/ClientInviteVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/vo/ClientInviteVo.java @@ -8,7 +8,11 @@ import java.util.List; public class ClientInviteVo { private String dirName; - private String dirImg; + private String dirIcon; + /** + * 目录简介 + */ + private String dirBrief; private List inviteVos; } \ No newline at end of file diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java b/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java index 7486489..ac4b23d 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java @@ -1,5 +1,6 @@ package com.zhiyun.zhiyun03.invite.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -26,4 +27,7 @@ public class InviteVo { private String dirName; + + + } 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 f9d4467..9dff270 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 @@ -176,7 +176,7 @@ public class KnowledgeServiceImpl extends ServiceImpl if (directory.getDirName().isEmpty()){ throw new ServiceException("400","目录名称不能为空"); } - if (directory.getDirImg().isEmpty()){ + if (directory.getDirIcon().isEmpty()){ throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/ClientKnowledgeVo.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/ClientKnowledgeVo.java index f9c791c..de6d01b 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/ClientKnowledgeVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/ClientKnowledgeVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientKnowledgeVo { private String dirName; - private String dirImg; + private String dirIcon; private List knowledgeVos; } \ No newline at end of file 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 3f7f4d5..4dd6871 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 @@ -173,7 +173,7 @@ public class ServeServiceImpl extends ServiceImpl implements { throw new ServiceException("400","目录名称不能为空"); } - if (directory.getDirImg().isEmpty()) + if (directory.getDirIcon().isEmpty()) { throw new ServiceException("400","请选择一个icon"); } diff --git a/src/main/java/com/zhiyun/zhiyun03/serve/vo/ClientServeVo.java b/src/main/java/com/zhiyun/zhiyun03/serve/vo/ClientServeVo.java index 979d436..9a1df0c 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/vo/ClientServeVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/vo/ClientServeVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientServeVo { private String dirName; - private String dirImg; + private String dirIcon; private List serveVos; } \ No newline at end of file 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 7ebdefd..1a55c49 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 @@ -180,7 +180,7 @@ public class TextualServiceImpl extends ServiceImpl impl if (directory.getDirName().isEmpty()){ throw new ServiceException("400","目录名称不能为空"); } - if (directory.getDirImg().isEmpty()){ + if (directory.getDirIcon().isEmpty()){ throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/vo/ClientTextualVo.java b/src/main/java/com/zhiyun/zhiyun03/textual/vo/ClientTextualVo.java index f761515..19b5caf 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/vo/ClientTextualVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/vo/ClientTextualVo.java @@ -8,7 +8,7 @@ import java.util.List; public class ClientTextualVo { private String dirName; - private String dirImg; + private String dirIcon; private List textualVos; } \ No newline at end of file diff --git a/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java b/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java index 4b8ae08..1043b7a 100644 --- a/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java +++ b/src/main/java/com/zhiyun/zhiyun03/utils/config/MyWebMvcConfig.java @@ -24,16 +24,16 @@ public class MyWebMvcConfig extends WebMvcConfigurationSupport { // 注解拦截器 - @Override - protected void addInterceptors(InterceptorRegistry registry) { - // 配置需要拦截的所有访问请求 - String[] addPathPatterns = {"/**"}; - // 配置要排除的路径 - String[] excludePathPatterns = {"/login.html", "/images/","/layui/**/","/user/login","/favicon.ico","/iconfont.*", - "/confont.*" - }; - // 注册拦截器 - registry.addInterceptor(new LoginIntercetor()).addPathPatterns(addPathPatterns).excludePathPatterns(excludePathPatterns); - super.addInterceptors(registry); - } +// @Override +// protected void addInterceptors(InterceptorRegistry registry) { +// // 配置需要拦截的所有访问请求 +// String[] addPathPatterns = {"/**"}; +// // 配置要排除的路径 +// String[] excludePathPatterns = {"/login.html", "/images/","/layui/**/","/user/login","/favicon.ico","/iconfont.*", +// "/confont.*" +// }; +// // 注册拦截器 +// registry.addInterceptor(new LoginIntercetor()).addPathPatterns(addPathPatterns).excludePathPatterns(excludePathPatterns); +// super.addInterceptors(registry); +// } } diff --git a/src/main/resources/mapper/DirectoryMapper.xml b/src/main/resources/mapper/DirectoryMapper.xml index 4c2131f..bbeff48 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},#{dirImg},1,#{dirAddtime}) + 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) values (#{id},#{dirName},#{dirImg},3,#{dirAddtime}) + 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) values (#{id},#{dirName},#{dirImg},8,#{dirAddtime}) + 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) values (#{id},#{dirName},#{dirImg},9,#{dirAddtime}) + insert into directory (id,dir_name,dir_img,dir_iden,dir_addtime) values (#{id},#{dirName},#{dirIcon},9,#{dirAddtime}) - select i.id,i.invite_name,i.invite_brief,i.invite_url,d.dir_name + select i.id,i.invite_name,i.invite_brief,i.invite_url,d.dir_name,d.dir_brief from invite as i 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,dir_brief from directory) as d on i.dir_id = d.id where d.dir_iden = 8 diff --git a/src/main/resources/static/layui-v2.6.8/academicList.html b/src/main/resources/static/layui-v2.6.8/academicList.html index b25bcef..13d3fae 100644 --- a/src/main/resources/static/layui-v2.6.8/academicList.html +++ b/src/main/resources/static/layui-v2.6.8/academicList.html @@ -260,7 +260,7 @@ - - - - -