From ecf2c96c80e298076f28fffa77112b43a0301836 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Mon, 23 Sep 2024 21:03:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:{=E7=AB=99=E5=86=85=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=86=99}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/fault/common/FaultMessage.java | 4 ++-- .../controller/FaultMessageController.java | 23 +++++++++++-------- .../service/impl/FaultLogServiceImpl.java | 1 - .../service/impl/FaultMessageService.java | 2 ++ .../service/impl/FaultMessageServiceImpl.java | 12 ++++++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java index 38f0f03..af5daae 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -32,7 +32,7 @@ public class FaultMessage { /** * 消息接收人 */ - @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + @Schema(defaultValue = "消息接收人",type = "String",description = "消息发送人") private String faultMessageRemoveName; /** * 消息内容 @@ -42,7 +42,7 @@ public class FaultMessage { /** * 发送时间 */ - @Schema(defaultValue = "发送时间",type = "String",description = "发送时间") + @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultMessageSendTime; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index 7bf218d..88fce62 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -1,9 +1,7 @@ package com.muyu.fault.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.service.impl.FaultMessageService; @@ -22,14 +20,10 @@ public class FaultMessageController { * 站内信列表 * @return */ - @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + @RequestMapping(value = "/faultMessageList",method = RequestMethod.POST) public Result faultMessageList(@RequestBody FaultMessage faultMessage){ - String username = SecurityUtils.getUsername(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { - queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); - } - return Result.success(faultMessageService.list(queryWrapper)); + List list = faultMessageService.faultMessageList(faultMessage); + return Result.success(list); } /** @@ -78,4 +72,15 @@ public class FaultMessageController { faultMessageService.update(updateWrapper); return Result.success(faultMessageId,"消息已读"); } + + /** + * 删除消息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST) + public Result deleteMessageId(@PathVariable Long faultMessageId){ + return Result.success(faultMessageService.removeById(faultMessageId)); + } + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 8b71700..6e56a64 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; -import com.muyu.fault.common.SysCarFault; import com.muyu.fault.mapper.FaultLogMapper; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java index 77e6c20..83d0d19 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -10,4 +10,6 @@ public interface FaultMessageService extends IService { List selectOne(); List selectTwo(); + + List faultMessageList(FaultMessage faultMessage); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index e2dcc9e..96f33d6 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -2,6 +2,8 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.mapper.FaultMessageMapper; import org.springframework.stereotype.Service; @@ -26,4 +28,14 @@ public class FaultMessageServiceImpl extends ServiceImpl faultMessageList(FaultMessage faultMessage) { + String username = SecurityUtils.getUsername(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); + } + return this.list(queryWrapper); + } }