diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java
index ed16379..9953029 100644
--- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java
+++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java
@@ -9,6 +9,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -39,12 +40,12 @@ public class FaultLog extends BaseEntity {
      * 开始报警时间
      */
     @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date  faultLogStartTime;
     /**
      * 结束报警时间
      */
     @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date faultLogEndTime;
 }
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 af5daae..b264b28 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
@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -43,7 +44,7 @@ public class FaultMessage {
      * 发送时间
      */
     @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date faultMessageSendTime;
     /**
      * 消息状态(1:未读,2:已读)
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 88fce62..f9ffde6 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
@@ -20,10 +20,9 @@ public class FaultMessageController {
      * 站内信列表
      * @return
      */
-    @RequestMapping(value = "/faultMessageList",method = RequestMethod.POST)
-    public Result faultMessageList(@RequestBody FaultMessage faultMessage){
-        List<FaultMessage> list = faultMessageService.faultMessageList(faultMessage);
-        return Result.success(list);
+    @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET)
+    public Result<List<FaultMessage>> faultMessageList( FaultMessage faultMessage){
+        return Result.success(faultMessageService.faultMessageList(faultMessage));
     }
 
     /**
@@ -65,7 +64,7 @@ public class FaultMessageController {
      * @return
      */
     @RequestMapping(value = "/updateTwo/{faultMessageId}",method = RequestMethod.POST)
-    public Result updateTwo(@PathVariable Long faultMessageId){
+    public Result updateTwo(@PathVariable(name = "faultMessageId") Long faultMessageId){
         LambdaUpdateWrapper<FaultMessage> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(FaultMessage::getFaultMessageState,2);
         updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId);
@@ -79,8 +78,8 @@ public class FaultMessageController {
      * @return
      */
     @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST)
-    public Result deleteMessageId(@PathVariable Long faultMessageId){
-        return Result.success(faultMessageService.removeById(faultMessageId));
+    public Result deleteMessageId(@PathVariable(name = "faultMessageId") Long faultMessageId){
+        return Result.success(faultMessageService.removeById(faultMessageId),"删除成功");
     }
 
 }
diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java
index c7e3611..1a930ba 100644
--- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java
+++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java
@@ -29,7 +29,6 @@ public class FaultrRuleController {
         return Result.success(list);
     }
 
-
     /**
      * 添加车辆规则
      * @param faultrRule
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 96f33d6..252e842 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
@@ -33,9 +33,15 @@ public class FaultMessageServiceImpl extends ServiceImpl<FaultMessageMapper, Fau
     public List<FaultMessage> faultMessageList(FaultMessage faultMessage) {
         String username = SecurityUtils.getUsername();
         LambdaQueryWrapper<FaultMessage> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) {
+        if (StringUtils.isNotEmpty(faultMessage.getFaultMessageRemoveName())) {
             queryWrapper.eq(FaultMessage::getFaultMessageSendName,username);
         }
+        if (StringUtils.isNotEmpty(String.valueOf(faultMessage.getFaultMessageState()))) {
+            queryWrapper.eq(FaultMessage::getFaultMessageState,faultMessage.getFaultMessageState());
+        }
+        if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) {
+            queryWrapper.like(FaultMessage::getFaultMessageSendName,faultMessage.getFaultMessageSendName());
+        }
         return this.list(queryWrapper);
     }
 }
diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java
index 9f5a45e..e923634 100644
--- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java
+++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java
@@ -2,6 +2,7 @@ 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.fault.common.FaultLog;
 import com.muyu.fault.common.FaultrRule;
 import com.muyu.fault.mapper.FaultrRuleMapper;
@@ -16,6 +17,12 @@ public class FaultrRuleServiceImpl extends ServiceImpl<FaultrRuleMapper, FaultrR
     @Override
     public List<FaultrRule> faultRuleList(FaultrRule faultrRule) {
         LambdaQueryWrapper<FaultrRule> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) {
+            queryWrapper.eq(FaultrRule::getFaultRuleName,faultrRule.getFaultRuleName());
+        }
+        if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) {
+            queryWrapper.eq(FaultrRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter());
+        }
         return this.list(queryWrapper);
     }