wanghaobo
/
zhiyun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/main/resources/templates/layui-v2.6.8/index.html
main
@t2652009480 2 years ago
parent fdef4e5429 bde8f15d63
commit 9ed9c64bf5
3 changed files with 63 additions and 67 deletions
Show Stats Download Patch File Download Diff File

93
src/main/java/com/zhiyun/zhiyun03/invite/service/impl/InviteServieImpl.java
Unescape Escape View File

@ -39,12 +39,11 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
@Override
public PageVO<InviteVo> queryInvite(Integer page, Integer limit) {
PageHelper.startPage(page,limit);
PageHelper.startPage(page, limit);
//查询所有课程
List<InviteVo> inviteVoList = inviteMapper.queryInvite();
if (inviteVoList.isEmpty())
{
throw new ServiceException("400","课程数据为空");
if (inviteVoList.isEmpty()) {
throw new ServiceException("400", "课程数据为空");
}
PageInfo<InviteVo> pageInfo = new PageInfo<InviteVo>(inviteVoList);
PageVO<InviteVo> inviteVoPageVO = new PageVO<>();
@ -58,6 +57,7 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
return inviteVoPageVO;
}
/*
* 根据id查询就业
* */
@ -69,7 +69,7 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
Directory directory = directoryMapper.selectById(invite.getDirId());
InviteVo inviteVo = new InviteVo();
//复制给vo
BeanUtils.copyProperties(invite,inviteVo);
BeanUtils.copyProperties(invite, inviteVo);
inviteVo.setDirName(directory.getDirName());
return inviteVo;
}
@ -80,56 +80,48 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
@Override
public int addInvite(InviteVo vo) {
/*判断目录名是否为空*/
if (vo.getInviteName().isEmpty())
{
throw new ServiceException("400","就业名不能为空");
if (vo.getInviteName().isEmpty()) {
throw new ServiceException("400", "就业名不能为空");
}
//查询就业名称是否已经存在
int count = inviteMapper.selectByName(vo.getInviteName());
if (count>0)
{
throw new ServiceException("403","就业名已存在");
if (count > 0) {
throw new ServiceException("403", "就业名已存在");
}
//将vo值传给就业
Invite invite = new Invite();
BeanUtils.copyProperties(vo,invite);
BeanUtils.copyProperties(vo, invite);
//查询归属目录id
Integer dirId = directoryMapper.selectByName(vo.getDirName(),"8");
if (dirId==null){
throw new ServiceException("400","目录不存在");
Integer dirId = directoryMapper.selectByName(vo.getDirName(), "8");
if (dirId == null) {
throw new ServiceException("400", "目录不存在");
}
invite.setDirId(dirId);
invite.setInviteUpdatetime(new Date());
//添加就业
int insert = inviteMapper.insert(invite);
if (insert>0)
{
if (insert > 0) {
return insert;
}else
{
throw new ServiceException("400","添加就业失败");
} else {
throw new ServiceException("400", "添加就业失败");
}
}
/*
* 根据id删除数据
* */
@Override
public int delInviteById(Integer id) {
if (id == null)
{
throw new ServiceException("400","查询id值为空");
if (id == null) {
throw new ServiceException("400", "查询id值为空");
}
//根据id删除
int count = inviteMapper.deleteById(id);
if (count>0)
{
if (count > 0) {
return count;
}else
{
throw new ServiceException("400","删除失败");
} else {
throw new ServiceException("400", "删除失败");
}
}
@ -147,48 +139,45 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
//将vo值传给download
Invite invite = new Invite();
BeanUtils.copyProperties(vo,invite);
BeanUtils.copyProperties(vo, invite);
//查询归属目录id
Integer dirId = directoryMapper.selectByName(vo.getDirName(),"8");
Integer dirId = directoryMapper.selectByName(vo.getDirName(), "8");
invite.setDirId(dirId);
invite.setInviteUpdatetime(new Date());
//添加download
int updated = inviteMapper.updateDownloadById(invite);
if (updated>0)
{
if (updated > 0) {
return updated;
}else
{
throw new ServiceException("400","更新失败");
} else {
throw new ServiceException("400", "更新失败");
}
}
/*添加目录*/
/*添加目录*/
@Override
public void addInviteDirectory(Directory directory) {
if (directory.getDirName().isEmpty())
{
throw new ServiceException("400","目录名称不能为空");
if (directory.getDirName().isEmpty()) {
throw new ServiceException("400", "目录名称不能为空");
}
if (directory.getDirImg().isEmpty())
{
throw new ServiceException("400","请选择一个icon");
if (directory.getDirImg().isEmpty()) {
throw new ServiceException("400", "请选择一个icon");
}
Integer count = directoryMapper.selectByName(directory.getDirName(),"8");
if (count!=null)
{
throw new ServiceException("400","目录已存在");
Integer count = directoryMapper.selectByName(directory.getDirName(), "8");
if (count != null) {
throw new ServiceException("400", "目录已存在");
}
int uuid= UUID.randomUUID().hashCode();
if(uuid<0){
uuid=-uuid;
int uuid = UUID.randomUUID().hashCode();
if (uuid < 0) {
uuid = -uuid;
}
directory.setDirAddtime(new Date());
directory.setId(uuid);
directoryMapper.addInviteDirectory(directory);
}
/*查询目录*/
/*查询目录*/
@Override
public List<DirectoryVo> queryInviteDirectory() {
@ -196,6 +185,4 @@ public class InviteServieImpl extends ServiceImpl<InviteMapper, Invite> implemen
return directoryList;
}
}

20
src/main/resources/templates/layui-v2.6.8/inviteList.html
Unescape Escape View File

@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="layui/css/layui.css" tppabs="//res.ilayuis.com/layui/dist/css/layui.css" media="all">
<!-- 注意：如果你直接复制所有代码到本地，上述css路径需要改成你本地的 -->
<style>
.select-img-wrap {
width: calc(100% - 40px);
@ -47,9 +47,7 @@
}
</style>
</head>
<body>
<table class="layui-hide" id="test" lay-filter="test"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@ -61,7 +59,7 @@
<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<script src="layui/layui.js" charset="utf-8"></script>
<!--<script src="layui/layui.js" charset="utf-8"></script>-->
<!-- 注意：如果你直接复制所有代码到本地，上述 JS 路径需要改成你本地的 -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<link href="https://cdn.quilljs.com/1.0.0/quill.snow.css" rel="stylesheet">
@ -124,16 +122,16 @@
//获取要删除的服务的id
var deleteDownloadId = data.id
$.get("http://localhost:8080/api/invite/delInviteById", { "id": deleteDownloadId }, function (result) {
if (result.code == 200) {
if (result.code==200){
// 删除成功之后 弹出msg
layer.msg(result.msg)
layer.msg(result.msg);
// 重点：继续显示当前页
$(".layui-laypage-btn").click()
$(".layui-laypage-btn").click();
} else {
layer.msg(result.msg, { icon: 2 })
layer.close(index)
layer.msg(result.msg, {icon: 2});
layer.close(index);
}
})
});
})
} else if (obj.event === 'edit') {
@ -294,7 +292,6 @@
</div>
</form>
</script>
<script>
function addDir(data) {
var $ = layui.jquery
@ -513,7 +510,6 @@
})
}
</script>
<script type="text/html" id="addForm1">
<form class="layui-form" id="addInvite" lay-filter="addInviteForm">
<!-- 把id 作为隐藏域传过去 -->

13
src/main/resources/templates/layui-v2.6.8/password.html
Unescape Escape View File

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>
Write Preview
Loading…
Cancel
Save