【大屏展示】-【集合添加判断】-（王童）-2020/9/9

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/DataStatsScreencollServiceImpl.java

@@ -52,16 +52,18 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 		}
 
 		List<List<EventdataResultDTO>> formList = fixedGrouping(list,1000);
-		for(int i = 0 ; i < formList.size() ; i++){
+		if (formList != null && formList.size()>0) {
-			// 将list转换为json格式
+			for (int i = 0; i < formList.size(); i++) {
-			EventdataDTO result = new EventdataDTO();
+				// 将list转换为json格式
-			result.setDataList(formList.get(i));
+				EventdataDTO result = new EventdataDTO();
-			if(i == 0){
+				result.setDataList(formList.get(i));
-				result.setIsFirst(true);
+				if (i == 0) {
+					result.setIsFirst(true);
+				}
+				String json = JSONObject.toJSONString(result);
+				String body = epmetUtils.httpPost("/data/stats/screencoll/eventdata", json);
+				log.info(body);
 			}
-			String json = JSONObject.toJSONString(result);
-			String body = epmetUtils.httpPost("/data/stats/screencoll/eventdata", json);
-			log.info(body);
 		}
 		return null;
 	}
@@ -106,17 +108,19 @@ public class DataStatsScreencollServiceImpl extends BaseServiceImpl<DataStatsScr
 	public Result meetdata() {
 		List<MeetdataResultDTO> list = baseDao.meetdata();
 		List<List<MeetdataResultDTO>> formList = fixedGrouping(list,1000);
-		for(int i = 0 ; i < formList.size() ; i++){
+		if (formList != null && formList.size()>0) {
-			// 将list转换为json格式
+			for (int i = 0; i < formList.size(); i++) {
-			MeetdataDTO result = new MeetdataDTO();
+				// 将list转换为json格式
-			result.setDataList(formList.get(i));
+				MeetdataDTO result = new MeetdataDTO();
-			result.setMonthId(formList.get(i).get(0).getMonthId());
+				result.setDataList(formList.get(i));
-			if(i == 0){
+				result.setMonthId(formList.get(i).get(0).getMonthId());
-				result.setIsFirst(true);
+				if (i == 0) {
+					result.setIsFirst(true);
+				}
+				String json = JSONObject.toJSONString(result);
+				String body = epmetUtils.httpPost("/data/stats/screencoll/meetdata", json);
+				log.info(body);
 			}
-			String json = JSONObject.toJSONString(result);
-			String body = epmetUtils.httpPost("/data/stats/screencoll/meetdata", json);
-			log.info(body);
 		}
 		return null;
 	}