Commit 01088527 authored by 赵啸非's avatar 赵啸非

修正redis 最大连接数

parent dd6f316b
...@@ -54,6 +54,10 @@ public class DeviceTotalStatTaskImpl implements ITaskExcuteService { ...@@ -54,6 +54,10 @@ public class DeviceTotalStatTaskImpl implements ITaskExcuteService {
} else if (platFormType.equalsIgnoreCase(PlatformTypeEnum.STANDALONE.getValue())) { } else if (platFormType.equalsIgnoreCase(PlatformTypeEnum.STANDALONE.getValue())) {
List<SiteEntity> siteEntities = siteService.find(new SiteQuery()); List<SiteEntity> siteEntities = siteService.find(new SiteQuery());
for (SiteEntity siteEntity : siteEntities) { for (SiteEntity siteEntity : siteEntities) {
//判断如果当前节点无设备 则不统计
deviceStatService.deviceStat(siteEntity.getId(), null); deviceStatService.deviceStat(siteEntity.getId(), null);
} }
} }
......
...@@ -162,6 +162,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -162,6 +162,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
deviceStatEntity.setDay(calendar.get(Calendar.DAY_OF_MONTH)); deviceStatEntity.setDay(calendar.get(Calendar.DAY_OF_MONTH));
} }
//获取昨天统计数据 //获取昨天统计数据
DeviceStatEntity yesterdayDeviceStat = this.selectOne(new DeviceStatQuery() DeviceStatEntity yesterdayDeviceStat = this.selectOne(new DeviceStatQuery()
.siteId(siteId) .siteId(siteId)
...@@ -179,7 +180,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -179,7 +180,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
//获取设备总数 //获取设备总数
List<DeviceEntity> deviceList = deviceService.find(new DeviceQuery().siteId(siteId)); List<DeviceEntity> deviceList = deviceService.find(new DeviceQuery().siteId(siteId));
Integer deviceTotalCount = deviceList.size(); Integer deviceTotalCount = deviceList.size();
if (deviceTotalCount > 0) {
//未激活数量 //未激活数量
Long deviceUnActiveCount = deviceList.parallelStream() Long deviceUnActiveCount = deviceList.parallelStream()
.filter(f -> f.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()) .filter(f -> f.getDeviceStatus() == DeviceStatusEnum.未激活.getValue())
...@@ -257,7 +258,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -257,7 +258,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
alarmSmsSendQuery.setSendTimeEnd(DateUtils.getCurrStrDate()); alarmSmsSendQuery.setSendTimeEnd(DateUtils.getCurrStrDate());
alarmSmsSendQuery.setSendStatus(SendStatusEnum.发送成功.getValue()); alarmSmsSendQuery.setSendStatus(SendStatusEnum.发送成功.getValue());
int pushTotalCount = alarmSmsSendService.count(alarmSmsSendQuery,null); int pushTotalCount = alarmSmsSendService.count(alarmSmsSendQuery, null);
deviceStatEntity.setPushTotalCount(pushTotalCount); deviceStatEntity.setPushTotalCount(pushTotalCount);
deviceStatEntity.setPushAddCount(pushTotalCount - yesterdayDeviceStat.getPushTotalCount()); deviceStatEntity.setPushAddCount(pushTotalCount - yesterdayDeviceStat.getPushTotalCount());
...@@ -272,7 +273,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -272,7 +273,7 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
deviceStatEntity.setUploadMessageTotalCount(uploadMessageTotalCount); deviceStatEntity.setUploadMessageTotalCount(uploadMessageTotalCount);
deviceStatEntity.setDownloadMessageTotalCount(downloadMessageTotalCount); deviceStatEntity.setDownloadMessageTotalCount(downloadMessageTotalCount);
deviceStatEntity.setSiteId(siteId); deviceStatEntity.setSiteId(siteId);
}
if (deviceStatEntity.newEntity()) { if (deviceStatEntity.newEntity()) {
deviceStatEntity.setCreateTime(new Date()); deviceStatEntity.setCreateTime(new Date());
deviceStatService.save(deviceStatEntity); deviceStatService.save(deviceStatEntity);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment