From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/notice/dto/NoticeCollectDTO.java | 34
src/main/java/org/springblade/modules/notice/wrapper/NoticeCollectWrapper.java | 50 +
src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java | 76 ++
src/main/java/org/springblade/modules/notice/service/impl/NoticeLikeServiceImpl.java | 43 +
src/main/java/org/springblade/modules/notice/controller/NoticeCollectController.java | 126 +++
src/main/java/org/springblade/modules/notice/controller/NoticeLikeController.java | 126 +++
src/main/java/org/springblade/modules/notice/entity/NoticeEntity.java | 156 ++++
src/main/java/org/springblade/modules/notice/service/INoticeCollectService.java | 43 +
src/main/java/org/springblade/modules/notice/entity/NoticeCollectEntity.java | 76 ++
src/main/java/org/springblade/modules/notice/vo/NoticeCollectVO.java | 35 +
src/main/java/org/springblade/modules/notice/entity/NoticeCommentEntity.java | 143 ++++
src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.xml | 33
src/main/java/org/springblade/modules/notice/vo/NoticeCommentVO.java | 35 +
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 2
src/main/java/org/springblade/modules/notice/controller/NoticeCommentController.java | 126 +++
src/main/java/org/springblade/modules/notice/service/INoticeCommentService.java | 43 +
src/main/java/org/springblade/modules/notice/wrapper/NoticeCommentWrapper.java | 50 +
src/main/java/org/springblade/modules/notice/vo/NoticeVO.java | 35 +
src/main/java/org/springblade/modules/notice/wrapper/NoticeLikeWrapper.java | 50 +
src/main/java/org/springblade/modules/notice/controller/NoticesController.java | 125 +++
src/main/java/org/springblade/modules/notice/service/impl/NoticeCommentServiceImpl.java | 43 +
src/main/java/org/springblade/modules/notice/wrapper/NoticeWrapper.java | 50 +
src/main/java/org/springblade/modules/notice/dto/NoticeDTO.java | 34
src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.java | 43 +
src/main/java/org/springblade/modules/notice/service/INoticeLikeService.java | 43 +
src/main/java/org/springblade/modules/notice/service/impl/NoticesServiceImpl.java | 42 +
src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.xml | 19
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4
src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.java | 43 +
src/main/java/org/springblade/modules/notice/service/INoticesService.java | 43 +
src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.xml | 19
src/main/java/org/springblade/modules/notice/dto/NoticeCommentDTO.java | 34
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 55 +
src/main/java/org/springblade/modules/notice/vo/NoticeLikeVO.java | 35 +
src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.java | 43 +
src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.java | 43 +
src/main/java/org/springblade/modules/notice/dto/NoticeLikeDTO.java | 34
src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.xml | 23
src/main/java/org/springblade/modules/notice/service/impl/NoticeCollectServiceImpl.java | 43 +
39 files changed, 2,084 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 5352ef5..85d30c8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -127,7 +127,7 @@
/**
* 根据角色获取功能集合数据
- * @param type 1：查社区 2：查场所 3：查房屋
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index f9b6dd3..e2b5aca 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -75,7 +75,7 @@
/**
* 根据角色获取功能集合数据
- * @param type 1:查区域 2：查场所 3：查房屋
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
@@ -99,25 +99,54 @@
// 查询区域数据，当前只有西市街道数据
return townList;
}
- // 如果是场所负责人
- if (type==2){
- // 查询场所集合信息
- list = placeService.selectPlaceNodeList(AuthUtil.getUserId());
- // 返回
- return list;
- }
// 如果是居民
- if (type==3){
- // 查询房屋集合信息
- list = householdService.selectHouseNodeList(AuthUtil.getUserId());
- // 返回
- return list;
+ if (type==2){
+ return getInhabitantInfo(list);
}
}
return list;
}
/**
+ * 获取居民角色对应的房屋，场所信息
+ * @param list
+ * @return
+ */
+ private Object getInhabitantInfo(List<TreeNode> list) {
+ // 查询房屋集合信息
+ List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
+ // 查询场所集合信息
+ List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
+ if (houseNodeList.size()>0 && placeNodeList.size()>0){
+ // 合并
+ TreeNode houseNode = new TreeNode();
+ houseNode.setName("房屋");
+ houseNode.setId("1");
+ houseNode.setHasChildren(true);
+ houseNode.setChildren(houseNodeList);
+
+ TreeNode placeNode = new TreeNode();
+ placeNode.setName("场所");
+ placeNode.setId("2");
+ placeNode.setHasChildren(true);
+ placeNode.setChildren(placeNodeList);
+
+ list.add(houseNode);
+ list.add(placeNode);
+ // 返回
+ return list;
+ }
+ if (houseNodeList.size()>0){
+ list = houseNodeList;
+ }
+ if (placeNodeList.size()>0){
+ list = placeNodeList;
+ }
+ // 返回
+ return list;
+ }
+
+ /**
* 获取楼盘相关集合数据
* @param houseParam
* @return
diff --git a/src/main/java/org/springblade/modules/notice/controller/NoticeCollectController.java b/src/main/java/org/springblade/modules/notice/controller/NoticeCollectController.java
new file mode 100644
index 0000000..871654d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/controller/NoticeCollectController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.modules.notice.vo.NoticeCollectVO;
+import org.springblade.modules.notice.wrapper.NoticeCollectWrapper;
+import org.springblade.modules.notice.service.INoticeCollectService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 通知收藏表 控制器
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-noticeCollect/noticeCollect")
+@Api(value = "通知收藏表", tags = "通知收藏表接口")
+public class NoticeCollectController extends BladeController {
+
+ private final INoticeCollectService noticeCollectService;
+
+ /**
+ * 通知收藏表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入noticeCollect")
+ public R<NoticeCollectVO> detail(NoticeCollectEntity noticeCollect) {
+ NoticeCollectEntity detail = noticeCollectService.getOne(Condition.getQueryWrapper(noticeCollect));
+ return R.data(NoticeCollectWrapper.build().entityVO(detail));
+ }
+ /**
+ * 通知收藏表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入noticeCollect")
+ public R<IPage<NoticeCollectVO>> list(NoticeCollectEntity noticeCollect, Query query) {
+ IPage<NoticeCollectEntity> pages = noticeCollectService.page(Condition.getPage(query), Condition.getQueryWrapper(noticeCollect));
+ return R.data(NoticeCollectWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 通知收藏表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入noticeCollect")
+ public R<IPage<NoticeCollectVO>> page(NoticeCollectVO noticeCollect, Query query) {
+ IPage<NoticeCollectVO> pages = noticeCollectService.selectNoticeCollectPage(Condition.getPage(query), noticeCollect);
+ return R.data(pages);
+ }
+
+ /**
+ * 通知收藏表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入noticeCollect")
+ public R save(@Valid @RequestBody NoticeCollectEntity noticeCollect) {
+ return R.status(noticeCollectService.save(noticeCollect));
+ }
+
+ /**
+ * 通知收藏表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入noticeCollect")
+ public R update(@Valid @RequestBody NoticeCollectEntity noticeCollect) {
+ return R.status(noticeCollectService.updateById(noticeCollect));
+ }
+
+ /**
+ * 通知收藏表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入noticeCollect")
+ public R submit(@Valid @RequestBody NoticeCollectEntity noticeCollect) {
+ return R.status(noticeCollectService.saveOrUpdate(noticeCollect));
+ }
+
+ /**
+ * 通知收藏表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(noticeCollectService.removeByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/controller/NoticeCommentController.java b/src/main/java/org/springblade/modules/notice/controller/NoticeCommentController.java
new file mode 100644
index 0000000..f10aca4
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/controller/NoticeCommentController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.modules.notice.vo.NoticeCommentVO;
+import org.springblade.modules.notice.wrapper.NoticeCommentWrapper;
+import org.springblade.modules.notice.service.INoticeCommentService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 通知评论表 控制器
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-noticeComment/noticeComment")
+@Api(value = "通知评论表", tags = "通知评论表接口")
+public class NoticeCommentController extends BladeController {
+
+ private final INoticeCommentService noticeCommentService;
+
+ /**
+ * 通知评论表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入noticeComment")
+ public R<NoticeCommentVO> detail(NoticeCommentEntity noticeComment) {
+ NoticeCommentEntity detail = noticeCommentService.getOne(Condition.getQueryWrapper(noticeComment));
+ return R.data(NoticeCommentWrapper.build().entityVO(detail));
+ }
+ /**
+ * 通知评论表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入noticeComment")
+ public R<IPage<NoticeCommentVO>> list(NoticeCommentEntity noticeComment, Query query) {
+ IPage<NoticeCommentEntity> pages = noticeCommentService.page(Condition.getPage(query), Condition.getQueryWrapper(noticeComment));
+ return R.data(NoticeCommentWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 通知评论表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入noticeComment")
+ public R<IPage<NoticeCommentVO>> page(NoticeCommentVO noticeComment, Query query) {
+ IPage<NoticeCommentVO> pages = noticeCommentService.selectNoticeCommentPage(Condition.getPage(query), noticeComment);
+ return R.data(pages);
+ }
+
+ /**
+ * 通知评论表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入noticeComment")
+ public R save(@Valid @RequestBody NoticeCommentEntity noticeComment) {
+ return R.status(noticeCommentService.save(noticeComment));
+ }
+
+ /**
+ * 通知评论表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入noticeComment")
+ public R update(@Valid @RequestBody NoticeCommentEntity noticeComment) {
+ return R.status(noticeCommentService.updateById(noticeComment));
+ }
+
+ /**
+ * 通知评论表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入noticeComment")
+ public R submit(@Valid @RequestBody NoticeCommentEntity noticeComment) {
+ return R.status(noticeCommentService.saveOrUpdate(noticeComment));
+ }
+
+ /**
+ * 通知评论表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(noticeCommentService.removeByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/controller/NoticeLikeController.java b/src/main/java/org/springblade/modules/notice/controller/NoticeLikeController.java
new file mode 100644
index 0000000..30c2246
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/controller/NoticeLikeController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.modules.notice.vo.NoticeLikeVO;
+import org.springblade.modules.notice.wrapper.NoticeLikeWrapper;
+import org.springblade.modules.notice.service.INoticeLikeService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 通知点赞表 控制器
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-noticeLike/noticeLike")
+@Api(value = "通知点赞表", tags = "通知点赞表接口")
+public class NoticeLikeController extends BladeController {
+
+ private final INoticeLikeService noticeLikeService;
+
+ /**
+ * 通知点赞表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入noticeLike")
+ public R<NoticeLikeVO> detail(NoticeLikeEntity noticeLike) {
+ NoticeLikeEntity detail = noticeLikeService.getOne(Condition.getQueryWrapper(noticeLike));
+ return R.data(NoticeLikeWrapper.build().entityVO(detail));
+ }
+ /**
+ * 通知点赞表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入noticeLike")
+ public R<IPage<NoticeLikeVO>> list(NoticeLikeEntity noticeLike, Query query) {
+ IPage<NoticeLikeEntity> pages = noticeLikeService.page(Condition.getPage(query), Condition.getQueryWrapper(noticeLike));
+ return R.data(NoticeLikeWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 通知点赞表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入noticeLike")
+ public R<IPage<NoticeLikeVO>> page(NoticeLikeVO noticeLike, Query query) {
+ IPage<NoticeLikeVO> pages = noticeLikeService.selectNoticeLikePage(Condition.getPage(query), noticeLike);
+ return R.data(pages);
+ }
+
+ /**
+ * 通知点赞表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入noticeLike")
+ public R save(@Valid @RequestBody NoticeLikeEntity noticeLike) {
+ return R.status(noticeLikeService.save(noticeLike));
+ }
+
+ /**
+ * 通知点赞表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入noticeLike")
+ public R update(@Valid @RequestBody NoticeLikeEntity noticeLike) {
+ return R.status(noticeLikeService.updateById(noticeLike));
+ }
+
+ /**
+ * 通知点赞表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入noticeLike")
+ public R submit(@Valid @RequestBody NoticeLikeEntity noticeLike) {
+ return R.status(noticeLikeService.saveOrUpdate(noticeLike));
+ }
+
+ /**
+ * 通知点赞表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(noticeLikeService.removeByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/controller/NoticesController.java b/src/main/java/org/springblade/modules/notice/controller/NoticesController.java
new file mode 100644
index 0000000..4b1c805
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/controller/NoticesController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.modules.notice.vo.NoticeVO;
+import org.springblade.modules.notice.wrapper.NoticeWrapper;
+import org.springblade.modules.notice.service.INoticesService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 通知公告表 控制器
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-notice/notice")
+@Api(value = "通知公告表", tags = "通知公告表接口")
+public class NoticesController extends BladeController {
+
+ private final INoticesService noticeService;
+
+ /**
+ * 通知公告表 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入notice")
+ public R<NoticeVO> detail(NoticeEntity notice) {
+ NoticeEntity detail = noticeService.getOne(Condition.getQueryWrapper(notice));
+ return R.data(NoticeWrapper.build().entityVO(detail));
+ }
+ /**
+ * 通知公告表 分页
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "分页", notes = "传入notice")
+ public R<IPage<NoticeVO>> list(NoticeEntity notice, Query query) {
+ IPage<NoticeEntity> pages = noticeService.page(Condition.getPage(query), Condition.getQueryWrapper(notice));
+ return R.data(NoticeWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 通知公告表 自定义分页
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入notice")
+ public R<IPage<NoticeVO>> page(NoticeVO notice, Query query) {
+ IPage<NoticeVO> pages = noticeService.selectNoticePage(Condition.getPage(query), notice);
+ return R.data(pages);
+ }
+
+ /**
+ * 通知公告表 新增
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入notice")
+ public R save(@Valid @RequestBody NoticeEntity notice) {
+ return R.status(noticeService.save(notice));
+ }
+
+ /**
+ * 通知公告表 修改
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入notice")
+ public R update(@Valid @RequestBody NoticeEntity notice) {
+ return R.status(noticeService.updateById(notice));
+ }
+
+ /**
+ * 通知公告表 新增或修改
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "新增或修改", notes = "传入notice")
+ public R submit(@Valid @RequestBody NoticeEntity notice) {
+ return R.status(noticeService.saveOrUpdate(notice));
+ }
+
+ /**
+ * 通知公告表 删除
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "逻辑删除", notes = "传入ids")
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ return R.status(noticeService.removeByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/dto/NoticeCollectDTO.java b/src/main/java/org/springblade/modules/notice/dto/NoticeCollectDTO.java
new file mode 100644
index 0000000..c31c014
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/dto/NoticeCollectDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.dto;
+
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知收藏表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeCollectDTO extends NoticeCollectEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/dto/NoticeCommentDTO.java b/src/main/java/org/springblade/modules/notice/dto/NoticeCommentDTO.java
new file mode 100644
index 0000000..1c9428b
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/dto/NoticeCommentDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.dto;
+
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知评论表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeCommentDTO extends NoticeCommentEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/dto/NoticeDTO.java b/src/main/java/org/springblade/modules/notice/dto/NoticeDTO.java
new file mode 100644
index 0000000..a9d4160
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/dto/NoticeDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.dto;
+
+import org.springblade.modules.notice.entity.NoticeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知公告表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeDTO extends NoticeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/dto/NoticeLikeDTO.java b/src/main/java/org/springblade/modules/notice/dto/NoticeLikeDTO.java
new file mode 100644
index 0000000..4bda4f9
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/dto/NoticeLikeDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.dto;
+
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知点赞表 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeLikeDTO extends NoticeLikeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/entity/NoticeCollectEntity.java b/src/main/java/org/springblade/modules/notice/entity/NoticeCollectEntity.java
new file mode 100644
index 0000000..c4154cd
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/entity/NoticeCollectEntity.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 通知收藏表 实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@TableName("jczz_notice_collect")
+@ApiModel(value = "NoticeCollect对象", description = "通知收藏表")
+public class NoticeCollectEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+ /**
+ * 收藏文章id
+ */
+ @ApiModelProperty(value = "收藏文章id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long noticeId;
+ /**
+ * 收藏人id
+ */
+ @ApiModelProperty(value = "收藏人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/entity/NoticeCommentEntity.java b/src/main/java/org/springblade/modules/notice/entity/NoticeCommentEntity.java
new file mode 100644
index 0000000..75be2ef
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/entity/NoticeCommentEntity.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 通知评论表 实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@TableName("jczz_notice_comment")
+@ApiModel(value = "NoticeComment对象", description = "通知评论表")
+public class NoticeCommentEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+ /**
+ * 公告id
+ */
+ @ApiModelProperty(value = "公告id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long noticeId;
+ /**
+ * 评论内容
+ */
+ @ApiModelProperty(value = "评论内容")
+ private String content;
+ /**
+ * 评论人id
+ */
+ @ApiModelProperty(value = "评论人id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+ /**
+ * 回复人id（文章或人）
+ */
+ @ApiModelProperty(value = "回复人id（文章或人）")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long replyId;
+
+ /**
+ * 回复时间
+ */
+ @ApiModelProperty(value = "回复时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date replyTime;
+
+ /**
+ * 是否置顶（0：否，1：是）
+ */
+ @ApiModelProperty(value = "是否置顶（0：否，1：是）")
+ private Integer topping;
+ /**
+ * 是否审核（0：否，1：是）
+ */
+ @ApiModelProperty(value = "是否审核（0：否，1：是）")
+ private Integer isexamine;
+
+ /**
+ * 审核人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("审核人")
+ private Long checkUser;
+
+
+ /**
+ * 审核状态
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("审核状态")
+ private Integer checkStatus;
+
+ /**
+ * 审核时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("审核时间")
+ private Date checkTime;
+
+ /**
+ * 审核意见
+ */
+ @ApiModelProperty("审核意见")
+ private String checkRemark;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @ApiModelProperty("是否已删除 0:否 1:是")
+ private Integer isDeleted;
+}
diff --git a/src/main/java/org/springblade/modules/notice/entity/NoticeEntity.java b/src/main/java/org/springblade/modules/notice/entity/NoticeEntity.java
new file mode 100644
index 0000000..230c4ab
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/entity/NoticeEntity.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 通知公告表 实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@TableName("jczz_notice")
+@ApiModel(value = "Notice对象", description = "通知公告表")
+public class NoticeEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题")
+ private String title;
+ /**
+ * 类型
+ */
+ @ApiModelProperty(value = "类型")
+ private Integer type;
+ /**
+ * 内容
+ */
+ @ApiModelProperty(value = "内容")
+ private String content;
+ /**
+ * logo 图片url
+ */
+ @ApiModelProperty(value = "logo 图片url")
+ private String url;
+ /**
+ * 视频url
+ */
+ @ApiModelProperty(value = "视频url")
+ private String videoUrl;
+ /**
+ * 发布来源id
+ */
+ @ApiModelProperty(value = "发布来源id")
+ private String sourceId;
+ /**
+ * 发布来源名称
+ */
+ @ApiModelProperty(value = "发布来源名称")
+ private String sourceName;
+ /**
+ * 资讯类型
+ */
+ @ApiModelProperty(value = "资讯类型")
+ private String articleType;
+ /**
+ * 是否推荐 1：推荐 2：不推荐
+ */
+ @ApiModelProperty(value = "是否推荐 1：推荐 2：不推荐")
+ private Byte recommend;
+ /**
+ * 是否发布 0：未发布 1：已发布
+ */
+ @ApiModelProperty(value = "是否发布 0：未发布 1：已发布")
+ private String publish;
+ /**
+ * 是否开启评论 0：未开启 1：开启
+ */
+ @ApiModelProperty(value = "是否开启评论 0：未开启 1：开启")
+ private String iscomment;
+ /**
+ * 查看数量
+ */
+ @ApiModelProperty(value = "查看数量")
+ private Integer viewNumber;
+
+
+ /**
+ * 创建人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("创建人")
+ private Long createUser;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ /**
+ * 更新人
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("更新人")
+ private Long updateUser;
+
+ /**
+ * 更新时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ /**
+ * 是否删除
+ */
+ @TableLogic
+ @ApiModelProperty("是否已删除 0:否 1:是")
+ private Integer isDeleted;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java b/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java
new file mode 100644
index 0000000..78011fa
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 通知点赞表 实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@TableName("jczz_notice_like")
+@ApiModel(value = "NoticeLike对象", description = "通知点赞表")
+public class NoticeLikeEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty("主键id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+ /**
+ * 点赞文章id
+ */
+ @ApiModelProperty(value = "点赞文章id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long noticeId;
+ /**
+ * 点赞用户id
+ */
+ @ApiModelProperty(value = "点赞用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long noticeUserId;
+
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.java b/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.java
new file mode 100644
index 0000000..c221e85
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.mapper;
+
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.modules.notice.vo.NoticeCollectVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 通知收藏表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface NoticeCollectMapper extends BaseMapper<NoticeCollectEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeCollect
+ * @return
+ */
+ List<NoticeCollectVO> selectNoticeCollectPage(IPage page, NoticeCollectVO noticeCollect);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.xml b/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.xml
new file mode 100644
index 0000000..93c8e8f
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeCollectMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.notice.mapper.NoticeCollectMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="noticeCollectResultMap" type="org.springblade.modules.notice.entity.NoticeCollectEntity">
+ <result column="id" property="id"/>
+ <result column="notice_id" property="noticeId"/>
+ <result column="user_id" property="userId"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+
+ <select id="selectNoticeCollectPage" resultMap="noticeCollectResultMap">
+ select * from jczz_notice_collect where is_deleted = 0
+ </select>
+
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.java b/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.java
new file mode 100644
index 0000000..ed2b336
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.mapper;
+
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.modules.notice.vo.NoticeCommentVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 通知评论表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface NoticeCommentMapper extends BaseMapper<NoticeCommentEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeComment
+ * @return
+ */
+ List<NoticeCommentVO> selectNoticeCommentPage(IPage page, NoticeCommentVO noticeComment);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.xml b/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.xml
new file mode 100644
index 0000000..459e674
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeCommentMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.notice.mapper.NoticeCommentMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="noticeCommentResultMap" type="org.springblade.modules.notice.entity.NoticeCommentEntity">
+ <result column="id" property="id"/>
+ <result column="notice_id" property="noticeId"/>
+ <result column="content" property="content"/>
+ <result column="user_id" property="userId"/>
+ <result column="reply" property="reply"/>
+ <result column="time" property="time"/>
+ <result column="topping" property="topping"/>
+ <result column="isexamine" property="isexamine"/>
+ </resultMap>
+
+
+ <select id="selectNoticeCommentPage" resultMap="noticeCommentResultMap">
+ select * from jczz_notice_comment where is_deleted = 0
+ </select>
+
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.java b/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.java
new file mode 100644
index 0000000..5715cd5
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.mapper;
+
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.modules.notice.vo.NoticeLikeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 通知点赞表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface NoticeLikeMapper extends BaseMapper<NoticeLikeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeLike
+ * @return
+ */
+ List<NoticeLikeVO> selectNoticeLikePage(IPage page, NoticeLikeVO noticeLike);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.xml b/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.xml
new file mode 100644
index 0000000..b6cd912
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticeLikeMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.notice.mapper.NoticeLikeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="noticeLikeResultMap" type="org.springblade.modules.notice.entity.NoticeLikeEntity">
+ <result column="id" property="id"/>
+ <result column="notice_id" property="noticeId"/>
+ <result column="notice_user_id" property="noticeUserId"/>
+ <result column="create_time" property="createTime"/>
+ </resultMap>
+
+
+ <select id="selectNoticeLikePage" resultMap="noticeLikeResultMap">
+ select * from jczz_notice_like where is_deleted = 0
+ </select>
+
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.java b/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.java
new file mode 100644
index 0000000..7a71508
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.mapper;
+
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.modules.notice.vo.NoticeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 通知公告表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface NoticesMapper extends BaseMapper<NoticeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param notice
+ * @return
+ */
+ List<NoticeVO> selectNoticePage(IPage page, NoticeVO notice);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.xml b/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.xml
new file mode 100644
index 0000000..e406c77
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/mapper/NoticesMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.notice.mapper.NoticesMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="noticeResultMap" type="org.springblade.modules.notice.entity.NoticeEntity">
+ <result column="id" property="id"/>
+ <result column="title" property="title"/>
+ <result column="type" property="type"/>
+ <result column="content" property="content"/>
+ <result column="url" property="url"/>
+ <result column="video_url" property="videoUrl"/>
+ <result column="source_id" property="sourceId"/>
+ <result column="source_name" property="sourceName"/>
+ <result column="article_type" property="articleType"/>
+ <result column="recommend" property="recommend"/>
+ <result column="publish" property="publish"/>
+ <result column="iscomment" property="iscomment"/>
+ <result column="view_number" property="viewNumber"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="create_user" property="createUser"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </resultMap>
+
+
+ <select id="selectNoticePage" resultMap="noticeResultMap">
+ select * from jczz_notice where is_deleted = 0
+ </select>
+
+
+</mapper>
diff --git a/src/main/java/org/springblade/modules/notice/service/INoticeCollectService.java b/src/main/java/org/springblade/modules/notice/service/INoticeCollectService.java
new file mode 100644
index 0000000..c674d1e
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/INoticeCollectService.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.modules.notice.vo.NoticeCollectVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知收藏表 服务类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface INoticeCollectService extends IService<NoticeCollectEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeCollect
+ * @return
+ */
+ IPage<NoticeCollectVO> selectNoticeCollectPage(IPage<NoticeCollectVO> page, NoticeCollectVO noticeCollect);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/INoticeCommentService.java b/src/main/java/org/springblade/modules/notice/service/INoticeCommentService.java
new file mode 100644
index 0000000..f6ec99d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/INoticeCommentService.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.modules.notice.vo.NoticeCommentVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知评论表 服务类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface INoticeCommentService extends IService<NoticeCommentEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeComment
+ * @return
+ */
+ IPage<NoticeCommentVO> selectNoticeCommentPage(IPage<NoticeCommentVO> page, NoticeCommentVO noticeComment);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/INoticeLikeService.java b/src/main/java/org/springblade/modules/notice/service/INoticeLikeService.java
new file mode 100644
index 0000000..801b9dc
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/INoticeLikeService.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.modules.notice.vo.NoticeLikeVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知点赞表 服务类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface INoticeLikeService extends IService<NoticeLikeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param noticeLike
+ * @return
+ */
+ IPage<NoticeLikeVO> selectNoticeLikePage(IPage<NoticeLikeVO> page, NoticeLikeVO noticeLike);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/INoticesService.java b/src/main/java/org/springblade/modules/notice/service/INoticesService.java
new file mode 100644
index 0000000..f9cd033
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/INoticesService.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.modules.notice.vo.NoticeVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知公告表 服务类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public interface INoticesService extends IService<NoticeEntity> {
+
+ /**
+ * 自定义分页
+ *
+ * @param page
+ * @param notice
+ * @return
+ */
+ IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice);
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/impl/NoticeCollectServiceImpl.java b/src/main/java/org/springblade/modules/notice/service/impl/NoticeCollectServiceImpl.java
new file mode 100644
index 0000000..e571e2d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/impl/NoticeCollectServiceImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.modules.notice.vo.NoticeCollectVO;
+import org.springblade.modules.notice.mapper.NoticeCollectMapper;
+import org.springblade.modules.notice.service.INoticeCollectService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知收藏表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Service
+public class NoticeCollectServiceImpl extends ServiceImpl<NoticeCollectMapper, NoticeCollectEntity> implements INoticeCollectService {
+
+ @Override
+ public IPage<NoticeCollectVO> selectNoticeCollectPage(IPage<NoticeCollectVO> page, NoticeCollectVO noticeCollect) {
+ return page.setRecords(baseMapper.selectNoticeCollectPage(page, noticeCollect));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/impl/NoticeCommentServiceImpl.java b/src/main/java/org/springblade/modules/notice/service/impl/NoticeCommentServiceImpl.java
new file mode 100644
index 0000000..11c2e47
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/impl/NoticeCommentServiceImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.modules.notice.vo.NoticeCommentVO;
+import org.springblade.modules.notice.mapper.NoticeCommentMapper;
+import org.springblade.modules.notice.service.INoticeCommentService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知评论表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Service
+public class NoticeCommentServiceImpl extends ServiceImpl<NoticeCommentMapper, NoticeCommentEntity> implements INoticeCommentService {
+
+ @Override
+ public IPage<NoticeCommentVO> selectNoticeCommentPage(IPage<NoticeCommentVO> page, NoticeCommentVO noticeComment) {
+ return page.setRecords(baseMapper.selectNoticeCommentPage(page, noticeComment));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/impl/NoticeLikeServiceImpl.java b/src/main/java/org/springblade/modules/notice/service/impl/NoticeLikeServiceImpl.java
new file mode 100644
index 0000000..b33cf02
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/impl/NoticeLikeServiceImpl.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.modules.notice.vo.NoticeLikeVO;
+import org.springblade.modules.notice.mapper.NoticeLikeMapper;
+import org.springblade.modules.notice.service.INoticeLikeService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知点赞表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Service
+public class NoticeLikeServiceImpl extends ServiceImpl<NoticeLikeMapper, NoticeLikeEntity> implements INoticeLikeService {
+
+ @Override
+ public IPage<NoticeLikeVO> selectNoticeLikePage(IPage<NoticeLikeVO> page, NoticeLikeVO noticeLike) {
+ return page.setRecords(baseMapper.selectNoticeLikePage(page, noticeLike));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/service/impl/NoticesServiceImpl.java b/src/main/java/org/springblade/modules/notice/service/impl/NoticesServiceImpl.java
new file mode 100644
index 0000000..0196e05
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/service/impl/NoticesServiceImpl.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.modules.notice.vo.NoticeVO;
+import org.springblade.modules.notice.mapper.NoticesMapper;
+import org.springblade.modules.notice.service.INoticesService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 通知公告表 服务实现类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Service
+public class NoticesServiceImpl extends ServiceImpl<NoticesMapper, NoticeEntity> implements INoticesService {
+
+ @Override
+ public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
+ return page.setRecords(baseMapper.selectNoticePage(page, notice));
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/vo/NoticeCollectVO.java b/src/main/java/org/springblade/modules/notice/vo/NoticeCollectVO.java
new file mode 100644
index 0000000..b6b0001
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/vo/NoticeCollectVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.vo;
+
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知收藏表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeCollectVO extends NoticeCollectEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/vo/NoticeCommentVO.java b/src/main/java/org/springblade/modules/notice/vo/NoticeCommentVO.java
new file mode 100644
index 0000000..7af4022
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/vo/NoticeCommentVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.vo;
+
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知评论表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeCommentVO extends NoticeCommentEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/vo/NoticeLikeVO.java b/src/main/java/org/springblade/modules/notice/vo/NoticeLikeVO.java
new file mode 100644
index 0000000..0d3d42b
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/vo/NoticeLikeVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.vo;
+
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知点赞表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeLikeVO extends NoticeLikeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/vo/NoticeVO.java b/src/main/java/org/springblade/modules/notice/vo/NoticeVO.java
new file mode 100644
index 0000000..299cb71
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/vo/NoticeVO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.vo;
+
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 通知公告表 视图实体类
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class NoticeVO extends NoticeEntity {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/wrapper/NoticeCollectWrapper.java b/src/main/java/org/springblade/modules/notice/wrapper/NoticeCollectWrapper.java
new file mode 100644
index 0000000..efe7f87
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/wrapper/NoticeCollectWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.notice.entity.NoticeCollectEntity;
+import org.springblade.modules.notice.vo.NoticeCollectVO;
+import java.util.Objects;
+
+/**
+ * 通知收藏表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public class NoticeCollectWrapper extends BaseEntityWrapper<NoticeCollectEntity, NoticeCollectVO> {
+
+ public static NoticeCollectWrapper build() {
+ return new NoticeCollectWrapper();
+ }
+
+ @Override
+ public NoticeCollectVO entityVO(NoticeCollectEntity noticeCollect) {
+ NoticeCollectVO noticeCollectVO = Objects.requireNonNull(BeanUtil.copy(noticeCollect, NoticeCollectVO.class));
+
+ //User createUser = UserCache.getUser(noticeCollect.getCreateUser());
+ //User updateUser = UserCache.getUser(noticeCollect.getUpdateUser());
+ //noticeCollectVO.setCreateUserName(createUser.getName());
+ //noticeCollectVO.setUpdateUserName(updateUser.getName());
+
+ return noticeCollectVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/wrapper/NoticeCommentWrapper.java b/src/main/java/org/springblade/modules/notice/wrapper/NoticeCommentWrapper.java
new file mode 100644
index 0000000..ab62692
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/wrapper/NoticeCommentWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.notice.entity.NoticeCommentEntity;
+import org.springblade.modules.notice.vo.NoticeCommentVO;
+import java.util.Objects;
+
+/**
+ * 通知评论表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public class NoticeCommentWrapper extends BaseEntityWrapper<NoticeCommentEntity, NoticeCommentVO> {
+
+ public static NoticeCommentWrapper build() {
+ return new NoticeCommentWrapper();
+ }
+
+ @Override
+ public NoticeCommentVO entityVO(NoticeCommentEntity noticeComment) {
+ NoticeCommentVO noticeCommentVO = Objects.requireNonNull(BeanUtil.copy(noticeComment, NoticeCommentVO.class));
+
+ //User createUser = UserCache.getUser(noticeComment.getCreateUser());
+ //User updateUser = UserCache.getUser(noticeComment.getUpdateUser());
+ //noticeCommentVO.setCreateUserName(createUser.getName());
+ //noticeCommentVO.setUpdateUserName(updateUser.getName());
+
+ return noticeCommentVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/wrapper/NoticeLikeWrapper.java b/src/main/java/org/springblade/modules/notice/wrapper/NoticeLikeWrapper.java
new file mode 100644
index 0000000..cfbab39
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/wrapper/NoticeLikeWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.notice.entity.NoticeLikeEntity;
+import org.springblade.modules.notice.vo.NoticeLikeVO;
+import java.util.Objects;
+
+/**
+ * 通知点赞表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public class NoticeLikeWrapper extends BaseEntityWrapper<NoticeLikeEntity, NoticeLikeVO> {
+
+ public static NoticeLikeWrapper build() {
+ return new NoticeLikeWrapper();
+ }
+
+ @Override
+ public NoticeLikeVO entityVO(NoticeLikeEntity noticeLike) {
+ NoticeLikeVO noticeLikeVO = Objects.requireNonNull(BeanUtil.copy(noticeLike, NoticeLikeVO.class));
+
+ //User createUser = UserCache.getUser(noticeLike.getCreateUser());
+ //User updateUser = UserCache.getUser(noticeLike.getUpdateUser());
+ //noticeLikeVO.setCreateUserName(createUser.getName());
+ //noticeLikeVO.setUpdateUserName(updateUser.getName());
+
+ return noticeLikeVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/notice/wrapper/NoticeWrapper.java b/src/main/java/org/springblade/modules/notice/wrapper/NoticeWrapper.java
new file mode 100644
index 0000000..6cc997d
--- /dev/null
+++ b/src/main/java/org/springblade/modules/notice/wrapper/NoticeWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.notice.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.modules.notice.entity.NoticeEntity;
+import org.springblade.modules.notice.vo.NoticeVO;
+import java.util.Objects;
+
+/**
+ * 通知公告表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2023-11-08
+ */
+public class NoticeWrapper extends BaseEntityWrapper<NoticeEntity, NoticeVO> {
+
+ public static NoticeWrapper build() {
+ return new NoticeWrapper();
+ }
+
+ @Override
+ public NoticeVO entityVO(NoticeEntity notice) {
+ NoticeVO noticeVO = Objects.requireNonNull(BeanUtil.copy(notice, NoticeVO.class));
+
+ //User createUser = UserCache.getUser(notice.getCreateUser());
+ //User updateUser = UserCache.getUser(notice.getUpdateUser());
+ //noticeVO.setCreateUserName(createUser.getName());
+ //noticeVO.setUpdateUserName(updateUser.getName());
+
+ return noticeVO;
+ }
+
+
+}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 6c4b220..c4b34e6 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -33,8 +33,8 @@
<!--查询场所集合信息-->
<select id="selectPlaceNodeList" resultType="org.springblade.common.node.TreeNode" >
select id,place_name as name,false as hasChildren from jczz_place
- where 1=1
- and principal = #{userId}
+ where 1=1 and is_deleted = 0
+ and principal_user_id = #{userId}
</select>
</mapper>
--
Gitblit v1.9.3