Skip to content

H
haoban-manage3.0
Commit f067cab1 by fudahua
Options

Merge remote-tracking branch 'origin/developer' into developer

parents d80029a5 47e337cb
Showing with 55 additions and 23 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDataController.java
......@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.gic.cloud.common.api.base.Page;
......@@ -60,6 +61,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
public HaobanResponse cloudGrouplistPid(String enterpriseId) {
Map<String, Object> returnMap = new HashMap<String, Object>();
List<CloudStoreGroupDTO> list = cloudStoreGroupService.queryAllStoreGroupByStoreGroupId(enterpriseId);
if(CollectionUtil.isEmpty(list)){
list = new ArrayList<>();
}
returnMap.put("list", list);
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
}
......@@ -107,7 +111,10 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
}
for(HaobanLoginInfoDTO dto : resultList){
dto.setAvgVisitTime((double)dto.getStayTime()/dto.getLoginClerkCnt()+"");
dto.setAvgLoginTimes((double)dto.getLoginClerkTimes()/dto.getLoginClerkCnt()+"");
dto.setAvgLoginTimes(dto.getLoginClerkTimes()/dto.getLoginClerkCnt()+"");
}
if(CollectionUtil.isEmpty(resultList)){
resultList = new ArrayList<>();
}
returnMap.put("result", resultList) ;
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
......@@ -118,6 +125,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
paramsDTO.setWebFlag(1);
Map<String, Object> returnMap = new HashMap<String, Object>();
List<AreaLoginDTO> list = maidianDataService.areaLoginRanking(paramsDTO);
if(CollectionUtil.isEmpty(list)){
list = new ArrayList<>();
}
returnMap.put("result", list) ;
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
}
......@@ -130,6 +140,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
//近7日
List<AdsGicLogHaobanStoreLoginDDTO> list = maidianDataService.totalLoginData(paramsDTO);
resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, list);
if(CollectionUtil.isEmpty(resultList)){
resultList = new ArrayList<>();
}
returnMap.put("result", resultList) ;
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
}
......@@ -138,10 +151,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
@RequestMapping("/activite-list")
public HaobanResponse activiteList(MemberAnalyzeParamsDTO paramsDTO) {
paramsDTO.setWebFlag(1);
Map<String, Object> returnMap = new HashMap<String, Object>();
List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, page);
return resultResponse(HaoBanErrCode.ERR_1,page);
}
......@@ -149,24 +159,22 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
@RequestMapping("/export-activite-list")
public HaobanResponse exportActiviteList(HttpServletRequest request,HttpServletResponse response,MemberAnalyzeParamsDTO paramsDTO) {
paramsDTO.setWebFlag(1);
Map<String, Object> returnMap = new HashMap<String, Object>();
List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
paramsDTO.setCurrentPage(1);
paramsDTO.setPageSize(Integer.MAX_VALUE);
Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, page);
List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","激活状态");
List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "activationStatus");
try {
ExcelUtils.xls(response, request, "详情报表", resultList, fileList, titleList);
ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
} catch (Exception e) {
logger.info(e.getMessage(),e);
}
return resultResponse(HaoBanErrCode.ERR_1);
}
//登陆明细-明细列表
@RequestMapping("/login-detail-list")
public HaobanResponse loginDetailList(MemberAnalyzeParamsDTO paramsDTO) {
//导出-登陆明细-明细列表
@RequestMapping("/export-login-detail-list")
public HaobanResponse exportLoginDetailList(HttpServletRequest request,HttpServletResponse response,MemberAnalyzeParamsDTO paramsDTO) {
paramsDTO.setWebFlag(1);
//默认排序
if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
......@@ -175,14 +183,34 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
if(StringUtils.isEmpty(paramsDTO.getSortType())) {
paramsDTO.setSortType("desc");
}
paramsDTO.setCurrentPage(1);
paramsDTO.setPageSize(Integer.MAX_VALUE);
Map<String, Object> returnMap = new HashMap<String, Object>();
Page<HaobanClerkLoginDTO> page= maidianDataService.pageClerkLogin(paramsDTO);
returnMap.put("result", page) ;
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
if(paramsDTO.getLoginStatus() == 1){
//已登陆
try {
List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","登陆次数","平均访问总时长");
List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "loginTimes", "avgVisitTimeString");
ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
} catch (Exception e) {
logger.info(e.getMessage(),e);
}
}else{
//未登陆
try {
List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间");
List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime");
ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
} catch (Exception e) {
logger.info(e.getMessage(),e);
}
}
return resultResponse(HaoBanErrCode.ERR_1);
}
//导出-登陆明细-明细列表
@RequestMapping("/export-login-detail-list")
public HaobanResponse exportLoginDetailList(MemberAnalyzeParamsDTO paramsDTO) {
//登陆明细-明细列表
@RequestMapping("/login-detail-list")
public HaobanResponse loginDetailList(MemberAnalyzeParamsDTO paramsDTO) {
paramsDTO.setWebFlag(1);
//默认排序
if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
......@@ -191,9 +219,6 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
if(StringUtils.isEmpty(paramsDTO.getSortType())) {
paramsDTO.setSortType("desc");
}
paramsDTO.setCurrentPage(1);
paramsDTO.setPageSize(Integer.MAX_VALUE);
Map<String, Object> returnMap = new HashMap<String, Object>();
Page<HaobanClerkLoginDTO> page= maidianDataService.pageClerkLogin(paramsDTO);
returnMap.put("result", page) ;
......@@ -220,6 +245,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
if(StringUtils.isEmpty(paramsDTO.getSortType())) {
paramsDTO.setSortType("desc");
}
paramsDTO.setAreaType("store");
Map<String, Object> returnMap = new HashMap<String, Object>();
Page<AreaLoginDTO> page = maidianDataService.areaRankingList(paramsDTO);
returnMap.put("result", page) ;
......@@ -228,7 +254,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
//导出-区域排行-区域列表
@RequestMapping("/export-area-ranking-list")
public HaobanResponse exportAreaRankingList(MemberAnalyzeParamsDTO paramsDTO) {
public HaobanResponse exportAreaRankingList(HttpServletRequest request,HttpServletResponse response,MemberAnalyzeParamsDTO paramsDTO) {
paramsDTO.setWebFlag(1);
//默认排序
if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
......@@ -237,11 +263,17 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
if(StringUtils.isEmpty(paramsDTO.getSortType())) {
paramsDTO.setSortType("desc");
}
paramsDTO.setAreaType("store");
paramsDTO.setCurrentPage(1);
paramsDTO.setPageSize(Integer.MAX_VALUE);
Map<String, Object> returnMap = new HashMap<String, Object>();
Page<AreaLoginDTO> page = maidianDataService.areaRankingList(paramsDTO);
returnMap.put("result", page) ;
return resultResponse(HaoBanErrCode.ERR_1,returnMap);
List<String> titleList = Arrays.asList( "门店名称","门店code","分组名称","登陆率","登陆人数");
List<String> fileList = Arrays.asList("xName", "storeCode", "storeGroupName", "loginRate", "loginClerkCnt");
try {
ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
} catch (Exception e) {
logger.info(e.getMessage(),e);
}
return resultResponse(HaoBanErrCode.ERR_1);
}
}
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