pipIrr-SV.git - Gitblit

			@@ -83,7 +83,7 @@
			* @return
			*/
			public QueryResultVo<List<VoBlock>> getBlocks(QueryVo vo){
			vo.setPageCurr((vo.pageCurr -1) * vo.pageSize);
			vo.setPageCurr((vo.getPageCurr() -1) * vo.getPageSize());
			Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
			Long itemTotal = this.dao.getBlocksCount(params) ;

			@@ -93,12 +93,13 @@
			// 获取片区列表
			List<VoBlock> list_blocks = this.dao.getBlocks(params);
			if(list_blocks != null && list_blocks.size() > 0) {
			//JSONArray array_blocks = (JSONArray) JSON.toJSON(list_blocks);
			array_blocks = (JSONArray) JSON.toJSON(list_blocks);
			for (int i = 0; i < array_blocks.size(); i++) {
			JSONObject job_block = array_blocks.getJSONObject(i);
			Long blockId = job_block.getLong("id");

			// 处理一个新的片区前清空graphs，避免上一个片区的graphs存留数据造成数据错误
			array_mapGraphs = null;
			// 根据片区ID获取地图图形列表
			List<VoMapGraph> list_mapGraphs = this.dao.gertMapGraphsByBlockId(blockId);
			if(list_mapGraphs != null && list_mapGraphs.size() > 0) {
			@@ -113,17 +114,22 @@
			List<VoMapCoordinates> list_mapCoordinates = this.dao.getCoordinatesByGraphId(graphId);
			if(list_mapCoordinates != null && list_mapCoordinates.size() > 0) {
			JSONArray array_mapCoordinates = (JSONArray) JSON.toJSON(list_mapCoordinates);
			job_mapGraph.put("coordinates", array_mapCoordinates);
			String cc= "";

			JSONArray[] arrays = new JSONArray[1];
			arrays[0] = array_mapCoordinates;
			job_mapGraph.put("coordinates", arrays);
			}
			}
			}

			// 将地图图形数组添加到片区中
			if(array_mapGraphs != null && array_mapGraphs.size() > 0) {
			job_block.put("graph", array_mapGraphs);
			job_block.put("graphs", array_mapGraphs);
			}
			}
			}else {//增加健壮性
			QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
			return rsVo ;
			}

			QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;