台账添加错误问题修改

yangys

2025-11-05 10c5247722995e571b3fd4dbffb178964a9bd6ee

 smart-man-boot/src/main/java/com/qianwen/smartman/modules/visual/service/impl/VisualStatusServiceImpl.java

@@ -37,15 +37,15 @@
import com.qianwen.smartman.common.enums.WorkstationParamTypeEnum;
import com.qianwen.smartman.common.utils.Lambda;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.modules.cps.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.cps.dto.WorkstationAlarmDTO;
import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.entity.WorkstationWcs;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
import com.qianwen.smartman.modules.cps.service.IWorkstationWcsService;
import com.qianwen.smartman.modules.cps.vo.RealTimeStatusVO;
import com.qianwen.smartman.modules.smis.dto.CalendarShiftTimeSlicesDTO;
import com.qianwen.smartman.modules.smis.dto.WorkstationAlarmDTO;
import com.qianwen.smartman.modules.smis.entity.GlobalWcs;
import com.qianwen.smartman.modules.smis.entity.Workstation;
import com.qianwen.smartman.modules.smis.entity.WorkstationWcs;
import com.qianwen.smartman.modules.smis.service.IGlobalWcsService;
import com.qianwen.smartman.modules.smis.service.IWorkstationService;
import com.qianwen.smartman.modules.smis.service.IWorkstationWcsService;
import com.qianwen.smartman.modules.smis.vo.RealTimeStatusVO;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregateState;
import com.qianwen.smartman.modules.mdc.enums.OpenTypeEnums;
import com.qianwen.smartman.modules.mdc.enums.ProductivityTypeEnum;
@@ -105,8 +105,8 @@
            return new ChartSeriesDataVO();
        }
        List<Long> workStationIdList = timeStatusVO.getWorkStationIdList();
        String timeLevel = timeStatusVO.getTimeLevel();
        Integer top = timeStatusVO.getTop();
        String timeLevel = timeStatusVO.getTimeLevel();//小时数，如24小时
        Integer top = timeStatusVO.getTop();//查询多少个
        VisualTimeDTO visualTimeDTO = VisualUtils.getTimeSectionByLevel(timeLevel);
        List<StatusTimeTopVO> statusTimeByWcs = this.superAggregateStateService.getStatusTimeByWcs(workStationIdList, visualTimeDTO.getStartTime(), visualTimeDTO.getEndTime(), status, top);
        return this.wrapper.deviceStatusDuration(statusTimeByWcs, status, top);
@@ -130,7 +130,7 @@
        return this.wrapper.entityToOee(data);
    }

    
    /*
    public ChartDataTableVO getWorkstationRealStatus(VisualBaseVO visualBaseVO) {
        List<Long> workStationList = visualBaseVO.getWorkStationIdList();
        Map<String, Object> header = new LinkedHashMap<>();
@@ -164,7 +164,7 @@
        }).collect(Collectors.toList());
        ChartDataTableVO chartDataTableVO = new ChartDataTableVO().setData(list).setHeader(header);
        return chartDataTableVO;
    }
    }*/

    
    public DefaultWcsEnum getWorkstationDefaultWcsEnum(final List<RealTimeStatusVO> realTimeProperties) {
@@ -181,7 +181,7 @@
        }).orElse(null);
    }

    
    /*
    public ChartDataTableVO getWorkstationAlarm(final VisualBaseVO vo) {
        List<Long> workStationList = vo.getWorkStationIdList();
        List<ICard> voList = new ArrayList<>();
@@ -211,7 +211,7 @@
        ChartDataTableVO chartDataTableVO = new ChartDataTableVO().setData(voList).addHeader("code", "报警编码").addHeader(CommonConstant.ALARM_MSG, "报警信息");
        return chartDataTableVO;
    }

   */
    
    public ChartNameValueDataVO getAverageEfficiencyAnalysis(VisualBaseVO vo, ProductivityTypeEnum productivityTypeEnum) {
        List<Long> workStationIdList = vo.getWorkStationIdList();