Skip to content

B
browser-backend
Commit 3d2c9233 authored by renjie's avatar renjie
Browse files
Options

Merge branch 'dev-zrj' into 'staging' 

ipcount bug

See merge request !136
parents 548c371b 2c26a3a6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/main/java/com/edgec/browserbackend/account/service/impl/AdministratorServiceImpl.java
View file @ 3d2c9233
...@@ -390,8 +390,8 @@ public class AdministratorServiceImpl implements AdministratorService { ...@@ -390,8 +390,8 @@ public class AdministratorServiceImpl implements AdministratorService {
Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(), Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(),
Instant.now().toEpochMilli()); Instant.now().toEpochMilli());
if (ipCountRecord != null) { if (ipCountRecord != null) {
ipCountQueryResultDto.setIpCount_all(ipCountRecord.getIp_all()); ipCountQueryResultDto.setIpCount_yesterday_all(ipCountRecord.getIp_all());
ipCountQueryResultDto.setIpCount_using(ipCountRecord.getIp_using()); ipCountQueryResultDto.setIpCount_yesterday_using(ipCountRecord.getIp_using());
} }
} else { } else {
long ipcount_using = ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(username, false, Instant.now().toEpochMilli()); long ipcount_using = ipResourceRepository.countAllByOwnerAndIsDeletedAndValidTimeGreaterThan(username, false, Instant.now().toEpochMilli());
...@@ -402,8 +402,8 @@ public class AdministratorServiceImpl implements AdministratorService { ...@@ -402,8 +402,8 @@ public class AdministratorServiceImpl implements AdministratorService {
Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(), Instant.now().minus(1, ChronoUnit.DAYS).toEpochMilli(),
Instant.now().toEpochMilli()); Instant.now().toEpochMilli());
if (ipCountRecord != null) { if (ipCountRecord != null) {
ipCountQueryResultDto.setIpCount_all(ipCountRecord.getIp_all()); ipCountQueryResultDto.setIpCount_yesterday_all(ipCountRecord.getIp_all());
ipCountQueryResultDto.setIpCount_using(ipCountRecord.getIp_using()); ipCountQueryResultDto.setIpCount_yesterday_using(ipCountRecord.getIp_using());
} }
} }
......
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