Commit 4cdeb0e2 authored by renjie's avatar renjie

ip数量统计

parent ba2f33d5
...@@ -369,6 +369,24 @@ public class AdministratorController { ...@@ -369,6 +369,24 @@ public class AdministratorController {
return resultDto; return resultDto;
} }
//添加推广码
@PreAuthorize(Securitys.ADMIN_EL)
@RequestMapping(path = "/0xadministrator/ip/count", method = RequestMethod.GET)
public ResultDto getIpCount(Principal principal, @RequestParam(value = "username", defaultValue = "") String username) {
ResultDto resultDto = new ResultDto();
try {
resultDto.setData(administratorService.queyrIpCount(username));
resultDto.setStatus(0);
}catch (ClientRequestException e) {
resultDto.setStatus(-1);
Map<String, Object> statusInfo = new HashMap<>();
statusInfo.put("code", e.getErrorCode());
statusInfo.put("message", e.getMessage());
resultDto.setStatusInfo(statusInfo);
}
return resultDto;
}
} }
......
package com.edgec.browserbackend.account.dto;
public class IpCountQueryResultDto {
long IpCount_using;
long IpCount_all;
public long getIpCount_all() {
return IpCount_all;
}
public void setIpCount_all(long ipCount_all) {
IpCount_all = ipCount_all;
}
public long getIpCount_using() {
return IpCount_using;
}
public void setIpCount_using(long ipCount_using) {
IpCount_using = ipCount_using;
}
}
...@@ -2,6 +2,9 @@ package com.edgec.browserbackend.account.service; ...@@ -2,6 +2,9 @@ package com.edgec.browserbackend.account.service;
import com.edgec.browserbackend.account.domain.*; import com.edgec.browserbackend.account.domain.*;
import com.edgec.browserbackend.account.dto.BillQueryResultDto; import com.edgec.browserbackend.account.dto.BillQueryResultDto;
import com.edgec.browserbackend.account.dto.IpCountQueryResultDto;
import com.edgec.browserbackend.browser.domain.IpResource;
import com.edgec.browserbackend.browser.dto.IpResourceDto;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
...@@ -49,4 +52,6 @@ public interface AdministratorService { ...@@ -49,4 +52,6 @@ public interface AdministratorService {
boolean userbillingTransfer(); boolean userbillingTransfer();
void addPromotionCode(String username, String promotionCode); void addPromotionCode(String username, String promotionCode);
IpCountQueryResultDto queyrIpCount(String username);
} }
...@@ -2,10 +2,12 @@ package com.edgec.browserbackend.account.service.impl; ...@@ -2,10 +2,12 @@ package com.edgec.browserbackend.account.service.impl;
import com.edgec.browserbackend.account.domain.*; import com.edgec.browserbackend.account.domain.*;
import com.edgec.browserbackend.account.dto.BillQueryResultDto; import com.edgec.browserbackend.account.dto.BillQueryResultDto;
import com.edgec.browserbackend.account.dto.IpCountQueryResultDto;
import com.edgec.browserbackend.account.exception.AccountErrorCode; import com.edgec.browserbackend.account.exception.AccountErrorCode;
import com.edgec.browserbackend.account.repository.*; import com.edgec.browserbackend.account.repository.*;
import com.edgec.browserbackend.account.service.AdministratorService; import com.edgec.browserbackend.account.service.AdministratorService;
import com.edgec.browserbackend.auth.service.UserAuthService; import com.edgec.browserbackend.auth.service.UserAuthService;
import com.edgec.browserbackend.browser.repository.IpResourceRepository;
import com.edgec.browserbackend.common.commons.error.ClientRequestException; import com.edgec.browserbackend.common.commons.error.ClientRequestException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -50,6 +52,9 @@ public class AdministratorServiceImpl implements AdministratorService { ...@@ -50,6 +52,9 @@ public class AdministratorServiceImpl implements AdministratorService {
@Autowired @Autowired
private UserAuthService userAuthService; private UserAuthService userAuthService;
@Autowired
private IpResourceRepository ipResourceRepository;
@Override @Override
public Administrator createAdministrator(Administrator administrator) { public Administrator createAdministrator(Administrator administrator) {
Administrator administrator1 = new Administrator(); Administrator administrator1 = new Administrator();
...@@ -336,6 +341,23 @@ public class AdministratorServiceImpl implements AdministratorService { ...@@ -336,6 +341,23 @@ public class AdministratorServiceImpl implements AdministratorService {
account.setPromotionCode(promotionCode); account.setPromotionCode(promotionCode);
accountRepository.save(account); accountRepository.save(account);
} }
@Override
public IpCountQueryResultDto queyrIpCount(String username) {
IpCountQueryResultDto ipCountQueryResultDto = new IpCountQueryResultDto();
if (StringUtils.isBlank(username)) {
long ipcount_using = ipResourceRepository.countAllByIsDeleted(false);
long ipcount_all = ipResourceRepository.count();
ipCountQueryResultDto.setIpCount_using(ipcount_using);
ipCountQueryResultDto.setIpCount_all(ipcount_all);
} else {
long ipcount_using = ipResourceRepository.countAllByOwnerAndIsDeleted(username, false);
long ipcount_all = ipResourceRepository.countAllByOwner(username);
ipCountQueryResultDto.setIpCount_using(ipcount_using);
ipCountQueryResultDto.setIpCount_all(ipcount_all);
}
return ipCountQueryResultDto;
}
} }
......
...@@ -33,4 +33,9 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String ...@@ -33,4 +33,9 @@ public interface IpResourceRepository extends MongoRepository<IpResource, String
IpResource findByShopIdAndIsDeleted(String shopId, boolean isDeleted); IpResource findByShopIdAndIsDeleted(String shopId, boolean isDeleted);
int countByStatusAndIdInAndIsDeleted(int status, List<String> ipIds, boolean isDeleted); int countByStatusAndIdInAndIsDeleted(int status, List<String> ipIds, boolean isDeleted);
long countAllByIsDeleted(boolean isDeleted);
long countAllByOwnerAndIsDeleted(String username, boolean isDeleted);
long countAllByOwner(String username);
} }
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