From 8c59532537af7a0cc188bbc55df79f11f206bd2b Mon Sep 17 00:00:00 2001
From: devezhao <zhaofang123@gmail.com>
Date: Wed, 27 Mar 2019 17:29:22 +0800
Subject: [PATCH] Classification and some repkg

---
 .../rebuild/server/metadata/EntityHelper.java |  2 +
 .../metadata/entityhub/DisplayType.java       |  1 +
 .../{audit => }/AuditLoggingControll.java     |  2 +-
 .../entity => admin}/DataImportControll.java  |  2 +-
 .../entityhub/ClassificationControll.java     | 45 +++++++++++++++++++
 src/main/resources/metadata-conf.xml          | 17 ++++++-
 src/main/webapp/_include/NavLeftAdmin.jsp     |  3 +-
 .../webapp/admin/classification/index.jsp     | 28 ++++++++++++
 src/main/webapp/admin/entity/field-new.jsp    |  3 +-
 .../java/com/rebuild/server/SchemaGen.java    |  3 +-
 10 files changed, 100 insertions(+), 6 deletions(-)
 rename src/main/java/com/rebuild/web/admin/{audit => }/AuditLoggingControll.java (97%)
 rename src/main/java/com/rebuild/web/{base/entity => admin}/DataImportControll.java (99%)
 create mode 100644 src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java
 create mode 100644 src/main/webapp/admin/classification/index.jsp

