DeXun/be-process-control-system
9
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix():补充停机筛选

Browse Source
This commit is contained in:
Penknife
2025-01-16 18:12:37 +08:00
parent 7e4f36a5cc
commit fed8d7bfa7
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/src/main/java/com/fizz/business/domain/ProStoppage.java
View File

@@ -1,12 +1,14 @@
package com.fizz.business.domain; package com.fizz.business.domain;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
@@ -38,15 +40,18 @@ public class ProStoppage implements Serializable {
private String seton; private String seton;
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate; private LocalDateTime startDate;
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDate; private LocalDateTime endDate;
@ApiModelProperty(value = "停机时长") @ApiModelProperty(value = "停机时长")
private Float duration; private BigDecimal duration;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String insdate; private String insdate;
@ApiModelProperty(value = "停机类型") @ApiModelProperty(value = "停机类型")

11
business/src/main/java/com/fizz/business/service/impl/ProStoppageServiceImpl.java
View File

@@ -9,7 +9,9 @@ import com.fizz.business.service.ProStoppageService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
@Service @Service
@Slf4j @Slf4j
@@ -19,10 +21,13 @@ public class ProStoppageServiceImpl extends ServiceImpl<ProStoppageMapper, ProSt
public List<ProStoppage> listAll(ProStoppageForm form) { public List<ProStoppage> listAll(ProStoppageForm form) {
QueryWrapper<ProStoppage> queryWrapper = new QueryWrapper<>(); QueryWrapper<ProStoppage> queryWrapper = new QueryWrapper<>();
queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00"); queryWrapper.ge("end_date", form.getStartDate() + " 00:00:00")
queryWrapper.le("end_date", form.getEndDate() + " 23:59:59"); .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 @Override