控制器报警与状态相关3个接口查询条件优化

zhubaomin

2025-02-24 dbf59228a93ac492d6d9f34ed4402c7124f8ad34

控制器报警与状态相关3个接口查询条件优化

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateQueryVo.java

@@ -6,8 +6,6 @@
import lombok.*;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * @author :WuZeYu
 * @Date :2024/7/22  20:01
@@ -35,13 +33,22 @@
    @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date startDt;
    private String startDt;

    @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date endDt;
    private String endDt;

    @Schema(description = "报警状态", requiredMode = Schema.RequiredMode.NOT_REQUIRED)//（0正常、1报警）
    private Byte alarmState;

    public void completionTime(){
        if(this.startDt != null && !this.startDt.trim().equals("")) {
            this.startDt = startDt + " 00:00:00";
        }
        if(this.endDt != null && !this.endDt.trim().equals("")) {
            this.endDt = endDt + " 23:59:59";
        }
    }
}

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/controllerAlarmState/ControllerAlarmStateSv.java

@@ -35,7 +35,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {

        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -54,6 +54,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getOneControllerAlarmStateHistory(ControllerAlarmStateQueryVo vo) {
        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateHistoryMapper.getRecordCount(params);
@@ -74,7 +75,7 @@
     * @return
     */
    public QueryResultVo<List<VoControllerAlarmState>> getControllerAlarmStateLast(ControllerAlarmStateQueryVo vo) {

        vo.completionTime();
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo);

        Long itemTotal = rmAlarmStateLastMapper.getRecordCount(params);