From 71755c09a053896ef6f8aa0a63c8f21d2da9d0f9 Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Thu, 17 Aug 2023 18:01:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=B7=BB=E5=8A=A0=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/entity/Directory.java | 2 +- .../application/mapper/DirectoryMapper.java | 25 ++- .../zhiyun03/client/ClientBelowPanel.java | 21 -- .../zhiyun/zhiyun03/client/ClientData.java | 16 -- .../zhiyun/zhiyun03/client/ClientFrame.java | 67 ------ .../zhiyun03/client/ClientLeftPanel.java | 31 --- .../zhiyun/zhiyun03/client/ClientPanel.java | 16 -- .../zhiyun03/client/ClientRightPanel.java | 6 - .../zhiyun03/client/ClientUpperPanel.java | 41 ---- .../java/com/zhiyun/zhiyun03/client/Main.java | 10 - .../client/course/CourseLeftPanel.java | 44 ---- .../client/course/CourseRightPanel.java | 6 - .../client/course/images/directory/0.jpg | Bin 447 -> 0 bytes .../client/course/images/directory/1.jpg | Bin 505 -> 0 bytes .../client/course/images/directory/2.jpg | Bin 434 -> 0 bytes .../client/course/images/directory/3.jpg | Bin 401 -> 0 bytes .../client/course/images/directory/4.jpg | Bin 459 -> 0 bytes .../client/course/images/directory/5.jpg | Bin 526 -> 0 bytes .../client/course/images/directory/6.jpg | Bin 542 -> 0 bytes .../client/course/images/directory/7.jpg | Bin 410 -> 0 bytes .../zhiyun03/client/images/directory/0.jpg | Bin 447 -> 0 bytes .../zhiyun03/client/images/directory/1.jpg | Bin 505 -> 0 bytes .../zhiyun03/client/images/directory/2.jpg | Bin 434 -> 0 bytes .../zhiyun03/client/images/directory/3.jpg | Bin 401 -> 0 bytes .../zhiyun03/client/images/directory/4.jpg | Bin 459 -> 0 bytes .../zhiyun03/client/images/directory/5.jpg | Bin 526 -> 0 bytes .../zhiyun03/client/images/directory/6.jpg | Bin 542 -> 0 bytes .../zhiyun03/client/images/directory/7.jpg | Bin 410 -> 0 bytes .../course/controller/CourseController.java | 26 ++- .../zhiyun/zhiyun03/course/entity/Course.java | 17 ++ .../course/service/CourseService.java | 6 + .../service/impl/CourseServiceImpl.java | 44 +++- .../zhiyun03/course/vo/DirectoryVo.java | 22 ++ .../controller/DownloadController.java | 28 ++- .../download/service/DownloadService.java | 8 + .../service/impl/DownloadServiceImpl.java | 51 ++++- .../invite/controller/InviteController.java | 25 +++ .../zhiyun/zhiyun03/invite/entity/Invite.java | 6 +- .../invite/service/InviteService.java | 8 + .../invite/service/impl/InviteServieImpl.java | 43 +++- .../zhiyun/zhiyun03/invite/vo/InviteVo.java | 5 +- .../serve/controller/ServeController.java | 22 ++ .../zhiyun03/serve/service/ServeService.java | 8 + .../serve/service/impl/ServeServiceImpl.java | 50 ++++- src/main/resources/0.png | Bin 15347 -> 0 bytes src/main/resources/application.yml | 2 +- src/main/resources/mapper/CourseMapper.xml | 3 +- src/main/resources/mapper/DirectoryMapper.xml | 30 ++- src/main/resources/mapper/DownloadMapper.xml | 3 +- src/main/resources/mapper/InviteMapper.xml | 8 +- src/main/resources/mapper/ServeMapper.xml | 3 +- .../templates/layui-v2.6.8/courseList.html | 92 ++++---- .../templates/layui-v2.6.8/downloadList.html | 6 +- .../templates/layui-v2.6.8/inviteList.html | 206 ++++++++---------- .../templates/layui-v2.6.8/serveList.html | 18 +- 55 files changed, 549 insertions(+), 476 deletions(-) delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientBelowPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientData.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientFrame.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientLeftPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientRightPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/ClientUpperPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/Main.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/CourseLeftPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/CourseRightPanel.java delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/0.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/1.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/2.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/3.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/4.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/5.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/6.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/7.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/0.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/1.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/2.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/3.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/4.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/5.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/6.jpg delete mode 100644 src/main/java/com/zhiyun/zhiyun03/client/images/directory/7.jpg create mode 100644 src/main/java/com/zhiyun/zhiyun03/course/vo/DirectoryVo.java delete mode 100644 src/main/resources/0.png 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 ba180da..a760b40 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/entity/Directory.java @@ -34,7 +34,7 @@ public class Directory { /** - * 目录图片 + * 目录归属 */ @TableField(value = "dir_iden") private String dirIden; diff --git a/src/main/java/com/zhiyun/zhiyun03/application/mapper/DirectoryMapper.java b/src/main/java/com/zhiyun/zhiyun03/application/mapper/DirectoryMapper.java index 3dc326d..19f690e 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/mapper/DirectoryMapper.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/mapper/DirectoryMapper.java @@ -2,9 +2,32 @@ package com.zhiyun.zhiyun03.application.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; @Mapper public interface DirectoryMapper extends BaseMapper { - Integer selectByName(String dirName); + Integer selectByName(@Param("dirName") String dirName,@Param("dirIden") String dirIden); + + void addCourseDirectory(Directory directory); + + void addDownloadDirectory(Directory directory); + + void addInviteDirectory(Directory directory); + + void addServiceDirectory(Directory directory); + + + + List queryCourseDirectory(); + + + List queryDownloadDirectory(); + + List queryInviteDirectory(); + + List queryServiceDirectory(); } diff --git a/src/main/java/com/zhiyun/zhiyun03/client/ClientBelowPanel.java b/src/main/java/com/zhiyun/zhiyun03/client/ClientBelowPanel.java deleted file mode 100644 index 1c24d61..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/ClientBelowPanel.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.zhiyun.zhiyun03.client; - -import com.zhiyun.zhiyun03.client.course.CourseLeftPanel; -import com.zhiyun.zhiyun03.client.course.CourseRightPanel; - -import javax.swing.*; -import java.awt.*; - -public class ClientBelowPanel extends JPanel { - - - public ClientBelowPanel(){ - super(); - setSize(1200,650); - - } - public void paint(Graphics g){ - - } - -} diff --git a/src/main/java/com/zhiyun/zhiyun03/client/ClientData.java b/src/main/java/com/zhiyun/zhiyun03/client/ClientData.java deleted file mode 100644 index e774019..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/ClientData.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zhiyun.zhiyun03.client; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -/** - * 全局数据 - */ -public class ClientData { - public static final int CLIENT_LEFT_PANEL_WIDTH=160; - public static final int CLIENT_LEFT_PANEL_HEIGHT=650; - -} - diff --git a/src/main/java/com/zhiyun/zhiyun03/client/ClientFrame.java b/src/main/java/com/zhiyun/zhiyun03/client/ClientFrame.java deleted file mode 100644 index 2913221..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/ClientFrame.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.zhiyun.zhiyun03.client; - -import com.zhiyun.zhiyun03.client.course.CourseLeftPanel; -import com.zhiyun.zhiyun03.client.course.CourseRightPanel; -import com.zhiyun.zhiyun03.course.entity.Course; - -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.URL; - -public class ClientFrame extends JFrame { - //上半部分面板 - ClientUpperPanel upperPanel=new ClientUpperPanel(); - //下半部分面板 - ClientBelowPanel belowPanel=new ClientBelowPanel(); - //下半部分左边面板 - ClientLeftPanel leftPanel=new ClientLeftPanel(); - //下半部分右边面板 - ClientRightPanel rightPanel=new ClientRightPanel(); - - //菜单 - JMenuBar jMenuBar=new JMenuBar(); - - public ClientFrame(){ - -// JMenu jMenu1=new JMenu("首页"); -// JMenu jMenu2=new JMenu("课程中心"); -// JMenu jMenu3=new JMenu("应用中心"); -// JMenu jMenu4=new JMenu("大赛中心"); -// JMenu jMenu5=new JMenu("考证中心"); -// JMenu jMenu6=new JMenu("学术中心"); -// JMenu jMenu7=new JMenu("知识分享"); -// JMenu jMenu8=new JMenu("下载中心"); -// JMenu jMenu9=new JMenu("就业中心"); -// JMenu jMenu10=new JMenu("服务相关"); -// -// jMenuBar.add(jMenu1); -// jMenuBar.add(jMenu2); -// jMenuBar.add(jMenu3); -// jMenuBar.add(jMenu4); -// jMenuBar.add(jMenu5); -// jMenuBar.add(jMenu6); -// jMenuBar.add(jMenu7); -// jMenuBar.add(jMenu8); -// jMenuBar.add(jMenu9); -// jMenuBar.add(jMenu10); - - - - super.setTitle("天择教育科技"); - URL resource = ClientFrame.class.getClassLoader().getResource("0.png"); - Image image=new ImageIcon(resource).getImage(); - super.setIconImage(image); - super.setSize(1200,800); - super.setResizable(false); - super.setLocationRelativeTo(null); - super.add(leftPanel); - super.add(upperPanel); - super.add(jMenuBar,BorderLayout.NORTH); - super.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - super.setVisible(true); - } -} diff --git a/src/main/java/com/zhiyun/zhiyun03/client/ClientLeftPanel.java b/src/main/java/com/zhiyun/zhiyun03/client/ClientLeftPanel.java deleted file mode 100644 index 7e49905..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/ClientLeftPanel.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zhiyun.zhiyun03.client; - -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; - -public class ClientLeftPanel extends JPanel { - BufferedImage[] images=new BufferedImage[4]; - public ClientLeftPanel(){ - super.setSize(ClientData.CLIENT_LEFT_PANEL_WIDTH,ClientData.CLIENT_LEFT_PANEL_HEIGHT); - for (int i = 0; i new ClientFrame()); - - } -} diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/CourseLeftPanel.java b/src/main/java/com/zhiyun/zhiyun03/client/course/CourseLeftPanel.java deleted file mode 100644 index e0d197c..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/course/CourseLeftPanel.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zhiyun.zhiyun03.client.course; - -import com.zhiyun.zhiyun03.application.entity.Directory; -import com.zhiyun.zhiyun03.application.service.ApplicationService; -import com.zhiyun.zhiyun03.application.service.impl.ApplicationServiceImpl; -import com.zhiyun.zhiyun03.client.ClientData; -import com.zhiyun.zhiyun03.course.mapper.CourseMapper; -import com.zhiyun.zhiyun03.course.service.CourseService; -import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Controller; - -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.List; - -public class CourseLeftPanel extends JPanel { - - BufferedImage[] images=new BufferedImage[4]; - public CourseLeftPanel(){ - super.setSize(ClientData.CLIENT_LEFT_PANEL_WIDTH,ClientData.CLIENT_LEFT_PANEL_HEIGHT); - for (int i = 0; i < images.length; i++) { - try { - images[i]= ImageIO.read(new File("src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/"+i+".jpg")); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - public void paint(Graphics g){ - for (int i = 0; i < images.length; i++) { - g.drawImage(images[i],43,80+i*35,images[i].getWidth(),images[i].getHeight(),null); - } - g.drawString("经济学",57,80); - g.drawString("理学",57,115); - g.drawString("工学",57,150); - g.drawString("管理学",57,165); - } -} diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/CourseRightPanel.java b/src/main/java/com/zhiyun/zhiyun03/client/course/CourseRightPanel.java deleted file mode 100644 index a1d2df1..0000000 --- a/src/main/java/com/zhiyun/zhiyun03/client/course/CourseRightPanel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.zhiyun.zhiyun03.client.course; - -import javax.swing.*; - -public class CourseRightPanel extends JPanel { -} diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/0.jpg b/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/0.jpg deleted file mode 100644 index 90f990e2bc0d919ab7a76173851654801a73e7e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)6bA6$JKl|t1uK+~velGkF-nqIS@=kenzB*UX^14vG-F6edVV4h?pzHSscK5oWo(ffrwbZE8Op55NG|btr(4n z*@AnSxvMq5ipO32t&XJ@@hCHg3jPogcU$xK_*J*MR8J$~ATD85>0V~OZ3&m4TY5L1 zlU#!1ai@(5YF?%rV@w{Nai3JJ~qNr!ma0o?3N|*iti9Qc#igE{= zL{dx#EyN#)h-uvhwH(wiacNAy4)-m5x%plmc)!o#JkN8^yVvjcO*~aK6W`!X>`e08 zM9k1@NT1;sOvMP!SJm=~xZW$ps#=Uy*n`m|>)ZWVe2y>hdy@0e>$W+-T%C z@Gq`m8a}`i{EdY}IDrL8-b%6>bKB$BcrVE^EXA!PZ{r2d^}4R>w^?W4Pn=1z@-?&H z#Fix2tExYYtJsJA*q-EIRV~4(*6!9MqxcJ-RMi-s4dYuJ#i}Hyt7-~<#u_}v6^!D3 z6W@s+hVfs!xZCQaRv+QvK(}|W3$yX%5Vqhj#;R&@lBZaQi@1mFjX0~3j$z#pmL}PZ z6}VJYyOW$qGJ+{d4mRRyY)Y~L^Lt&_oo#?cRdpNhHaosba=dMHGA<A2-2Z+@k|X%E*)kPtCz9YLGijzU7vKS600000NkvXXu0mjfhK2AF diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/2.jpg b/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/2.jpg deleted file mode 100644 index 3798983959217f6ec3f57440a87dd10773100477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)oTV%tn)q>@1WlMpBAW zv!O;awn`J3G0oq?`|95;yt=*4?c96LefJHzt}{ASwG)r991*8lZW`NhDI(@Z+(FlM zs%n6XxP=$khH-S5#{y2{Htt8n>aaB!Yf4ulqMFhX3?pKu;g@)d$M~u1I$hVv%rBXF zY=qZFX710-xe*?=Zc`ZIeQ)0LSQimfE%g~cs_Gfe4Knjx8~%7id}~F|u^Y?yj*}6w zT2)&xgB6*%u*TBmzNO5Z&CDBXIJ0A|YyYgr?;c*l#xnEA0u3ecr2H>?5dZ)H07*qoM6N<$f{9(pLI3~& diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/3.jpg b/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/3.jpg deleted file mode 100644 index 5b4a2b12c7ccaa77e8573e79cc2dabfc764d8281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)4gGMLe>7Zex&{bN>^6U@$`*6n0X`w0H}P znR&JeGIJN6AR}U{$vZPz9pX-be_{n6BI0zL+a?xyKQ^%kXCmVLG&2!1^BflO8((n+ zJMj>Qu>yZbzQGlRrM<~mv9~PbzOh2s%j%McjGR4bzLuXaTQO|>?D>- v+ZVc6Mc_4F6zCcb;sh?2>TTN*eqa=-$g+B>3Wuqt!xk(z0hLnbxM18(n7DQ%eqbxKQ zR#rxelF3G?n~jugrSE+$=Dp^gI*W78^E~J6Jnu+KNgHJyx8W|v@COO&@fp)i6~4CE z&>>CX8#ZAMr*huFI(#YXIP-r?N=Y#oo+}2!R1Aj4Qc7)awipcOJN1E#nNBGgDF(v= z4GuO{SSssS;vP<9?H9P#RAHs8<8CZtG~fZ2n<^}2;35v;GA`jL-au1@cX*9QJ&fa` zwb+iSrV5L>?w57k)0yAGvmXAoiaA#Bw5;R)Tz_n;aKAJEfM4xZW7}=2a2VIIA!om= zFswWEc*fjLDH&=1YFWo=+_7r-LwwIK z*n-oT#C%hQS*#H=c{G!E;Ag(z<}5PPRN;M#{ReojxH)-+SEc{}002ovPDHLkV1kVI B&!zwX diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/5.jpg b/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/5.jpg deleted file mode 100644 index 1410e0f39d1836bf4a4837b4b36262a4ddfa20c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)yvm zcVSp~Ns{q$ExetDmzZW2WaD`r3rGFC<7|GvzUTKnzwvnD)yxq z9*wUF-y!{s>zIW}7%l5|XnbAoTgS3)2eAnUF_L1~p7BfAfZceUVi<*9Q8m5XVF_;F zZYEE}2i(SNEWuBgL>8i}U7DEKD)1$4|JQVwi~*S9(R&ba~biFK{u% zu<<*y-^0!n!=18jyMS9boJldou(7P$AIrM^udLgTW!?Ugxi7J{tlKI0cK|2w8#bjF zE|hgU9oMi0Z*UVMc%Bc~hd&4KIRj5~oRH&dyz0B{L+r-_>58g3&~=@RP43Gd7F9Ex^H05^YA#`VieYtGw+}Es z%W)*da5lf_G+a$FtSIaD9Om?js+okpv*0E6U<@bG;4&6rD4Ss}R`y$NM;8AOmZlh< z5QV>c-`lu}Sg47OnwUmK)ct$w1~ipeS!f{$R-%a2EyThmo!Dr1uUJSd(nzoo zI}t%F0-~&m7}!Q(HBm^Th-BS;yLYa|=D|boz!V1#GjryQ3L%i8>SV8i`4rNRMxO&H zIa$;&5#Z{I(d|sDLI_lyCw<~>}0 zZ}dZenv(_)H;rBbs5p5U!IK_50yYUD5JI40{pYInCo}$UHLO3BSl`Zg3^3zlK_K?f z%skYcTmlO3j9viPfKOxatKsD723%A}t$(`%CVs-HmeJp~j`S>o$pC49A00T`GFm2` z?A#Aa9T-rzem%d^G3&48SE^axO02(?*Cf`rbbyo`iZCM3&G-O%z-V5hpr=aKuNGnO z9cI58{riNINZ(?@_0TL%Ff++=4S@)Wg>BPywoV5cn?5jE1 z4h(bL1XYBaBXF*@eNB{r;07*qoM6N<$f-w*5O#lD@ diff --git a/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/7.jpg b/src/main/java/com/zhiyun/zhiyun03/client/course/images/directory/7.jpg deleted file mode 100644 index c4bf0626e2cec37bf2ea23b218db4a1ba2766711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHM)P)40%#}pQVs30Ql*tn=*XCQYLA}JI* zE&Tcef+>s^$Hq$h182q}v&*`PFHG}r-^|Q2(<`Nzo|y6+UgIo!_>QHv3G35bn32Zd zQ7mHt-|#i2e0-Xn^Y1)BY@5)V%HGD5-(wBOw%rjI@z~b6gF#Gr$N$9N7;GaBDmy7; zR=kb*nDV)C5L4cbRXk~%kjHs%n^uRoTj4*rg->l0PET`N#47K{I`-mB+k}s^%tVYS zpT|5p{KRGK!b2R!PJC#a@MHjrxx`)oefui8bx5v;UL7%HXckGj$ybvH{X z#;ZT-*7~FF^GvqXA9baaBE*!R;s+LD$_MMQ7jY7YV#>=k+hg-LZN!vc1YE&0jPD4; zde1MoU$awKtZiQiSiv>C!OIF=#Q~harJB9Nb6m&0zcNaU)Cge#TL1t607*qoM6N<$ Ef|f?Uod5s; diff --git a/src/main/java/com/zhiyun/zhiyun03/client/images/directory/0.jpg b/src/main/java/com/zhiyun/zhiyun03/client/images/directory/0.jpg deleted file mode 100644 index 90f990e2bc0d919ab7a76173851654801a73e7e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)6bA6$JKl|t1uK+~velGkF-nqIS@=kenzB*UX^14vG-F6edVV4h?pzHSscK5oWo(ffrwbZE8Op55NG|btr(4n z*@AnSxvMq5ipO32t&XJ@@hCHg3jPogcU$xK_*J*MR8J$~ATD85>0V~OZ3&m4TY5L1 zlU#!1ai@(5YF?%rV@w{Nai3JJ~qNr!ma0o?3N|*iti9Qc#igE{= zL{dx#EyN#)h-uvhwH(wiacNAy4)-m5x%plmc)!o#JkN8^yVvjcO*~aK6W`!X>`e08 zM9k1@NT1;sOvMP!SJm=~xZW$ps#=Uy*n`m|>)ZWVe2y>hdy@0e>$W+-T%C z@Gq`m8a}`i{EdY}IDrL8-b%6>bKB$BcrVE^EXA!PZ{r2d^}4R>w^?W4Pn=1z@-?&H z#Fix2tExYYtJsJA*q-EIRV~4(*6!9MqxcJ-RMi-s4dYuJ#i}Hyt7-~<#u_}v6^!D3 z6W@s+hVfs!xZCQaRv+QvK(}|W3$yX%5Vqhj#;R&@lBZaQi@1mFjX0~3j$z#pmL}PZ z6}VJYyOW$qGJ+{d4mRRyY)Y~L^Lt&_oo#?cRdpNhHaosba=dMHGA<A2-2Z+@k|X%E*)kPtCz9YLGijzU7vKS600000NkvXXu0mjfhK2AF diff --git a/src/main/java/com/zhiyun/zhiyun03/client/images/directory/2.jpg b/src/main/java/com/zhiyun/zhiyun03/client/images/directory/2.jpg deleted file mode 100644 index 3798983959217f6ec3f57440a87dd10773100477..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 434 zcmV;j0ZsmiP)oTV%tn)q>@1WlMpBAW zv!O;awn`J3G0oq?`|95;yt=*4?c96LefJHzt}{ASwG)r991*8lZW`NhDI(@Z+(FlM zs%n6XxP=$khH-S5#{y2{Htt8n>aaB!Yf4ulqMFhX3?pKu;g@)d$M~u1I$hVv%rBXF zY=qZFX710-xe*?=Zc`ZIeQ)0LSQimfE%g~cs_Gfe4Knjx8~%7id}~F|u^Y?yj*}6w zT2)&xgB6*%u*TBmzNO5Z&CDBXIJ0A|YyYgr?;c*l#xnEA0u3ecr2H>?5dZ)H07*qoM6N<$f{9(pLI3~& diff --git a/src/main/java/com/zhiyun/zhiyun03/client/images/directory/3.jpg b/src/main/java/com/zhiyun/zhiyun03/client/images/directory/3.jpg deleted file mode 100644 index 5b4a2b12c7ccaa77e8573e79cc2dabfc764d8281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)4gGMLe>7Zex&{bN>^6U@$`*6n0X`w0H}P znR&JeGIJN6AR}U{$vZPz9pX-be_{n6BI0zL+a?xyKQ^%kXCmVLG&2!1^BflO8((n+ zJMj>Qu>yZbzQGlRrM<~mv9~PbzOh2s%j%McjGR4bzLuXaTQO|>?D>- v+ZVc6Mc_4F6zCcb;sh?2>TTN*eqa=-$g+B>3Wuqt!xk(z0hLnbxM18(n7DQ%eqbxKQ zR#rxelF3G?n~jugrSE+$=Dp^gI*W78^E~J6Jnu+KNgHJyx8W|v@COO&@fp)i6~4CE z&>>CX8#ZAMr*huFI(#YXIP-r?N=Y#oo+}2!R1Aj4Qc7)awipcOJN1E#nNBGgDF(v= z4GuO{SSssS;vP<9?H9P#RAHs8<8CZtG~fZ2n<^}2;35v;GA`jL-au1@cX*9QJ&fa` zwb+iSrV5L>?w57k)0yAGvmXAoiaA#Bw5;R)Tz_n;aKAJEfM4xZW7}=2a2VIIA!om= zFswWEc*fjLDH&=1YFWo=+_7r-LwwIK z*n-oT#C%hQS*#H=c{G!E;Ag(z<}5PPRN;M#{ReojxH)-+SEc{}002ovPDHLkV1kVI B&!zwX diff --git a/src/main/java/com/zhiyun/zhiyun03/client/images/directory/5.jpg b/src/main/java/com/zhiyun/zhiyun03/client/images/directory/5.jpg deleted file mode 100644 index 1410e0f39d1836bf4a4837b4b36262a4ddfa20c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)yvm zcVSp~Ns{q$ExetDmzZW2WaD`r3rGFC<7|GvzUTKnzwvnD)yxq z9*wUF-y!{s>zIW}7%l5|XnbAoTgS3)2eAnUF_L1~p7BfAfZceUVi<*9Q8m5XVF_;F zZYEE}2i(SNEWuBgL>8i}U7DEKD)1$4|JQVwi~*S9(R&ba~biFK{u% zu<<*y-^0!n!=18jyMS9boJldou(7P$AIrM^udLgTW!?Ugxi7J{tlKI0cK|2w8#bjF zE|hgU9oMi0Z*UVMc%Bc~hd&4KIRj5~oRH&dyz0B{L+r-_>58g3&~=@RP43Gd7F9Ex^H05^YA#`VieYtGw+}Es z%W)*da5lf_G+a$FtSIaD9Om?js+okpv*0E6U<@bG;4&6rD4Ss}R`y$NM;8AOmZlh< z5QV>c-`lu}Sg47OnwUmK)ct$w1~ipeS!f{$R-%a2EyThmo!Dr1uUJSd(nzoo zI}t%F0-~&m7}!Q(HBm^Th-BS;yLYa|=D|boz!V1#GjryQ3L%i8>SV8i`4rNRMxO&H zIa$;&5#Z{I(d|sDLI_lyCw<~>}0 zZ}dZenv(_)H;rBbs5p5U!IK_50yYUD5JI40{pYInCo}$UHLO3BSl`Zg3^3zlK_K?f z%skYcTmlO3j9viPfKOxatKsD723%A}t$(`%CVs-HmeJp~j`S>o$pC49A00T`GFm2` z?A#Aa9T-rzem%d^G3&48SE^axO02(?*Cf`rbbyo`iZCM3&G-O%z-V5hpr=aKuNGnO z9cI58{riNINZ(?@_0TL%Ff++=4S@)Wg>BPywoV5cn?5jE1 z4h(bL1XYBaBXF*@eNB{r;07*qoM6N<$f-w*5O#lD@ diff --git a/src/main/java/com/zhiyun/zhiyun03/client/images/directory/7.jpg b/src/main/java/com/zhiyun/zhiyun03/client/images/directory/7.jpg deleted file mode 100644 index c4bf0626e2cec37bf2ea23b218db4a1ba2766711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410 zcmV;L0cHM)P)40%#}pQVs30Ql*tn=*XCQYLA}JI* zE&Tcef+>s^$Hq$h182q}v&*`PFHG}r-^|Q2(<`Nzo|y6+UgIo!_>QHv3G35bn32Zd zQ7mHt-|#i2e0-Xn^Y1)BY@5)V%HGD5-(wBOw%rjI@z~b6gF#Gr$N$9N7;GaBDmy7; zR=kb*nDV)C5L4cbRXk~%kjHs%n^uRoTj4*rg->l0PET`N#47K{I`-mB+k}s^%tVYS zpT|5p{KRGK!b2R!PJC#a@MHjrxx`)oefui8bx5v;UL7%HXckGj$ybvH{X z#;ZT-*7~FF^GvqXA9baaBE*!R;s+LD$_MMQ7jY7YV#>=k+hg-LZN!vc1YE&0jPD4; zde1MoU$awKtZiQiSiv>C!OIF=#Q~harJB9Nb6m&0zcNaU)Cge#TL1t607*qoM6N<$ Ef|f?Uod5s; 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 471f185..85ea672 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/controller/CourseController.java @@ -2,8 +2,10 @@ package com.zhiyun.zhiyun03.course.controller; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.service.CourseService; import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.utils.common.JsonResult; @@ -17,6 +19,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; import java.io.FileOutputStream; +import java.nio.file.DirectoryStream; +import java.util.List; /** @@ -34,8 +38,6 @@ public class CourseController { private CourseService courseService; - private String path = ""; - /** * 查询分页课程信息 */ @@ -69,7 +71,6 @@ public class CourseController { @ApiOperation("课程添加") @GetMapping("/addCourse") public JsonResult addCourse(CourseVo courseVo){ - courseVo.setCourseIcon(path); int count = courseService.addCourse(courseVo); @@ -98,6 +99,25 @@ public class CourseController { } + /** + * 课程添加 + */ + @ApiOperation("目录添加") + @GetMapping("/addCourseDirectory") + public JsonResult addCourseDirectory(Directory directory){ + courseService.addCourseDirectory(directory); + + return JsonResult.success(); + } + + + @ApiOperation("查询目录") + @GetMapping("/queryCourseDirectory") + public JsonResult queryCourseDirectory(){ + List directory = courseService.queryCourseDirectory(); + + return JsonResult.success(directory); + } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/entity/Course.java b/src/main/java/com/zhiyun/zhiyun03/course/entity/Course.java index fef4d32..96108a7 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/entity/Course.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/entity/Course.java @@ -1,6 +1,7 @@ package com.zhiyun.zhiyun03.course.entity; import java.io.Serializable; +import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -58,6 +59,22 @@ public class Course implements Serializable { @TableField(value = "course_icon") private String courseIcon; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @TableField(value = "course_addtime") + private Date courseAddtime; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + @TableField(value = "course_updatetime") + private Date courseUpdatetime; + + + private static final long serialVersionUID = 1L; 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 ad42f6d..63da2f9 100644 --- a/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java +++ b/src/main/java/com/zhiyun/zhiyun03/course/service/CourseService.java @@ -1,8 +1,10 @@ package com.zhiyun.zhiyun03.course.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.RequestParam; @@ -35,4 +37,8 @@ public interface CourseService extends IService { * 根据ID查询课程 */ CourseVo queryCourseById(Integer id); + + void addCourseDirectory(Directory directory); + + List queryCourseDirectory(); } 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 47440cc..182e62b 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 @@ -1,21 +1,27 @@ package com.zhiyun.zhiyun03.course.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.course.entity.Course; import com.zhiyun.zhiyun03.course.service.CourseService; import com.zhiyun.zhiyun03.course.vo.CourseVo; import com.zhiyun.zhiyun03.course.mapper.CourseMapper; +import com.zhiyun.zhiyun03.utils.common.ResultCode; import com.zhiyun.zhiyun03.utils.exception.ServiceException; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Date; import java.util.List; +import java.util.UUID; /** * 服务层 @@ -87,12 +93,13 @@ public class CourseServiceImpl extends ServiceImpl implemen throw new ServiceException("403","归属目录不能为空"); } //查询目录id，并赋值给course - Integer id = directoryMapper.selectByName(dirName); + Integer id = directoryMapper.selectByName(dirName,"3"); if (id==null) { throw new ServiceException("403","归属目录不存在"); } course.setDirId(id); + course.setCourseAddtime(new Date()); //课程插入 int count = courseMapper.insert(course); @@ -137,7 +144,7 @@ public class CourseServiceImpl extends ServiceImpl implemen throw new ServiceException("403","归属目录不能为空"); } //查询目录id，并赋值给course - Integer id = directoryMapper.selectByName(dirName); + Integer id = directoryMapper.selectByName(dirName,"3"); if (id==null) { throw new ServiceException("403","归属目录不存在"); @@ -173,5 +180,38 @@ public class CourseServiceImpl extends ServiceImpl implemen return courseVo; } + @Override + public void addCourseDirectory(Directory directory) { + if (directory.getDirName().isEmpty()) + { + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()) + { + throw new ServiceException("400","请选择一个icon"); + } + directory.setDirIden("3"); + Integer integer = directoryMapper.selectByName(directory.getDirName(),"3"); + if (integer!=null) + { + throw new ServiceException("400","目录已存在"); + } + + int uuid= UUID.randomUUID().hashCode(); + if(uuid<0){ + uuid=-uuid; + } + directory.setDirAddtime(new Date()); + directory.setId(uuid); + directoryMapper.addCourseDirectory(directory); + } + + @Override + public List queryCourseDirectory() { + + List directoryList = directoryMapper.queryCourseDirectory(); + return directoryList; + } + } diff --git a/src/main/java/com/zhiyun/zhiyun03/course/vo/DirectoryVo.java b/src/main/java/com/zhiyun/zhiyun03/course/vo/DirectoryVo.java new file mode 100644 index 0000000..1926534 --- /dev/null +++ b/src/main/java/com/zhiyun/zhiyun03/course/vo/DirectoryVo.java @@ -0,0 +1,22 @@ +package com.zhiyun.zhiyun03.course.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +@Data +public class DirectoryVo { + + /** + * id + */ + @TableId(value ="id") + private Integer id; + + /** + * 目录名称 + */ + @TableField(value = "dir_name") + private String dirName; + +} 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 21a97ae..89fe6b7 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/controller/DownloadController.java @@ -1,5 +1,7 @@ package com.zhiyun.zhiyun03.download.controller; +import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.service.DownloadService; import com.zhiyun.zhiyun03.download.vo.DownloadVo; @@ -13,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; import java.io.FileOutputStream; +import java.util.List; @RestController @RequestMapping("/download") @@ -26,8 +29,6 @@ public class DownloadController { private DownloadService downloadService; - - @ApiOperation("查询下载中心") @GetMapping("/queryDownload") public JsonResult> queryDownload(@ApiParam @RequestParam(value = "page",required = false,defaultValue = "1")Integer page, @@ -104,4 +105,27 @@ public class DownloadController { + /** + * 课程添加 + */ + @ApiOperation("目录添加") + @GetMapping("/addDownloadDirectory") + public JsonResult addDownloadDirectory(Directory directory){ + downloadService.addDownloadDirectory(directory); + + return JsonResult.success(); + } + + + @ApiOperation("查询目录") + @GetMapping("/queryDownloadDirectory") + public JsonResult queryDownloadDirectory(){ + List directory = downloadService.queryDownloadDirectory(); + + return JsonResult.success(directory); + } + + + + } 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 18cba85..8c830e3 100644 --- a/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java +++ b/src/main/java/com/zhiyun/zhiyun03/download/service/DownloadService.java @@ -1,10 +1,14 @@ package com.zhiyun.zhiyun03.download.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.entity.Download; import com.zhiyun.zhiyun03.download.vo.DownloadVo; +import java.util.List; + public interface DownloadService extends IService { /* * 查询下载中心 @@ -20,4 +24,8 @@ public interface DownloadService extends IService { DownloadVo queryById(Integer id); int updateDownload(DownloadVo vo); + + void addDownloadDirectory(Directory directory); + + List queryDownloadDirectory(); } 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 c90e1e0..d5450ae 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 @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.entity.Download; import com.zhiyun.zhiyun03.download.mapper.DownloadMapper; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.UUID; @Service public class DownloadServiceImpl extends ServiceImpl implements DownloadService { @@ -36,7 +38,7 @@ public class DownloadServiceImpl extends ServiceImpl i //开启分页 PageHelper.startPage(page,limit); //查询所有下载数据 - List downloadVoList = downloadMapper.queryDownload(); + List downloadVoList = downloadMapper.queryDownload(); PageInfo downloadVoPageInfo = new PageInfo<>(downloadVoList); PageVO downloadVoPageVO = new PageVO<>(); @@ -65,7 +67,10 @@ public class DownloadServiceImpl extends ServiceImpl i Download download = new Download(); BeanUtils.copyProperties(vo,download); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"5"); + if (dirId==null){ + throw new ServiceException("400","目录不存在"); + } download.setDirId(dirId); download.setDownloadUpdatetime(new Date()); //添加download @@ -120,18 +125,16 @@ public class DownloadServiceImpl extends ServiceImpl i * */ @Override public int updateDownload(DownloadVo vo) { - //查询更新的下载名是否存在 - int sum = downloadMapper.selectByName(vo.getDownloadName()); - if (sum>0) + /*条件判断*/ + if (vo.getDownloadName().isEmpty()) { - throw new ServiceException("403","下载已存在"); + throw new ServiceException("400","下载名不能为空失败"); } - //将vo值传给download Download download = new Download(); BeanUtils.copyProperties(vo,download); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"5"); download.setDirId(dirId); download.setDownloadUpdatetime(new Date()); //添加download @@ -145,5 +148,37 @@ public class DownloadServiceImpl extends ServiceImpl i } } + @Override + public void addDownloadDirectory(Directory directory) { + if (directory.getDirName().isEmpty()) + { + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()) + { + throw new ServiceException("400","请选择一个icon"); + } + + Integer count = directoryMapper.selectByName(directory.getDirName(),"5"); + if (count!=null) + { + throw new ServiceException("400","目录已存在"); + } + + int uuid= UUID.randomUUID().hashCode(); + if(uuid<0){ + uuid=-uuid; + } + directory.setDirAddtime(new Date()); + directory.setId(uuid); + directoryMapper.addDownloadDirectory(directory); + } + + @Override + public List queryDownloadDirectory() { + List directoryList = directoryMapper.queryDownloadDirectory(); + return directoryList; + } + } 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 add558f..2028876 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/controller/InviteController.java @@ -1,7 +1,9 @@ package com.zhiyun.zhiyun03.invite.controller; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.service.CourseService; import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.invite.service.InviteService; import com.zhiyun.zhiyun03.invite.vo.InviteVo; @@ -13,6 +15,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; @Api("就业") @RestController @@ -63,4 +66,26 @@ public class InviteController { } + /** + * 课程添加 + */ + @ApiOperation("目录添加") + @GetMapping("/addInviteDirectory") + public JsonResult addInviteDirectory(Directory directory){ + inviteService.addInviteDirectory(directory); + + return JsonResult.success(); + } + + + + @ApiOperation("查询目录") + @GetMapping("/queryInviteDirectory") + public JsonResult queryInviteDirectory(){ + List directory = inviteService.queryInviteDirectory(); + + return JsonResult.success(directory); + } + + } diff --git a/src/main/java/com/zhiyun/zhiyun03/invite/entity/Invite.java b/src/main/java/com/zhiyun/zhiyun03/invite/entity/Invite.java index 0c63aaf..59bd355 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/entity/Invite.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/entity/Invite.java @@ -47,11 +47,7 @@ public class Invite { @TableField(value = "dir_id") private Integer dirId; - /** - * 招聘图片 - */ - @TableField(value = "invite_img") - private String inviteImg; + /** * 添加时间 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 6734f3d..72a153e 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/service/InviteService.java @@ -1,10 +1,14 @@ package com.zhiyun.zhiyun03.invite.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.invite.entity.Invite; import com.zhiyun.zhiyun03.invite.vo.InviteVo; +import java.util.List; + public interface InviteService extends IService { PageVO queryInvite(Integer page, Integer limit); @@ -15,4 +19,8 @@ public interface InviteService extends IService { int delInviteById(Integer id); int updateById(InviteVo vo); + + void addInviteDirectory(Directory directory); + + List queryInviteDirectory(); } 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 2432de9..764ac9b 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 @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.entity.Download; import com.zhiyun.zhiyun03.download.vo.DownloadVo; @@ -21,6 +22,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.UUID; @Service public class InviteServieImpl extends ServiceImpl implements InviteService { @@ -87,7 +89,10 @@ public class InviteServieImpl extends ServiceImpl implemen Invite invite = new Invite(); BeanUtils.copyProperties(vo,invite); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"7"); + if (dirId==null){ + throw new ServiceException("400","目录不存在"); + } invite.setDirId(dirId); invite.setInviteUpdatetime(new Date()); //添加download @@ -139,7 +144,7 @@ public class InviteServieImpl extends ServiceImpl implemen Invite invite = new Invite(); BeanUtils.copyProperties(vo,invite); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"7"); invite.setDirId(dirId); invite.setInviteUpdatetime(new Date()); //添加download @@ -153,5 +158,39 @@ public class InviteServieImpl extends ServiceImpl implemen } } + @Override + public void addInviteDirectory(Directory directory) { + if (directory.getDirName().isEmpty()) + { + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()) + { + throw new ServiceException("400","请选择一个icon"); + } + + Integer count = directoryMapper.selectByName(directory.getDirName(),"7"); + if (count!=null) + { + throw new ServiceException("400","目录已存在"); + } + + int uuid= UUID.randomUUID().hashCode(); + if(uuid<0){ + uuid=-uuid; + } + directory.setDirAddtime(new Date()); + directory.setId(uuid); + directoryMapper.addInviteDirectory(directory); + } + + @Override + public List queryInviteDirectory() { + + List directoryList = directoryMapper.queryInviteDirectory(); + return directoryList; + + } + } 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 631b44e..7486489 100644 --- a/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java +++ b/src/main/java/com/zhiyun/zhiyun03/invite/vo/InviteVo.java @@ -24,9 +24,6 @@ public class InviteVo { * 归属目录 */ private String dirName; -// /** -// * 招聘图片 -// */ -// private String inviteImg; + } 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 62fe7e2..1e2ecc1 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/controller/ServeController.java @@ -1,6 +1,8 @@ package com.zhiyun.zhiyun03.serve.controller; +import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.download.service.DownloadService; import com.zhiyun.zhiyun03.download.vo.DownloadVo; @@ -17,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; import java.io.FileOutputStream; +import java.util.List; @Api("服务相关") @RestController @@ -105,5 +108,24 @@ public class ServeController { return JsonResult.success(); } + /** + * 课程添加 + */ + @ApiOperation("目录添加") + @GetMapping("/addServiceDirectory") + public JsonResult addServiceDirectory(Directory directory){ + serveService.addServiceDirectory(directory); + + return JsonResult.success(); + } + + + @ApiOperation("查询目录") + @GetMapping("/queryServiceDirectory") + public JsonResult queryServiceDirectory(){ + List directory = serveService.queryServiceDirectory(); + + return JsonResult.success(directory); + } } \ 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 3216d24..60a97e2 100644 --- a/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java +++ b/src/main/java/com/zhiyun/zhiyun03/serve/service/ServeService.java @@ -1,10 +1,14 @@ package com.zhiyun.zhiyun03.serve.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhiyun.zhiyun03.application.entity.Directory; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.serve.entity.Serve; import com.zhiyun.zhiyun03.serve.vo.ServeVo; +import java.util.List; + public interface ServeService extends IService { PageVO queryServe(Integer page, Integer limit); @@ -15,4 +19,8 @@ public interface ServeService extends IService { ServeVo queryById(Integer id); int updateServe(ServeVo vo); + + void addServiceDirectory(Directory directory); + + List queryServiceDirectory(); } 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 f4c1496..5f3b819 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 @@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.zhiyun.zhiyun03.application.entity.Directory; import com.zhiyun.zhiyun03.application.mapper.DirectoryMapper; import com.zhiyun.zhiyun03.course.vo.CourseVo; +import com.zhiyun.zhiyun03.course.vo.DirectoryVo; import com.zhiyun.zhiyun03.course.vo.PageVO; import com.zhiyun.zhiyun03.invite.entity.Invite; import com.zhiyun.zhiyun03.invite.vo.InviteVo; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.UUID; @Service public class ServeServiceImpl extends ServiceImpl implements ServeService { @@ -43,7 +45,7 @@ public class ServeServiceImpl extends ServiceImpl implements List serveVoList = serveMapper.queryService(); if (serveVoList.isEmpty()) { - throw new ServiceException("400","课程数据为空"); + throw new ServiceException("400","服务数据为空"); } PageInfo pageInfo = new PageInfo(serveVoList); PageVO serveVoPageVO = new PageVO<>(); @@ -73,7 +75,11 @@ public class ServeServiceImpl extends ServiceImpl implements Serve serve = new Serve(); BeanUtils.copyProperties(vo,serve); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"9"); + if (dirId == null) + { + throw new ServiceException("402","目录不存在"); + } serve.setDirId(dirId); serve.setServeUpdatetime(new Date()); //添加download @@ -121,16 +127,16 @@ public class ServeServiceImpl extends ServiceImpl implements @Override public int updateServe(ServeVo vo) { //查询更新的下载名是否存在 - int sum = serveMapper.selectByName(vo.getServeName()); - if (sum>0) + if (vo.getServeName().isEmpty()) { - throw new ServiceException("403","下载已存在"); + throw new ServiceException("400","服务名不能为空"); } + //将vo值传给download Serve serve = new Serve(); BeanUtils.copyProperties(vo,serve); //查询归属目录id - Integer dirId = directoryMapper.selectByName(vo.getDirName()); + Integer dirId = directoryMapper.selectByName(vo.getDirName(),"9"); serve.setDirId(dirId); serve.setServeUpdatetime(new Date()); //添加download @@ -143,4 +149,36 @@ public class ServeServiceImpl extends ServiceImpl implements throw new ServiceException("400","更新失败"); } } + + @Override + public void addServiceDirectory(Directory directory) { + if (directory.getDirName().isEmpty()) + { + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()) + { + throw new ServiceException("400","请选择一个icon"); + } + + Integer count = directoryMapper.selectByName(directory.getDirName(),"9"); + if (count!=null) + { + throw new ServiceException("400","目录已存在"); + } + + int uuid= UUID.randomUUID().hashCode(); + if(uuid<0){ + uuid=-uuid; + } + directory.setDirAddtime(new Date()); + directory.setId(uuid); + directoryMapper.addServiceDirectory(directory); + } + + @Override + public List queryServiceDirectory() { + List directoryList = directoryMapper.queryServiceDirectory(); + return directoryList; + } } diff --git a/src/main/resources/0.png b/src/main/resources/0.png deleted file mode 100644 index cfacd301f1f21177253270814a2578fbff89db3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15347 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 RsjL71002ovPDHLkV1oB00R{j7 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e3c5ca5..6cee5ca 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -19,7 +19,7 @@ spring: druid: url: jdbc:mysql://localhost:3306/zhiyun?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai username: root - password: 123456 + password: root diff --git a/src/main/resources/mapper/CourseMapper.xml b/src/main/resources/mapper/CourseMapper.xml index 36371ae..4f2299f 100644 --- a/src/main/resources/mapper/CourseMapper.xml +++ b/src/main/resources/mapper/CourseMapper.xml @@ -41,8 +41,9 @@ c.course_updatetime from course as c inner join - (select * from directory) as d + (select id,dir_name,dir_img,dir_addtime,dir_iden from directory) as d on c.dir_id = d.id + WHERE d.dir_iden = 3 - select id from directory where dir_name =#{dirName} + select id from directory where dir_name =#{dirName} and dir_iden = #{dirIden} + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/DownloadMapper.xml b/src/main/resources/mapper/DownloadMapper.xml index 9d8e553..4c9f392 100644 --- a/src/main/resources/mapper/DownloadMapper.xml +++ b/src/main/resources/mapper/DownloadMapper.xml @@ -34,8 +34,9 @@ select do.id,do.download_name,do.download_brief,do.download_url,d.dir_name from download as do inner join - (select id,dir_name from directory) as d + (select id,dir_name,dir_img,dir_addtime,dir_iden from directory) as d on do.dir_id = d.id + where d.dir_iden = 5 select i.id,i.invite_name,i.invite_brief,i.invite_url,d.dir_name from invite as i inner join - (select id,dir_name from directory) as d + (select id,dir_name,dir_img,dir_addtime,dir_iden from directory) as d on i.dir_id = d.id + where d.dir_iden = 7 选择icon

-
- 图片1 - 图片1 - 图片1 +
+ 图片1 + 图片1 + 图片1 + 图片1 + 图片1 + 图片1 + 图片1 + 图片1 + 图片1
-
-
@@ -319,12 +334,11 @@ , btn2: function (index, layero) { // alert("取消") } - }); layui.use(['form'], function () { var form = layui.form; $.ajax({ - url: 'http://localhost:8080/application/queryDir', + url: 'http://localhost:8080/api/course/queryCourseDirectory', type: "get", success: function (data) { if (data.msg === "success") { @@ -345,10 +359,19 @@ layer.closeAll(); }); } - } }); }); + layui.use(['carousel', 'form'], function(){ + var carousel = layui.carousel + ,form = layui.form; + + //常规轮播 + carousel.render({ + elem: '#test1' + ,arrow: 'always' + }); + }); } diff --git a/src/main/resources/templates/layui-v2.6.8/downloadList.html b/src/main/resources/templates/layui-v2.6.8/downloadList.html index bfdaf0b..4a2349f 100644 --- a/src/main/resources/templates/layui-v2.6.8/downloadList.html +++ b/src/main/resources/templates/layui-v2.6.8/downloadList.html @@ -149,7 +149,7 @@ layui.use(['form'], function () { var form = layui.form; $.ajax({ - url: 'http://localhost:8080/application/queryDir', + url: 'http://localhost:8080/download/queryDownloadDirectory', type: "get", success: function (data) { if (data.msg === "success") { @@ -263,7 +263,7 @@ btn: ['提交', '取消'] , yes: function (index, layero) { //修改操作 - $.get("http://localhost:8080/application/addDirectory", $("#addDirectory").serialize(), + $.get("http://localhost:8080/download/addDownloadDirectory", $("#addDirectory").serialize(), function (data) { if ("success" == data.msg) { layer.msg(data.msg); @@ -343,7 +343,7 @@ layui.use(['form'], function() { var form = layui.form; $.ajax({ - url: 'http://localhost:8080/application/queryDir', + url: 'http://localhost:8080/download/queryDownloadDirectory', type:"get", success: function(data) { if(data.msg === "success"){ diff --git a/src/main/resources/templates/layui-v2.6.8/inviteList.html b/src/main/resources/templates/layui-v2.6.8/inviteList.html index 4f8e123..69b49b5 100644 --- a/src/main/resources/templates/layui-v2.6.8/inviteList.html +++ b/src/main/resources/templates/layui-v2.6.8/inviteList.html @@ -104,144 +104,111 @@ });