notify错误修改

yangys

2024-04-02 6bed83e92f67954cd2135071133329f2205efe4f

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/report/service/impl/WorkstationAlarmServiceImpl.java

@@ -1,5 +1,4 @@
package com.qianwen.smartman.modules.report.service.impl;

import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Lists;
@@ -41,7 +40,7 @@
import com.qianwen.smartman.modules.report.vo.WorkstationAlarmByShiftSelectVO;
import com.qianwen.smartman.modules.report.vo.WorkstationAlarmByTimeSelectVO;
import org.springframework.stereotype.Service;

 
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/report/service/impl/WorkstationAlarmServiceImpl.class */
public class WorkstationAlarmServiceImpl implements IWorkstationAlarmService {
@@ -51,14 +50,14 @@
    private final IShiftDetailService shiftDetailService;
    private final CalendarMapper calendarMapper;
    private static final String TIME_CONDITION = "showDate";

 
    public WorkstationAlarmServiceImpl(final SuperAlarmMapper superAlarmMapper, final WorkstationMapper workstationMapper, final IShiftDetailService shiftDetailService, final CalendarMapper calendarMapper) {
        this.superAlarmMapper = superAlarmMapper;
        this.workstationMapper = workstationMapper;
        this.shiftDetailService = shiftDetailService;
        this.calendarMapper = calendarMapper;
    }

 
    @Override // org.springblade.modules.report.service.IWorkstationAlarmService
    public JSONObject alarmReportByTime(WorkstationAlarmByTimeSelectVO workstationAlarmByTimeSelectVO) {
        workstationAlarmByTimeSelectVO.setShowDate_begin(DateCycleUtil.setTimeCondition(TIME_CONDITION, Boolean.TRUE));
@@ -132,7 +131,7 @@
        jsonObject.put("count", Long.valueOf(workstationVOPage.getTotal()));
        return jsonObject;
    }

 
    @Override // org.springblade.modules.report.service.IWorkstationAlarmService
    public JSONObject drillAlarmReportByTime(DrillWorkstationAlarmByTimeSelectVO drillWorkstationAlarmByTimeSelectVO) {
        StatisticalMethodEnum anEnum;
@@ -184,7 +183,7 @@
            return ResultUtil.dataToJsonObject(null, 0L, drillWorkstationAlarmByTimeSelectVO.getPageSize());
        }
    }

 
    @Override // org.springblade.modules.report.service.IWorkstationAlarmService
    public JSONObject alarmReportByShift(WorkstationAlarmByShiftSelectVO workstationAlarmByTimeSelectVO) {
        IPage<WorkstationDataDTO> workstationVOPage;
@@ -268,7 +267,7 @@
        }
        return ResultUtil.dataToJsonObject(voMap.values(), Long.valueOf(workstationVOPage.getTotal()), workstationAlarmByTimeSelectVO.getPageSize());
    }

 
    @Override // org.springblade.modules.report.service.IWorkstationAlarmService
    public JSONObject drillAlarmReportByShift(DrillWorkstationAlarmByShiftSelectVO drillWorkstationAlarmByShiftSelectVO) {
        List<DrillWorkstationAlarmByShiftVO> drillWorkstationAlarmByTimeVO;
@@ -312,7 +311,7 @@
            return ResultUtil.dataToJsonObject(null, 0L, drillWorkstationAlarmByShiftSelectVO.getPageSize());
        }
    }

 
    private Function<WorkstaionAlarmByTimeReportVO, String> groupKey(StatisticalMethodEnum statisticalMethodEnum) {
        switch (statisticalMethodEnum) {
            case DAY:
@@ -333,7 +332,7 @@
                };
        }
    }

 
    private List<WorkstaionAlarmByTimeReportVO> getData(List<WorkstaionAlarmByTimeReportVO> data) {
        boolean filterType = FilterOffUtils.whetherToFilter(OpenTypeEnums.PARAM_KEY_TYPE, OpenTypeEnums.ALARM_ANALYSIS);
        boolean filterShift = FilterOffUtils.whetherToFilter(OpenTypeEnums.PARAM_KEY_SHIFT, OpenTypeEnums.ALARM_ANALYSIS);
@@ -346,4 +345,4 @@
            return !filterShift || item2.getShiftIndex().intValue() > 0;
        }).collect(Collectors.toList());
    }
}
}