算法费设备停机

device-api-service/src/main/java/com/xy/job/DeviceAlgorithmChargingJob.java

@@ -13,15 +13,14 @@ import com.xy.entity.DeviceInfo;
 import com.xy.service.DeviceAlgorithmChargingServiceImpl;
 import com.xy.service.DeviceInfoServiceImpl;
 import com.xy.service.MercAccountService;
-import com.xy.utils.DataTime;
 import com.xy.utils.Emptys;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -54,6 +53,7 @@ public class DeviceAlgorithmChargingJob {
             List<DeviceInfo> updateDeviceInfos = new ArrayList<>();
             //查询商户未冻结设备
             List<DeviceInfo> deviceInfos = deviceInfoService.list(new LambdaQueryWrapper<DeviceInfo>()
+                    .in(DeviceInfo::getDeviceType, Arrays.asList(1, 2))
                     .eq(DeviceInfo::getMercId, mercAccount.getMercId())
                     .eq(DeviceInfo::getActiveState, 1)
                     .eq(DeviceInfo::getFreezeStatus, 1)