#update
This commit is contained in:
@@ -1,18 +1,14 @@
|
||||
package com.fastbee.init;
|
||||
package com.maibu.init;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.fastbee.common.constant.FastBeeConstant;
|
||||
import com.fastbee.common.core.domain.entity.UserClient;
|
||||
import com.fastbee.framework.mybatis.LambdaQueryWrapperX;
|
||||
import com.fastbee.iot.domain.DevicePlan;
|
||||
import com.fastbee.iot.domain.DevicePlanTask;
|
||||
import com.fastbee.iot.enums.DeviceTaskStaus;
|
||||
import com.fastbee.iot.mapper.DevicePlanMapper;
|
||||
import com.fastbee.iot.mapper.DevicePlanTaskMapper;
|
||||
import com.fastbee.memory.GlobalMemory;
|
||||
import com.fastbee.service.DevicePlanTaskMonitorService;
|
||||
import com.fastbee.service.DeviceThreadService;
|
||||
import com.fastbee.system.mapper.SysUserClientMapper;
|
||||
import com.maibu.constant.FastBeeConstant;
|
||||
import com.maibu.domain.DevicePlan;
|
||||
import com.maibu.enums.DeviceTaskStaus;
|
||||
import com.maibu.mapper.DevicePlanMapper;
|
||||
import com.maibu.mapper.SysUserClientMapper;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.mybatis.LambdaQueryWrapperX;
|
||||
import com.maibu.service.DevicePlanTaskMonitorService;
|
||||
import com.maibu.service.DeviceThreadService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -24,7 +20,6 @@ import org.springframework.stereotype.Component;
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.Executor;
|
||||
|
||||
@@ -93,7 +88,7 @@ public class InitThread implements ApplicationRunner {
|
||||
// sysUserClientMapper.clearDeviceName();
|
||||
// 未执行完的重复计划
|
||||
LambdaQueryWrapperX<DevicePlan> query = new LambdaQueryWrapperX<>();
|
||||
List<String> list = Arrays.asList(DeviceTaskStaus.NEW.getCode(),DeviceTaskStaus.EXECUTING.getCode(),DeviceTaskStaus.PAUSE.getCode());
|
||||
List<String> list = Arrays.asList(DeviceTaskStaus.NEW.getCode(),DeviceTaskStaus.EXECUTING.getCode(), DeviceTaskStaus.PAUSE.getCode());
|
||||
query.in(DevicePlan::getTaskStaus, list);
|
||||
List<DevicePlan> devicePlanList = devicePlanMapper.selectList(query);
|
||||
if(!CollectionUtils.isEmpty(devicePlanList)){
|
||||
|
||||
Reference in New Issue
Block a user