修改元数据excel导入

Author: yangxiao0320

MT Maven Webapp/src/main/java/com/x8/mt/controller/MetadataManagementController.java

@@ -6,6 +6,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -220,11 +221,9 @@ public JSONObject exportProtocolMetadataToJSONFile(HttpServletRequest request, H
 		GlobalMethodAndParams.setHttpServletResponse(request, response);
 
 		String protocolId = request.getParameter("protocolId");
-		protocolId = new String(protocolId.getBytes("iso8859-1"),"utf-8");
 
 		String filename =request.getParameter("filename");
-		filename = new String(filename.getBytes("iso8859-1"),"utf-8");
-
+		
 		JSONObject protocolMetadata = externalInterfaceService.getProtocolMetadataByprotocolId(protocolId);
 
 		if(protocolMetadata==null){

MT Maven Webapp/src/main/java/com/x8/mt/service/MetadataManagementService.java

@@ -873,11 +873,13 @@ private List<Map<String, Object>> TraverseBoolean(List<Map<String, Object>> list
 	@Transactional
 	public void importExcelFileProtocolMetadata(XSSFSheet sheet,String protocolId) throws Exception {
 		int rowNum = 1;
-		while((sheet.getRow(rowNum).getCell(0)!=null)
+
+		while((sheet.getRow(rowNum)!=null)
+				&&(sheet.getRow(rowNum).getCell(0)!=null)
 				&&(rowNum<=sheet.getLastRowNum())
 				&&(sheet.getRow(rowNum).getCell(GlobalMethodAndParams.excel_TypeTag_CellNum).toString().equals(GlobalMethodAndParams.excel_TypeTag_Array)
 						||sheet.getRow(rowNum).getCell(GlobalMethodAndParams.excel_TypeTag_CellNum).toString().equals(GlobalMethodAndParams.excel_TypeTag_Param))){
-			
+			//System.out.println(rowNum);
 			Row row=sheet.getRow(rowNum);
 			if(row.getCell(GlobalMethodAndParams.excel_TypeTag_CellNum).toString().equals(GlobalMethodAndParams.excel_TypeTag_Array)){//参数组
 				int paramArrayMetadataId = addExcelParamArrayMetadata(row,protocolId);