yangys
2025-11-24 11d4be720620abf502d35000e2ed40d30c4023bf
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java
@@ -34,6 +34,7 @@
import com.qianwen.mdc.collect.enums.FeedbackTimePointEnum;
import com.qianwen.mdc.collect.mapper.iotdb.DeviceStateMapper;
import com.qianwen.mdc.collect.mapper.mgr.CalendarMapper;
import com.qianwen.mdc.collect.service.feedback.WorkstationFeedbackService;
import com.qianwen.mdc.collect.utils.FeedbackAnalyseUtils;
import com.qianwen.mdc.collect.utils.LocalDateTimeUtils;
import cn.hutool.core.date.DatePattern;
@@ -62,6 +63,9 @@
    @Autowired
   private DeviceStateAggregateNoFeedbackService stateAggregateNoFeedbackService;
   
    @Autowired
   private WorkstationFeedbackService workstationFeedbackService;
    public void stateAggregate(Long workstationId) {
       ////获取时间阶段列表(2个),一个noFeedbackTime=true,一个noFeedbackTime=false,我们自己返回一个startTime,endTime即可,noFeedbackTime=true的即可
        //List<StateAggregateTimeDTO> effective = getCurrentStateAggregateTimeRange(workstationId);
@@ -93,7 +97,9 @@
        deviceStateService.saveDeviceStates(noFeedbackStateList);//更新isSync=true
        ////使用workstationWcsFeedbackMapper更新反馈得状态,我们不需要
        //IWorkstationFeedbackService workstationFeedbackService = SpringUtil.getBean(IWorkstationFeedbackService.class);
        //workstationFeedbackService.handlerFeedbackComplete(workstationId);
        workstationFeedbackService.handlerFeedbackComplete(workstationId);//处理反馈时候会生成processing状态的反馈数据,这里是完成
        log.info("聚合状态完成:工位{}",workstationId);
    }