111

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);
     }
@@ -109,6 +113,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         	dto.setAvgVisitTime((double)dto.getStayTime()/dto.getLoginClerkCnt()+"");
         	dto.setAvgLoginTimes((double)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);
 
     }
@@ -245,7 +255,6 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     	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);
 		List<String> titleList = Arrays.asList( "门店名称","门店code","分组名称","登陆率","登陆人数");
 		List<String> fileList = Arrays.asList("xName", "storeCode", "storeGroupName", "loginRate", "loginClerkCnt");