From 7843f5ab4d159f082f49dab8da79725f80dc91c1 Mon Sep 17 00:00:00 2001 From: wanghb <17803890193@163.com> Date: Fri, 1 Sep 2023 17:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DownloadServiceImpl.java | 3 +- .../zhiyun03/download/vo/DownloadVo.java | 2 + .../zhiyun03/knowledge/entity/Knowledge.java | 7 +++ .../service/impl/KnowledgeServiceImpl.java | 5 +- .../zhiyun03/knowledge/vo/KnowledgeVo.java | 8 +++ .../serve/service/impl/ServeServiceImpl.java | 10 ++++ src/main/resources/mapper/DownloadMapper.xml | 2 +- src/main/resources/mapper/KnowledgeMapper.xml | 1 + src/main/resources/mapper/ServeMapper.xml | 2 +- .../static/layui-v2.6.8/academicList.html | 31 +++++++----- .../static/layui-v2.6.8/applicationList.html | 37 ++++++++------ .../static/layui-v2.6.8/courseList.html | 45 +++++++---------- .../static/layui-v2.6.8/downloadList.html | 31 +++++++----- .../static/layui-v2.6.8/gameList.html | 33 +++++++----- .../static/layui-v2.6.8/inviteList.html | 35 +++++++------ .../static/layui-v2.6.8/knowledgeList.html | 50 ++++++++++++++----- .../static/layui-v2.6.8/serveList.html | 31 +++++++----- .../static/layui-v2.6.8/textualList.html | 37 ++++++++------ 18 files changed, 227 insertions(+), 143 deletions(-) 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 e4d90a5..67063cf 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 @@ -13,6 +13,8 @@ import com.zhiyun.zhiyun03.download.mapper.DownloadMapper; import com.zhiyun.zhiyun03.download.service.DownloadService; import com.zhiyun.zhiyun03.download.vo.ClientDownloadVo; import com.zhiyun.zhiyun03.download.vo.DownloadVo; +import com.zhiyun.zhiyun03.knowledge.vo.ClientKnowledgeVo; +import com.zhiyun.zhiyun03.knowledge.vo.KnowledgeVo; import com.zhiyun.zhiyun03.utils.convert.ConvertUtil; import com.zhiyun.zhiyun03.utils.exception.ServiceException; import org.springframework.beans.BeanUtils; @@ -216,5 +218,4 @@ public class DownloadServiceImpl extends ServiceImpl i return clientApplicationVos; } - } diff --git a/src/main/java/com/zhiyun/zhiyun03/download/vo/DownloadVo.java b/src/main/java/com/zhiyun/zhiyun03/download/vo/DownloadVo.java index 2b7779f..f64dddd 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/vo/DownloadVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/vo/DownloadVo.java @@ -8,6 +8,8 @@ public class DownloadVo { @TableId private Integer id; + private String dirIcon; + /** * 下载名称 */ diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/entity/Knowledge.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/entity/Knowledge.java index 32045eb..4375db0 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/entity/Knowledge.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/entity/Knowledge.java @@ -29,6 +29,13 @@ public class Knowledge { @TableField(value = "knowledge_name") private String knowledgeName; + /** + * 知识简介 + */ + @TableField(value = "knowledge_brief") + private String knowledgeBrief; + + /** * 知识链接 */ 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 9dff270..db36cea 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,10 +82,11 @@ public class KnowledgeServiceImpl extends ServiceImpl QueryWrapper qwk=new QueryWrapper<>(); - qwk.lambda().eq(Knowledge::getKnowledgeName,knowledgeVo.getKnowledgeName()).or().eq(Knowledge::getKnowledgeUrl,knowledgeVo.getKnowledgeUrl()); + qwk.lambda().eq(Knowledge::getKnowledgeBrief,knowledgeVo.getKnowledgeBrief()).or().eq(Knowledge::getKnowledgeUrl,knowledgeVo.getKnowledgeUrl()); List knowledges = knowledgeMapper.selectList(qwk); + if(knowledges.size()!=0){ - throw new ServiceException("403","知识名称或链接已存在"); + throw new ServiceException("403","知识详情或链接已存在"); } //将vo类转换为实体类 diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/KnowledgeVo.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/KnowledgeVo.java index e7049fd..3acf4d6 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/KnowledgeVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/vo/KnowledgeVo.java @@ -26,6 +26,14 @@ public class KnowledgeVo { */ private String knowledgeName; + + /** + * 知识简介 + */ + @TableField(value = "knowledge_brief") + private String knowledgeBrief; + + /** * 知识链接 */ 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 4dd6871..73ec1f9 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 @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; @Service public class ServeServiceImpl extends ServiceImpl implements ServeService { @@ -201,12 +202,19 @@ public class ServeServiceImpl extends ServiceImpl implements return directoryList; } + /* + * 查询客户端服务目录 + * */ @Override public List queryServeClient() { //查询对应模块目录 QueryWrapper qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirIden,9); List directories = directoryMapper.selectList(qwd); + +// List serveVoList = serveMapper.queryService(); +// List ServeName = serveVoList.stream().map(item->item.getServeName()).collect(Collectors.toList()); + //转成vo类 ConvertUtil convertUtil=new ConvertUtil(); List clientApplicationVos = convertUtil.entityToVoList(directories, ClientServeVo.class); @@ -214,11 +222,13 @@ public class ServeServiceImpl extends ServiceImpl implements //向clientApplicationVos中赋值 for (int j = 0; j < clientApplicationVos.size(); j++) { + List list=new ArrayList(); for (int i = 0; i < applicationVoList.size(); i++) { //判断目录是否相同 if (applicationVoList.get(i).getDirName().equals(clientApplicationVos.get(j).getDirName())){ list.add(applicationVoList.get(i)); +// clientApplicationVos.get(j).setServeName(ServeName.get(i)); clientApplicationVos.get(j).setServeVos(list); } } diff --git a/src/main/resources/mapper/DownloadMapper.xml b/src/main/resources/mapper/DownloadMapper.xml index 5661b4c..ac27d56 100644 --- a/src/main/resources/mapper/DownloadMapper.xml +++ b/src/main/resources/mapper/DownloadMapper.xml @@ -31,7 +31,7 @@ select c.id, c.knowledge_name, + c.knowledge_brief, c.knowledge_url, d.dir_name, c.knowledge_img, diff --git a/src/main/resources/mapper/ServeMapper.xml b/src/main/resources/mapper/ServeMapper.xml index 040e28c..dca1f1f 100644 --- a/src/main/resources/mapper/ServeMapper.xml +++ b/src/main/resources/mapper/ServeMapper.xml @@ -31,7 +31,7 @@ + + +
@@ -315,10 +326,12 @@ const parentEl = $(this).parent('.dir-img-icon') const siblingsEl = $(parentEl).siblings('.dir-img-icon') parentEl.addClass('active') + const name=$(this).attr('name') + console.log(name,"name") Array.from(siblingsEl).forEach(item=>{ $(item).removeClass('active') }) - dirIcon = $(this).attr('src') + dirIcon = $(this).attr('name') }) } @@ -342,40 +355,43 @@
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1 +
+
+ 图片1
@@ -468,6 +484,14 @@ class="layui-input">
+ +
+ +
+ +
+
diff --git a/src/main/resources/static/layui-v2.6.8/serveList.html b/src/main/resources/static/layui-v2.6.8/serveList.html index 0a925f9..bf99f31 100644 --- a/src/main/resources/static/layui-v2.6.8/serveList.html +++ b/src/main/resources/static/layui-v2.6.8/serveList.html @@ -329,10 +329,12 @@ const parentEl = $(this).parent('.dir-img-icon') const siblingsEl = $(parentEl).siblings('.dir-img-icon') parentEl.addClass('active') + const name=$(this).attr('name') + console.log(name,"name") Array.from(siblingsEl).forEach(item=>{ $(item).removeClass('active') }) - dirIcon = $(this).attr('src') + dirIcon = $(this).attr('name') }) } @@ -356,40 +358,43 @@
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1
- 图片1 + 图片1 +
+
+ 图片1
diff --git a/src/main/resources/static/layui-v2.6.8/textualList.html b/src/main/resources/static/layui-v2.6.8/textualList.html index 2cb22a5..91132be 100644 --- a/src/main/resources/static/layui-v2.6.8/textualList.html +++ b/src/main/resources/static/layui-v2.6.8/textualList.html @@ -323,14 +323,16 @@ // alert("取消") } }) - $(".select-img-wrap").on('click', '.dir-img-icon>img', function (event) { + $(".select-img-wrap").on('click', '.dir-img-icon>img', function (event){ const parentEl = $(this).parent('.dir-img-icon') const siblingsEl = $(parentEl).siblings('.dir-img-icon') parentEl.addClass('active') - $.each(siblingsEl, function () { - $(this).removeClass('active') + const name=$(this).attr('name') + console.log(name,"name") + Array.from(siblingsEl).forEach(item=>{ + $(item).removeClass('active') }) - dirIcon = $(this).attr('src') + dirIcon = $(this).attr('name') }) } @@ -399,40 +401,43 @@
- + 图片1 +
+
+ 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1
- + 图片1