From 359af69fbdbcce5ba99028b563496a5675a3744c Mon Sep 17 00:00:00 2001 From: cccccyb <995134776@qq.com> Date: Sat, 13 May 2023 16:10:24 +0800 Subject: [PATCH] use pinia to modify notice add,delete,select function --- .../service/impl/NoticeServiceImpl.java | 9 +- ui/src/components/notice/CommitForm.vue | 24 +++-- ui/src/components/notice/NoticeHead.vue | 55 ++--------- .../components/notice/NoticeManageTable.vue | 47 +++++----- ui/src/components/notice/NoticeShowDialog.vue | 32 ++++--- ui/src/components/notice/NoticeViewTable.vue | 63 +++++++------ ui/src/pages/notice/NoticeManage.vue | 69 ++++---------- ui/src/pages/notice/NoticeView.vue | 2 - ui/src/store/notice-manage.ts | 22 ----- ui/src/store/notice-view.ts | 22 ----- ui/src/store/notice.ts | 93 +++++++++++++++++++ 11 files changed, 218 insertions(+), 220 deletions(-) delete mode 100644 ui/src/store/notice-manage.ts delete mode 100644 ui/src/store/notice-view.ts create mode 100644 ui/src/store/notice.ts diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java index 4249abf..1f3e05b 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java @@ -105,12 +105,8 @@ public class NoticeServiceImpl extends ServiceImpl impleme public Boolean deleteById(Long nid) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(NoticeReceive::getNoticeId, nid); - List noticeReceives = noticeReceiveMapper.selectList(lqw); - for (NoticeReceive nrc : - noticeReceives) { - noticeReceiveMapper.deleteById(nrc.getId()); - } - return noticeMapper.deleteById(nid) > 0; + Boolean flag = noticeReceiveMapper.delete(lqw)>0; + return flag&&(noticeMapper.deleteById(nid) > 0); } @Override @@ -118,7 +114,6 @@ public class NoticeServiceImpl extends ServiceImpl impleme noticeMapper.update(null, new UpdateWrapper().eq("id", notice.getId()).set("old", 1)); //修改原始数据 notice.setOriginId(notice.getId()); notice.setId(null); //清除id,使新插入的数据id重新生成 - notice.setCreateTime(null); notice.setModifyTime(null); notice.setOld(0); return noticeMapper.insert(notice) > 0; diff --git a/ui/src/components/notice/CommitForm.vue b/ui/src/components/notice/CommitForm.vue index b03fd75..f4b9aba 100644 --- a/ui/src/components/notice/CommitForm.vue +++ b/ui/src/components/notice/CommitForm.vue @@ -79,17 +79,22 @@ - 发布 + 发布 + 取消 重置 diff --git a/ui/src/components/notice/NoticeManageTable.vue b/ui/src/components/notice/NoticeManageTable.vue index c4b296e..ba57b8c 100644 --- a/ui/src/components/notice/NoticeManageTable.vue +++ b/ui/src/components/notice/NoticeManageTable.vue @@ -64,7 +64,7 @@ prop="sender.username" label="发布人" width="100" - column-key="senderName" + column-key="sender.username" :filters="filterSenderName" :filter-method="filterTag" filter-placement="bottom-end" @@ -85,7 +85,7 @@ 编辑 - 删除 @@ -108,25 +108,29 @@ - + - + diff --git a/ui/src/pages/notice/NoticeManage.vue b/ui/src/pages/notice/NoticeManage.vue index a754ea0..af07e9d 100644 --- a/ui/src/pages/notice/NoticeManage.vue +++ b/ui/src/pages/notice/NoticeManage.vue @@ -15,17 +15,11 @@ - + @@ -38,21 +32,21 @@ import { ElMessage, ElMessageBox } from 'element-plus' import 'element-plus/theme-chalk/el-message.css' import 'element-plus/theme-chalk/el-message-box.css' import request from '@/services' +import { useNoticeStore } from '@/store/notice' +import { mapState } from 'pinia' +const noticeStore = useNoticeStore() export default { name: 'NoticeHome', data() { return { - noticeTypeList: [], - dialogAddVisible: false, - dialogUpdateVisible: false, - departmentList: [] + dialogUpdateVisible: false } }, methods: { selectByCond(search) { request - .get('http://localhost:8621/notice', { + .get('/notice', { title: search.title, type: search.type, startTime: search.startTime, @@ -60,7 +54,7 @@ export default { }) .then((response) => { if (response.data.code === 20021) { - // this.selectData = response.data.data + noticeStore.selectData = response.data.data ElMessage({ message: '查询成功.', type: 'success' @@ -73,20 +67,20 @@ export default { } }) }, - handleDelete(deleteID) { + handleDeleteById(deleteID) { ElMessageBox.confirm('确定是否要删除?该操作将无法回退', '警告', { confirmButtonText: '确定', cancelButtonText: '我再想想', type: 'warning' }) .then(() => { - request.delete('http://localhost:8621/notice/' + deleteID).then((response) => { + request.delete('/notice/' + deleteID).then((response) => { if (response.data.code === 20024) { - this.dialogAddVisible = false ElMessage({ message: '删除成功.', type: 'success' }) + noticeStore.selectAllNotice() } else if (response.data.code === 20034) { ElMessage({ message: response.data.msg, @@ -94,44 +88,16 @@ export default { }) } }) - this.$router.go(0) }) .catch(() => {}) }, - selectNoticeType() { - request.get('http://localhost:8621/noticeType').then((response) => { - this.noticeTypeList = response.data.data - }) - }, - selectDepartment() { - request.get('http://localhost:8621/department').then((response) => { - this.departmentList = response.data.data - }) - }, openAddNoticeDialog() { - this.dialogAddVisible = true - this.selectNoticeType() - this.selectDepartment() - }, - handleAddNotice(addFormData) { - request.post('http://localhost:8621/notice', addFormData).then((response) => { - if (response.data.code === 20022) { - this.dialogAddVisible = false - ElMessage({ - message: '发布成功.', - type: 'success' - }) - } else if (response.data.code === 20032) { - ElMessage({ - message: response.data.msg, - type: 'error' - }) - } + noticeStore.$patch((state) => { + state.dialogAddVisible = true }) - this.$router.go(0) }, handleUpdateNotice(updateNotice) { - request.put('http://localhost:8621/notice', updateNotice).then((response) => { + request.put('/notice', updateNotice).then((response) => { if (response.data.code === 20023) { this.dialogUpdateVisible = false ElMessage({ @@ -153,7 +119,12 @@ export default { this.$router.go(0) } }, - mounted() {} + mounted() { + noticeStore.selectNoticeType() + }, + computed: { + ...mapState(useNoticeStore, ['dialogAddVisible']) + } } diff --git a/ui/src/pages/notice/NoticeView.vue b/ui/src/pages/notice/NoticeView.vue index 9572f5a..05b3a66 100644 --- a/ui/src/pages/notice/NoticeView.vue +++ b/ui/src/pages/notice/NoticeView.vue @@ -20,8 +20,6 @@