feat:{站内信的编写}

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;
     /**

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();
+        List<FaultMessage> list = faultMessageService.faultMessageList(faultMessage);
-        LambdaQueryWrapper<FaultMessage> queryWrapper = new LambdaQueryWrapper<>();
+        return Result.success(list);
-        if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) {
-            queryWrapper.eq(FaultMessage::getFaultMessageSendName,username);
-        }
-        return Result.success(faultMessageService.list(queryWrapper));
     }
 
     /**
@@ -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));
+    }
+
 }

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;

cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java

@@ -10,4 +10,6 @@ public interface FaultMessageService extends IService<FaultMessage> {
     List<FaultMessage> selectOne();
 
     List<FaultMessage> selectTwo();
+
+    List<FaultMessage> faultMessageList(FaultMessage faultMessage);
 }

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<FaultMessageMapper, Fau
         queryWrapper.eq(FaultMessage::getFaultMessageState, 2);
         return this.list(queryWrapper);
     }
+
+    @Override
+    public List<FaultMessage> faultMessageList(FaultMessage faultMessage) {
+        String username = SecurityUtils.getUsername();
+        LambdaQueryWrapper<FaultMessage> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) {
+            queryWrapper.eq(FaultMessage::getFaultMessageSendName,username);
+        }
+        return this.list(queryWrapper);
+    }
 }