导入表头升序处理

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -214,7 +214,7 @@ public class ResourceController {
         logger.info("上传文件：" + uploadFile.getOriginalFilename());
         String format = sdf.format(new Date());
         File folder = new File(uploadPath + "upload" + File.separator + format);
-        logger.info(uploadPath + format);
+        logger.info(folder.getPath());
         if (!folder.isDirectory()) {
             folder.mkdirs();
         }

renren-admin/src/main/java/io/renren/modules/resource/excel/ResourceExcelImportListener.java

@@ -320,7 +320,7 @@ public class ResourceExcelImportListener extends AnalysisEventListener<Map<Integ
 
                 infoList.add(attrEntity);
 
-                this.headMap.keySet().stream().skip(6).forEach(key -> { // 表头后6个
+                this.headMap.keySet().stream().sorted().skip(6).forEach(key -> { // 表头后6个
                     AttrEntity attrEntity_ = new AttrEntity();
                     attrEntity_.setAttrType(this.headMap.get(key));
                     attrEntity_.setAttrValue(date.get(key));
@@ -332,7 +332,7 @@ public class ResourceExcelImportListener extends AnalysisEventListener<Map<Integ
                 resourceDTO.setType("基础设施");
                 resourceDTO.setName(date.get(0));
 
-                this.headMap.keySet().stream().skip(1).forEach(key -> { // 表头后1个
+                this.headMap.keySet().stream().sorted().skip(1).forEach(key -> { // 表头后1个
                     AttrEntity attrEntity_ = new AttrEntity();
                     attrEntity_.setAttrType(this.headMap.get(key));
                     attrEntity_.setAttrValue(date.get(key));