|
@@ -3,6 +3,7 @@ package com.xy.service;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.xy.config.DeviceThreadPoolConfig;
|
|
|
import com.xy.dbmapper.SyncUpdate;
|
|
|
import com.xy.device.EnumDevcieDoorStatus;
|
|
|
import com.xy.dto.ActivityInfoDto;
|
|
@@ -11,10 +12,7 @@ import com.xy.dto.DeviceTempRecordsDto;
|
|
|
import com.xy.entity.DeviceStatus;
|
|
|
import com.xy.mapper.DeviceStatusMapper;
|
|
|
import com.xy.mapper.entity.DeviceStatusCount;
|
|
|
-import com.xy.utils.Emptys;
|
|
|
-import com.xy.utils.MybatisPlusQuery;
|
|
|
-import com.xy.utils.R;
|
|
|
-import com.xy.utils.SysDictUtils;
|
|
|
+import com.xy.utils.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
@@ -68,11 +66,12 @@ public class DeviceStatusServiceImpl extends ServiceImpl<DeviceStatusMapper, Dev
|
|
|
if (Emptys.check(deviceStatus.getDoorStateL())) {
|
|
|
Integer value = SysDictUtils.getValue(EnumDevcieDoorStatus.Code.CODE.getCode(), EnumDevcieDoorStatus.LOCKED.getCode(), Integer.class);
|
|
|
if (deviceStatus.getDoorStateL().equals(value)) {
|
|
|
- activityInfoService.abort(new ActivityInfoDto.Abort()
|
|
|
- .setDeviceId(up.getDeviceId())
|
|
|
- .setWorkType(2)
|
|
|
- .setTimeout(60 * 1)
|
|
|
- );
|
|
|
+ ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 1)
|
|
|
+ .execute(() -> activityInfoService.abort(new ActivityInfoDto.Abort()
|
|
|
+ .setDeviceId(up.getDeviceId())
|
|
|
+ .setWorkType(2)
|
|
|
+ .setTimeout(60 * 1)
|
|
|
+ ));
|
|
|
}
|
|
|
}
|
|
|
return R.ok();
|