11

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/MaidianDataController.java

@@ -36,7 +36,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
 	private MaidianDataService maidianDataService;
 	@Autowired
 	private CloudStoreGroupService cloudStoreGroupService;
-	//首页-企业概况
+	//首页-分组列表
     @RequestMapping("/cloud-grouplist-pid")
     public HaobanResponse cloudGrouplistPid(String enterpriseId) {
         Map<String, Object> returnMap = new HashMap<String, Object>();
@@ -47,6 +47,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
 	//首页-企业概况
     @RequestMapping("/total-activation-data")
     public HaobanResponse totalActivationData(MemberAnalyzeParamsDTO paramsDTO) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         AdsGicLogHaobanStoreLoginDDTO dto = maidianDataService.totalActivationData(paramsDTO);
         returnMap.put("loginClerkCnt", dto.getLoginClerkCnt()) ;
@@ -61,6 +62,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     //首页-好办登陆信息总人数概况
     @RequestMapping("/total-login-data")
     public HaobanResponse totalLoginData(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         if(datesType == 1){
@@ -82,6 +84,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     //首页-区域排行
     @RequestMapping("/area-login-ranking")
     public HaobanResponse areaLoginRanking(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaLoginRanking(paramsDTO);
         returnMap.put("result", list) ;
@@ -90,6 +93,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     //激活明细-激活趋势图
     @RequestMapping("/activite-date")
     public HaobanResponse activiteDate(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         //近7日
@@ -102,6 +106,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     //激活明细-激活列表
     @RequestMapping("/activite-list")
     public HaobanResponse activiteList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
@@ -110,10 +115,24 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
 
     }
-    
+    //导出-激活明细-激活列表
+    @RequestMapping("/export-activite-list")
+    public HaobanResponse exportActiviteList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	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);
+        returnMap.put("result", resultList) ;
+    	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
+
+    }
     //登陆明细-明细列表
     @RequestMapping("/login-detail-list")
     public HaobanResponse loginDetailList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
     	//默认排序
     	if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
     		paramsDTO.setSortColumn("lastLoginTime");
@@ -126,10 +145,29 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         returnMap.put("result", page) ;
     	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
     }
-    
+    //导出-登陆明细-明细列表
+    @RequestMapping("/export-login-detail-list")
+    public HaobanResponse exportLoginDetailList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
+    	//默认排序
+    	if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
+    		paramsDTO.setSortColumn("lastLoginTime");
+    	}
+    	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);
+    }
     //区域排行-区域图表
     @RequestMapping("area-ranking-date")
     public HaobanResponse areaRankingDate(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaRankingDate(paramsDTO);
         returnMap.put("result", list) ;
@@ -139,6 +177,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     //区域排行-区域列表
     @RequestMapping("/area-ranking-list")
     public HaobanResponse areaRankingList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
     	//默认排序
     	if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
     		paramsDTO.setSortColumn("loginRate");
@@ -151,5 +190,23 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         returnMap.put("result", page) ;
     	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
     }
-
+    
+    //导出-区域排行-区域列表
+    @RequestMapping("/export-area-ranking-list")
+    public HaobanResponse exportAreaRankingList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    	paramsDTO.setWebFlag(1);
+    	//默认排序
+    	if(StringUtils.isEmpty(paramsDTO.getSortColumn())) {
+    		paramsDTO.setSortColumn("loginRate");
+    	}
+    	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<AreaLoginDTO> page = maidianDataService.areaRankingList(paramsDTO);
+        returnMap.put("result", page) ;
+    	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
+    }
 }