Commit b38dff3e authored by renjie's avatar renjie

ip状态bug

parent 207d6de0
......@@ -472,21 +472,23 @@ public class IpResourceServiceImpl implements IpResourceService {
else
shopDto = new ShopDto();
}
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
x.setStatus(2);
ipResourceRepository.save(x);
}
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
deleteIp(username, Arrays.asList(x.getAddr()));
return;
}
else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
x.setStatus(1);
ipResourceRepository.save(x);
}
else {
x.setStatus(0);
ipResourceRepository.save(x);
if (StringUtils.isNotBlank(x.getAddr())) {
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
x.setStatus(2);
ipResourceRepository.save(x);
}
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
deleteIp(username, Arrays.asList(x.getAddr()));
return;
}
else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
x.setStatus(1);
ipResourceRepository.save(x);
}
else {
x.setStatus(0);
ipResourceRepository.save(x);
}
}
ipResourceDtos.add(new IpResourceDto(x, shopDto));
});
......@@ -503,21 +505,23 @@ public class IpResourceServiceImpl implements IpResourceService {
else
shopDto = new ShopDto();
}
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
x.setStatus(2);
ipResourceRepository.save(x);
}
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
deleteIp(username, Arrays.asList(x.getAddr()));
return;
}
else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
x.setStatus(1);
ipResourceRepository.save(x);
}
else {
x.setStatus(0);
ipResourceRepository.save(x);
if (StringUtils.isNotBlank(x.getAddr())) {
if (x.getValidTime() <= Instant.now().plusSeconds(60*60*24*7).toEpochMilli() && x.getValidTime() >Instant.now().toEpochMilli()) {
x.setStatus(2);
ipResourceRepository.save(x);
}
else if (x.getValidTime() <= Instant.now().minusSeconds(60*60*24*7).toEpochMilli()) {
deleteIp(username, Arrays.asList(x.getAddr()));
return;
}
else if (x.getValidTime() <= Instant.now().toEpochMilli()) {
x.setStatus(1);
ipResourceRepository.save(x);
}
else {
x.setStatus(0);
ipResourceRepository.save(x);
}
}
ipResourceDtos.add(new IpResourceDto(x, shopDto));
});
......
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