diff --git a/src/main/java/com/rebuild/server/metadata/EntityHelper.java b/src/main/java/com/rebuild/server/metadata/EntityHelper.java
index 3a9a717d5..d07bdddc5 100644
--- a/src/main/java/com/rebuild/server/metadata/EntityHelper.java
+++ b/src/main/java/com/rebuild/server/metadata/EntityHelper.java
@@ -139,6 +139,8 @@ public class EntityHelper {
 	public static final int ViewAddonsConfig = 15;
 	public static final int DashboardConfig = 16;
 	public static final int ChartConfig = 17;
+	public static final int Classification = 18;
+	public static final int ClassificationData = 19;
 	
 	public static final int ShareAccess = 20;
 	public static final int SystemConfig = 21;
diff --git a/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java b/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
index cc973029f..76d050614 100644
--- a/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
+++ b/src/main/java/com/rebuild/server/metadata/entityhub/DisplayType.java
@@ -42,6 +42,7 @@ public enum DisplayType {
 	PICKLIST("列表", FieldType.REFERENCE, -1, null),
 	REFERENCE("引用", FieldType.REFERENCE, -1, null),
 	AVATAR("头像", FieldType.STRING, 300, null),
+	CLASSIFICATION("分类", FieldType.REFERENCE, -1, null),
 	
 	// 待启用/内部用
 	ID("主键", FieldType.PRIMARY, -1, null),
diff --git a/src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java b/src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
similarity index 97%
rename from src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java
rename to src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
index a04b4cc58..77d875b4c 100644
--- a/src/main/java/com/rebuild/web/admin/audit/AuditLoggingControll.java
+++ b/src/main/java/com/rebuild/web/admin/AuditLoggingControll.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-package com.rebuild.web.admin.audit;
+package com.rebuild.web.admin;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java b/src/main/java/com/rebuild/web/admin/DataImportControll.java
similarity index 99%
rename from src/main/java/com/rebuild/web/base/entity/DataImportControll.java
rename to src/main/java/com/rebuild/web/admin/DataImportControll.java
index 1e80e5c5b..5519d43b0 100644
--- a/src/main/java/com/rebuild/web/base/entity/DataImportControll.java
+++ b/src/main/java/com/rebuild/web/admin/DataImportControll.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 
-package com.rebuild.web.base.entity;
+package com.rebuild.web.admin;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java b/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java
new file mode 100644
index 000000000..dd0061d0d
--- /dev/null
+++ b/src/main/java/com/rebuild/web/admin/entityhub/ClassificationControll.java
@@ -0,0 +1,45 @@
+/*
+rebuild - Building your system freely.
+Copyright (C) 2019 devezhao <zhaofang123@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package com.rebuild.web.admin.entityhub;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.rebuild.web.BasePageControll;
+
+/**
+ * TODO
+ * 
+ * @author devezhao zhaofang123@gmail.com
+ * @since 2019/03/27
+ */
+@Controller
+@RequestMapping("/admin/")
+public class ClassificationControll extends BasePageControll {
+	
+	@RequestMapping("classifications")
+	public ModelAndView pageIndex(HttpServletRequest request) throws IOException {
+		return createModelAndView("/admin/classification/index.jsp");
+	}
+}
diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml
index f19c174f9..164ea11c4 100644
--- a/src/main/resources/metadata-conf.xml
+++ b/src/main/resources/metadata-conf.xml
@@ -92,7 +92,7 @@
 		<index type="unique" field-list="belongEntity,physicalName" />
 	</entity>
 
-	<entity name="PickList" type-code="012" name-field="text" description="下拉列表配置选项">
+	<entity name="PickList" type-code="012" name-field="text" description="下拉列表字段配置选项">
 		<field name="itemId" type="primary" />
 		<field name="belongEntity" type="string" max-length="100" nullable="false" updatable="false" />
 		<field name="belongField" type="string" max-length="100" nullable="false" updatable="false" />
@@ -141,6 +141,21 @@
 		<field name="title" type="string" max-length="100" nullable="false" />
 	</entity>
 	
+	<entity name="Classification" type-code="018" name-field="name" description="分类">
+		<field name="dataId" type="primary" />
+		<field name="name" type="string" max-length="100" nullable="false" />
+		<field name="description" type="string" max-length="600" />
+	</entity>
+	
+	<entity name="ClassificationData" type-code="019" name-field="name" description="分类明细数据">
+		<field name="itemId" type="primary" />
+		<field name="dataId" type="reference" ref-entity="Classification" nullable="false" cascade="delete" />
+		<field name="code" type="string" max-length="50" />
+		<field name="name" type="string" max-length="100" nullable="false" />
+		<field name="parent" type="reference" ref-entity="ClassificationData" />
+		<index field-list="parent,name,code"/>
+	</entity>
+	
 	<entity name="ShareAccess" type-code="020" description="记录共享">
 		<field name="accessId" type="primary" />
 		<field name="belongEntity" type="string" max-length="100" nullable="false" updatable="false" description="哪个实体" />
diff --git a/src/main/webapp/_include/NavLeftAdmin.jsp b/src/main/webapp/_include/NavLeftAdmin.jsp
index e0c539ce0..67c2ed993 100644
--- a/src/main/webapp/_include/NavLeftAdmin.jsp
+++ b/src/main/webapp/_include/NavLeftAdmin.jsp
@@ -27,8 +27,9 @@
 					</li>
 					<li class="divider">业务/实体</li>
 					<li class="${param['activeNav'] == 'entities' ? 'active' : ''}"><a href="${baseUrl}/admin/entities"><i class="icon zmdi zmdi-widgets"></i><span>实体管理</span></a></li>
-					<li class="${param['activeNav'] == 'data-importer' ? 'active' : ''}"><a href="${baseUrl}/admin/dataio/importer"><i class="icon zmdi zmdi-cloud-upload"></i><span>数据导入</span></a></li>
+					<li class="${param['activeNav'] == 'classifications' ? 'active' : ''}"><a href="${baseUrl}/admin/classifications"><i class="icon zmdi zmdi-layers"></i><span>分类数据</span></a></li>
 					<li class="${param['activeNav'] == 'audit-logging' ? 'active' : ''} hide"><a href="${baseUrl}/admin/audit-logging"><i class="icon zmdi zmdi-assignment-check"></i><span>数据审计</span></a></li>
+					<li class="${param['activeNav'] == 'data-importer' ? 'active' : ''}"><a href="${baseUrl}/admin/dataio/importer"><i class="icon zmdi zmdi-cloud-upload"></i><span>数据导入</span></a></li>
 					<li class="divider">用户</li>
 					<li class="${param['activeNav'] == 'users' ? 'active' : ''}"><a href="${baseUrl}/admin/bizuser/users"><i class="icon zmdi zmdi-accounts"></i><span>部门用户</span></a></li>
 					<li class="${param['activeNav'] == 'role-privileges' ? 'active' : ''}"><a href="${baseUrl}/admin/bizuser/role-privileges"><i class="icon zmdi zmdi-lock"></i><span>角色权限</span></a></li>
diff --git a/src/main/webapp/admin/classification/index.jsp b/src/main/webapp/admin/classification/index.jsp
new file mode 100644
index 000000000..9c53cd8b8
--- /dev/null
+++ b/src/main/webapp/admin/classification/index.jsp
@@ -0,0 +1,28 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<!DOCTYPE html>
+<html>
+<head>
+<%@ include file="/_include/Head.jsp"%>
+<title>审计日志</title>
+<style type="text/css">
+</style>
+</head>
+<body>
+<div class="rb-wrapper rb-fixed-sidebar rb-collapsible-sidebar rb-collapsible-sidebar-hide-logo rb-color-header">
+	<jsp:include page="/_include/NavTop.jsp">
+		<jsp:param value="审计日志" name="pageTitle"/>
+	</jsp:include>
+	<jsp:include page="/_include/NavLeftAdmin.jsp">
+		<jsp:param value="classifications" name="activeNav"/>
+	</jsp:include>
+	<div class="rb-content">
+		<div class="main-content container-fluid">
+			<h3 class="text-center">暂未支持</h3>
+		</div>
+	</div>
+</div>
+<%@ include file="/_include/Foot.jsp"%>
+<script type="text/babel">
+</script>
+</body>
+</html>
diff --git a/src/main/webapp/admin/entity/field-new.jsp b/src/main/webapp/admin/entity/field-new.jsp
index feba5c529..0c202ffa6 100644
--- a/src/main/webapp/admin/entity/field-new.jsp
+++ b/src/main/webapp/admin/entity/field-new.jsp
@@ -32,8 +32,9 @@
 						<option value="PHONE">电话</option>
 						<option value="EMAIL">邮箱</option>
 						<option value="URL">链接</option>
-						<option value="SERIES">自动编号</option>
 						<option value="PICKLIST">列表</option>
+						<option value="CLASSIFICATION">分类</option>
+						<option value="SERIES">自动编号</option>
 					</optgroup>
 					<optgroup label="媒体">
 						<option value="IMAGE">图片</option>
diff --git a/src/test/java/com/rebuild/server/SchemaGen.java b/src/test/java/com/rebuild/server/SchemaGen.java
index 3a3a69cd4..eb5061010 100644
--- a/src/test/java/com/rebuild/server/SchemaGen.java
+++ b/src/test/java/com/rebuild/server/SchemaGen.java
@@ -46,7 +46,8 @@ public class SchemaGen {
 		PMF = CTX.getBean(PersistManagerFactoryImpl.class);
 		
 //		genAll();
-		gen(EntityHelper.LoginLog);
+		gen(EntityHelper.Classification);
+		gen(EntityHelper.ClassificationData);
 		
 		System.exit(0);
 	}