diff --git a/business/src/main/java/com/fizz/business/domain/ProStoppage.java b/business/src/main/java/com/fizz/business/domain/ProStoppage.java
index 8046e67..91046ba 100644
--- a/business/src/main/java/com/fizz/business/domain/ProStoppage.java
+++ b/business/src/main/java/com/fizz/business/domain/ProStoppage.java
@@ -1,12 +1,14 @@
 package com.fizz.business.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -38,15 +40,18 @@ public class ProStoppage implements Serializable {
     private String seton;
 
     @ApiModelProperty(value = "开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startDate;
 
     @ApiModelProperty(value = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDate;
 
     @ApiModelProperty(value = "停机时长")
-    private Float duration;
+    private BigDecimal duration;
 
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String insdate;
 
     @ApiModelProperty(value = "停机类型")
diff --git a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
index ba6a9b4..c72ff42 100644
--- a/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
+++ b/business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
@@ -9,7 +9,9 @@ import com.fizz.business.service.ProStoppageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -19,10 +21,13 @@ public class ProStoppageServiceImpl extends ServiceImpl<ProStoppageMapper, ProSt
     public List<ProStoppage> listAll(ProStoppageForm form) {
         QueryWrapper<ProStoppage> queryWrapper = new QueryWrapper<>();
 
-        queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00");
-        queryWrapper.le("end_date", form.getEndDate() + " 23:59:59");
+        queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00")
+                .le("end_date", form.getEndDate() + " 23:59:59")
+                .ge("duration", 300);
 
-        return baseMapper.selectList(queryWrapper);
+        List<ProStoppage> list = baseMapper.selectList(queryWrapper);
+        list.forEach(item->item.setDuration(item.getDuration().divide(BigDecimal.valueOf(60),2)));
+        return list;
     }
 
     @Override