org fix

admin-console/pom.xml

@@ -12,37 +12,14 @@
 	</parent>
 
 	<dependencies>
-		<!--   会和jxls 冲突？还是需要配置一种具体实现-->
-		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
-		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi</artifactId>
-		    <version>3.17</version>
-		</dependency>
-		
-		<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>
-			<groupId>org.jxls</groupId>
-			<artifactId>jxls-poi</artifactId>
-			<version>1.0.14</version>
-		</dependency>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
 			<version>1.0</version>
 		</dependency>
 	</dependencies>
-	
+
 
 
 </project>

admin-console/src/main/resources/static/js/admin/org/add.js

@@ -10,10 +10,11 @@ layui.define([ 'form', 'laydate', 'table','orgApi'], function(exports) {
 			initSubmit:function(){
 				$("#saveOrg").click(function(){
 					orgApi.addOrg($('#addForm'),function(){
+						parent.window.dataReload();
 						Common.info("添加成功");
 						Lib.closeFrame();
 					});
-					parent.window.dataReload();
+					
 					
 				});
 				

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java

 package com.ibeetl.admin.core.service;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.ibeetl.admin.core.dao.CoreDictDao;
 import com.ibeetl.admin.core.entity.CoreDict;
-import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.enums.DelFlagEnum;
 
 /**
@@ -85,6 +83,16 @@ public class CoreDictService extends BaseService<CoreDict> {
  	   return null;
     }
     
+    /*通过名字反向查找数据字典，通常用于excel导入*/
+    public Map<String,CoreDict> mapDictByName(String type){
+        List<CoreDict> list = self.findAllByType(type);
+        Map<String,CoreDict> map = new HashMap<String,CoreDict>();
+        for(CoreDict dict:list) {
+            map.put(dict.getName(), dict);
+        }
+        return  map;
+    }
+    
    
     
    /*递归查找*/ 

admin-core/src/main/java/com/ibeetl/admin/core/util/doc/BeetlExpressionEvaluator.java

+package com.ibeetl.admin.core.util.doc;
+
+import java.util.Map;
+
+import org.jxls.expression.ExpressionEvaluator;
+
+public class BeetlExpressionEvaluator implements ExpressionEvaluator{
+
+    @Override
+    public Object evaluate(String expression, Map<String, Object> context) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Object evaluate(Map<String, Object> context) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getExpression() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}

admin-core/src/main/resources/static/js/common.js

@@ -12,6 +12,8 @@ var Common = {
         parent.layer.msg(info, {
             icon: iconIndex
         });
+        
+        
     },
     info: function (info) {
         Common.alert(info, 0);
@@ -20,7 +22,7 @@ var Common = {
         Common.alert(info, 1);
     },
     error: function (info) {
-        Common.alert(info, 2);
+    		Common.openConfirm(info)
     },
     post: function (url, paras, next) {
     		$.ajax({
@@ -29,7 +31,7 @@ var Common = {
     			data:paras,
     			success:function(rsp){
     				if(rsp.code!=0){
-    					Common.alert(rsp.msg);
+    					Common.error(rsp.msg);
     					
     				}else{
     					//成功
@@ -42,7 +44,7 @@ var Common = {
     				
     			},
     			error:function(rsp){
-    				Common.alert(rsp.responseJSON.msg);
+    				Common.error(rsp.responseJSON.msg);
     			}
     		})
        

doc/starter-oracle.sql

@@ -28,6 +28,11 @@ prompt Dropping CORE_USER...
 drop table CORE_USER cascade constraints;
 prompt Dropping CORE_USER_ROLE...
 drop table CORE_USER_ROLE cascade constraints;
+
+CREATE SEQUENCE AUDIT_SEQ INCREMENT BY 1 MINVALUE 3000 NOCYCLE NOCACHE NOORDER  ;
+CREATE SEQUENCE CORE_SEQ INCREMENT BY 1 MINVALUE 3000 NOCYCLE NOCACHE NOORDER  ;
+
+
 prompt Creating CMS_BLOG...
 create table CMS_BLOG
 (

pom.xml

@@ -92,6 +92,38 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
+		
+		<!-- 会和jxls 冲突？还是需要配置一种具体实现 -->
+		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
+		</dependency>
+
+
+		<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>
+			<groupId>org.jxls</groupId>
+			<artifactId>jxls-poi</artifactId>
+			<version>1.0.14</version>
+		</dependency>
 
 	</dependencies>