excel conflict

admin-console/pom.xml

@@ -12,12 +12,19 @@
 	</parent>
 
 	<dependencies>
+		<!--   会和jxls 冲突？还是需要配置一种具体实现
+		<dependency>
+			<groupId>org.jxls</groupId>
+			<artifactId>jxls-reader</artifactId>
+			<version>2.0.3</version>
+		</dependency>
+		-->
 		<dependency>
 			<groupId>org.jxls</groupId>
 			<artifactId>jxls</artifactId>
 			<version>2.4.3</version>
 		</dependency>
-		<dependency>
+				<dependency>
 			<groupId>org.jxls</groupId>
 			<artifactId>jxls-poi</artifactId>
 			<version>1.0.14</version>

admin-console/src/main/java/com/ibeetl/admin/console/service/DictConsoleService.java

 package com.ibeetl.admin.console.service;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.ibeetl.admin.console.dao.DictConsoleDao;
-import com.ibeetl.admin.console.web.dto.UserExcelData;
 import com.ibeetl.admin.core.entity.CoreDict;
 import com.ibeetl.admin.core.entity.CoreUser;
-import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.BaseService;
 import com.ibeetl.admin.core.util.PlatformException;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 
 /**
  * CoreDict Service
@@ -50,5 +45,9 @@ public class DictConsoleService extends BaseService<CoreDict>{
         
     }
     
+    public void batchInsert(List<CoreDict> list) {
+        dictDao.insertBatch(list);
+    }
+    
     
 }
\ No newline at end of file

admin-console/src/main/java/com/ibeetl/admin/console/web/DictConsoleController.java

@@ -3,11 +3,8 @@ package com.ibeetl.admin.console.web;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,9 +12,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.sql.core.engine.PageQuery;
 import org.jxls.common.Context;
-//import org.jxls.reader.ReaderBuilder;
-//import org.jxls.reader.XLSReadStatus;
-//import org.jxls.reader.XLSReader;
 import org.jxls.util.JxlsHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -177,10 +171,11 @@ public class DictConsoleController{
 //        XLSReader mainReader = ReaderBuilder.buildFromXML( inputXML );  
 //        InputStream inputXLS = ins;  
 //    
-//        List<CoreDict> dict = new ArrayList<CoreDict>();  
+//        List<CoreDict> dicts = new ArrayList<CoreDict>();  
 //        Map beans = new HashMap();  
-//        beans.put("list", dict);
+//        beans.put("list", dicts);
 //        XLSReadStatus readStatus = mainReader.read( inputXLS, beans); 
+//        System.out.println(dicts);
         return JsonResult.success();
         
     }

admin-console/src/main/resources/excelTemplates/admin/dict/dict_mapping.xml

 <?xml version="1.0" encoding="utf-8"?>
 <workbook>
-	<worksheet name="Sheet1">
-		<section startRow="0" endRow="0">
-		</section>
-		<loop startRow="1" endRow="1" items="list" var="dict"
-			varType="com.ibeetl.admin.entity.CoreDict">
+	<worksheet name="Template">
+		<loop startRow="3" endRow="3" items="list" var="dict"
+			varType="com.ibeetl.admin.core.entity.CoreDict">
 			<section startRow="3" endRow="3">
-				<mapping row="3" col="0"></mapping>
-				<mapping row="1" col="1">dict.name</mapping>
-				<mapping row="1" col="2">dict.value</mapping>
+				<mapping row="3" col="1">dict.name</mapping>
+				<mapping row="3" col="2">dict.value</mapping>
 			</section>
 			<loopbreakcondition>
 				<rowcheck offset="0">