Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceSimServiceImpl.java

@@ -186,7 +186,7 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
         String theTime = DataTime.getStringAround(0, 0, value, 0, 0, 0);
         //并行数据
         DeviceSimDto.PageCountVo pageCountVo = new DeviceSimDto.PageCountVo();
-        ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 6)
+        ThreadPoolUtils.excPoll(DeviceThreadPoolConfig.DEVICE_COMMON_POLL, 5)
                 .execute(() -> {
                     //全部
                     DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount);
@@ -225,12 +225,6 @@ public class DeviceSimServiceImpl extends ServiceImpl<DeviceSimMapper, DeviceSim
                     int count = baseMapper.pageCount(paramsObj);
                     pageCountVo.setIsNotActivate(count);
                 })
-                .execute(() -> {
-                    //待处理
-                    DeviceSimDto.PageCount paramsObj = Beans.copy(DeviceSimDto.PageCount.class, pageCount);
-                    int count = baseMapper.pageCount(paramsObj);
-                    pageCountVo.setWaitHandleCount(count);
-                })
                 .end();
         return R.ok(pageCountVo);
     }