From ef2e2d38b18ed669d26614e671498a2b68aabb8c Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 28 Mar 2024 17:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=A8=A1=E5=9D=97-=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/MessageController.java | 56 +++++++++++++++++++ .../common/service/MessageService.java | 7 +++ .../service/impl/MessageServiceImpl.java | 13 +++++ .../master/controller/MessageController.java | 10 +++- 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/peanut/modules/common/controller/MessageController.java create mode 100644 src/main/java/com/peanut/modules/common/service/MessageService.java create mode 100644 src/main/java/com/peanut/modules/common/service/impl/MessageServiceImpl.java diff --git a/src/main/java/com/peanut/modules/common/controller/MessageController.java b/src/main/java/com/peanut/modules/common/controller/MessageController.java new file mode 100644 index 00000000..1336eedd --- /dev/null +++ b/src/main/java/com/peanut/modules/common/controller/MessageController.java @@ -0,0 +1,56 @@ +package com.peanut.modules.common.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.peanut.common.utils.R; +import com.peanut.modules.common.entity.Message; +import com.peanut.modules.common.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + +/** + * 公共消息 + */ +@Slf4j +@RestController("commonMessage") +@RequestMapping("common/message") +public class MessageController { + + @Autowired + private MessageService messageService; + + @RequestMapping("/listByPage") + public R listByPage(@RequestBody Map params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + if (params.containsKey("title")&& StringUtils.isNotEmpty(params.get("title").toString())) { + wrapper.like(Message::getTitle,params.get("title")); + } + if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) { + wrapper.eq(Message::getType,params.get("type")); + } + if (params.containsKey("isBook")&& StringUtils.isNotEmpty(params.get("isBook").toString())) { + wrapper.eq(Message::getIsBook,params.get("isBook")); + } + if (params.containsKey("isMedical")&& StringUtils.isNotEmpty(params.get("isMedical").toString())) { + wrapper.eq(Message::getIsBook,params.get("isMedical")); + } + if (params.containsKey("isSociology")&& StringUtils.isNotEmpty(params.get("isSociology").toString())) { + wrapper.eq(Message::getIsBook,params.get("isSociology")); + } + wrapper.orderByDesc(Message::getCreateTime); + Page page = messageService.page(new Page<>( + Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper); + return R.ok().put("result", page); + } + + @RequestMapping("/getMessageById") + public R getMessageById(String id) { + return R.ok().put("result", messageService.getById(id)); + } + +} diff --git a/src/main/java/com/peanut/modules/common/service/MessageService.java b/src/main/java/com/peanut/modules/common/service/MessageService.java new file mode 100644 index 00000000..a90d7e8e --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/MessageService.java @@ -0,0 +1,7 @@ +package com.peanut.modules.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.common.entity.Message; + +public interface MessageService extends IService { +} diff --git a/src/main/java/com/peanut/modules/common/service/impl/MessageServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/MessageServiceImpl.java new file mode 100644 index 00000000..c063aeb5 --- /dev/null +++ b/src/main/java/com/peanut/modules/common/service/impl/MessageServiceImpl.java @@ -0,0 +1,13 @@ +package com.peanut.modules.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.common.dao.MessageDao; +import com.peanut.modules.common.entity.Message; +import com.peanut.modules.common.service.MessageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service("commonMessageService") +public class MessageServiceImpl extends ServiceImpl implements MessageService { +} diff --git a/src/main/java/com/peanut/modules/master/controller/MessageController.java b/src/main/java/com/peanut/modules/master/controller/MessageController.java index d9fd6761..8b2617b8 100644 --- a/src/main/java/com/peanut/modules/master/controller/MessageController.java +++ b/src/main/java/com/peanut/modules/master/controller/MessageController.java @@ -2,7 +2,6 @@ package com.peanut.modules.master.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.R; import com.peanut.modules.common.entity.Message; import com.peanut.modules.master.service.MessageService; @@ -12,9 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.Map; +/** + * 公共消息 + */ @Slf4j @RestController("masterMessage") @RequestMapping("master/message") @@ -47,6 +48,11 @@ public class MessageController { return R.ok().put("result", page); } + @RequestMapping("/getMessageById") + public R getMessageById(String id) { + return R.ok().put("result", messageService.getById(id)); + } + @RequestMapping("/saveOrUpdateMessage") public R saveOrUpdateMessage(@RequestBody Message message) { messageService.saveOrUpdate(message);