代码清理

src/main/java/com/hb/proj/data/controller/WellDataController.java

@@ -159,32 +159,4 @@ public class WellDataController {
 	}
 	
 	
-	/**  查询优化方式1
-	private List<Map<String,Object>> buildGridDatas(List<SingleDataVO> mainDatas,Map<String,Map<Long,SingleDataVO>> othDataMapping,List<WellParamPO> params) {
-		List<Map<String,Object>> rstDatas=new ArrayList<>(mainDatas.size());
-		Map<String,Object> itm=null;
-		SingleDataVO vo=null;
-		for(SingleDataVO mdata : mainDatas) {
-			itm=new HashMap<>(params.size()+1);
-			rstDatas.add(itm);
-			for(WellParamPO wp : params) {
-				if(SortCodeConstant.PARAM_FREQ.equals(wp.getParamCode())) { 
-					itm.put("gatherTime", mdata.getGatherTime());
-					itm.put(wp.getParamCode(), mdata.getDispDataVal());
-				}
-				else {
-					vo=othDataMapping.get(wp.getParamCode()).get(mdata.getGatherTime().getTime());
-					itm.put(wp.getParamCode(), vo!=null?vo.getDispDataVal():null);
-				}
-			}
-		}
-		
-		return rstDatas;
-	}
-	
-	private Map<Long,SingleDataVO> buildMapping(List<SingleDataVO> datas){
-		Map<Long,SingleDataVO> mapping=new HashMap<>(datas.size());
-		datas.forEach(data->{mapping.put(data.getGatherTime().getTime(), data);});
-		return mapping;
-	}*/
 }