新增表单分类

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/form/Form.java

@@ -50,6 +50,8 @@ public class Form extends GenericPo<String> {
     //最后一次修改时间
     private java.util.Date updateDate;
 
+    //分类ID
+    private String classifiedId;
 
     /**
      * 获取 名称
@@ -179,4 +181,12 @@ public class Form extends GenericPo<String> {
     public void setRelease(int release) {
         this.release = release;
     }
+
+    public String getClassifiedId() {
+        return classifiedId;
+    }
+
+    public void setClassifiedId(String classifiedId) {
+        this.classifiedId = classifiedId;
+    }
 }

hsweb-web-bean/src/main/resources/system/install/sql/h2/install.sql

@@ -14,20 +14,22 @@ COMMENT ON COLUMN "S_CONFIG"."CLASSIFIED_ID" IS '分类ID';
 COMMENT ON COLUMN "S_CONFIG"."CREATE_DATE" IS '创建日期';
 COMMENT ON COLUMN "S_CONFIG"."UPDATE_DATE" IS '修改日期';
 CREATE TABLE "S_FORM" (
-  "U_ID"        VARCHAR2(32)  NOT NULL,
-  "NAME"        VARCHAR2(256) NOT NULL,
-  "HTML"        CLOB          NULL,
-  "META"        CLOB          NULL,
-  "CONFIG"      CLOB          NULL,
-  "VERSION"     NUMBER(32)    NULL,
-  "REVISION"    NUMBER(32)    NULL,
-  "RELEASE"     NUMBER(32)    NULL,
-  "USING"       NUMBER(4)     NULL,
-  "CREATE_DATE" DATETIME      NOT NULL,
-  "UPDATE_DATE" DATETIME      NULL,
-  "REMARK"      VARCHAR2(200) NULL
+  "U_ID"          VARCHAR2(32)  NOT NULL,
+  "CLASSIFIED_ID" VARCHAR2(32),
+  "NAME"          VARCHAR2(256) NOT NULL,
+  "HTML"          CLOB          NULL,
+  "META"          CLOB          NULL,
+  "CONFIG"        CLOB          NULL,
+  "VERSION"       NUMBER(32)    NULL,
+  "REVISION"      NUMBER(32)    NULL,
+  "RELEASE"       NUMBER(32)    NULL,
+  "USING"         NUMBER(4)     NULL,
+  "CREATE_DATE"   DATETIME      NOT NULL,
+  "UPDATE_DATE"   DATETIME      NULL,
+  "REMARK"        VARCHAR2(200) NULL
 );
 COMMENT ON COLUMN "S_FORM"."U_ID" IS 'UID';
+COMMENT ON COLUMN "S_FORM"."CLASSIFIED_ID" IS '分类ID';
 COMMENT ON COLUMN "S_FORM"."NAME" IS '名称';
 COMMENT ON COLUMN "S_FORM"."HTML" IS 'HTML内容';
 COMMENT ON COLUMN "S_FORM"."META" IS '结构定义';
@@ -67,51 +69,6 @@ COMMENT ON COLUMN "S_TEMPLATE"."VERSION" IS '版本';
 COMMENT ON COLUMN "S_TEMPLATE"."REVISION" IS '修订版';
 COMMENT ON COLUMN "S_TEMPLATE"."RELEASE" IS '当前发布版本';
 COMMENT ON COLUMN "S_TEMPLATE"."USING" IS '是否使用中';
-CREATE TABLE "S_LOGGER" (
-  "U_ID"             VARCHAR2(256)  NOT NULL,
-  "CLIENT_IP"        VARCHAR2(256)  NULL,
-  "REQUEST_URI"      VARCHAR2(1024) NOT NULL,
-  "REQUEST_URL"      VARCHAR2(2048) NOT NULL,
-  "REQUEST_METHOD"   VARCHAR2(512)  NOT NULL,
-  "RESPONSE_CONTENT" CLOB           NOT NULL,
-  "USER_ID"          VARCHAR2(64)   NOT NULL,
-  "REQUEST_TIME"     DATETIME       NULL,
-  "RESPONSE_TIME"    DATETIME       NULL,
-  "USER_AGENT"       CLOB           NULL,
-  "REFERER"          VARCHAR2(64)   NOT NULL,
-  "RESPONSE_CODE"    CLOB           NULL,
-  "REQUEST_HEADER"   CLOB           NULL,
-  "CLASS_NAME"       VARCHAR2(512)  NULL,
-  "MODULE_DESC"      VARCHAR2(256)  NULL,
-  "REQUEST_PARAM"    CLOB           NULL,
-  "EXCEPTION_INFO"   CLOB           NULL,
-  "CACHE_KEY"        CLOB           NULL,
-  "SERVER_IP"        VARCHAR2(64)   NULL,
-  "APP_NAME"         VARCHAR2(128)  NULL,
-  "USE_TIME"         NUMBER(32)     NULL
-);
-COMMENT ON TABLE "S_LOGGER" IS '日志表';
-COMMENT ON COLUMN "S_LOGGER"."U_ID" IS 'UID';
-COMMENT ON COLUMN "S_LOGGER"."CLIENT_IP" IS '客户端IP';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_URI" IS 'URI';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_URL" IS 'URL';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_METHOD" IS '请求方法';
-COMMENT ON COLUMN "S_LOGGER"."RESPONSE_CONTENT" IS '相应内容';
-COMMENT ON COLUMN "S_LOGGER"."USER_ID" IS '操作用户';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_TIME" IS '请求时间';
-COMMENT ON COLUMN "S_LOGGER"."RESPONSE_TIME" IS '响应时间';
-COMMENT ON COLUMN "S_LOGGER"."USER_AGENT" IS '用户标识';
-COMMENT ON COLUMN "S_LOGGER"."REFERER" IS 'referer';
-COMMENT ON COLUMN "S_LOGGER"."RESPONSE_CODE" IS '响应码';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_HEADER" IS '请求头';
-COMMENT ON COLUMN "S_LOGGER"."CLASS_NAME" IS '对于class名称';
-COMMENT ON COLUMN "S_LOGGER"."MODULE_DESC" IS '描述';
-COMMENT ON COLUMN "S_LOGGER"."REQUEST_PARAM" IS '请求参数';
-COMMENT ON COLUMN "S_LOGGER"."EXCEPTION_INFO" IS '异常';
-COMMENT ON COLUMN "S_LOGGER"."CACHE_KEY" IS '缓存';
-COMMENT ON COLUMN "S_LOGGER"."SERVER_IP" IS '服务器ID';
-COMMENT ON COLUMN "S_LOGGER"."APP_NAME" IS '应用名称';
-COMMENT ON COLUMN "S_LOGGER"."USE_TIME" IS '请求耗时';
 CREATE TABLE "S_MODULES" (
   "U_ID"       VARCHAR2(256)  NOT NULL,
   "NAME"       VARCHAR2(256)  NOT NULL,
@@ -132,7 +89,8 @@ COMMENT ON COLUMN "S_MODULES"."PARENT_ID" IS '上级菜单';
 COMMENT ON COLUMN "S_MODULES"."REMARK" IS '备注';
 COMMENT ON COLUMN "S_MODULES"."STATUS" IS '状态';
 COMMENT ON COLUMN "S_MODULES"."OPTIONAL" IS '可选权限';
-COMMENT ON COLUMN "S_MODULES"."SORT_INDEX" IS '排序';CREATE TABLE "S_MODULE_META" (
+COMMENT ON COLUMN "S_MODULES"."SORT_INDEX" IS '排序';
+CREATE TABLE "S_MODULE_META" (
   "U_ID"      VARCHAR2(32)   NOT NULL,
   "KEY"       VARCHAR2(256)  NOT NULL,
   "MODULE_ID" VARCHAR2(32)   NOT NULL,
@@ -148,7 +106,8 @@ COMMENT ON COLUMN "S_MODULE_META"."MODULE_ID" IS '模块ID';
 COMMENT ON COLUMN "S_MODULE_META"."ROLE_ID" IS '角色ID';
 COMMENT ON COLUMN "S_MODULE_META"."META" IS '内容';
 COMMENT ON COLUMN "S_MODULE_META"."REMARK" IS '备注';
-COMMENT ON COLUMN "S_MODULE_META"."STATUS" IS '状态';CREATE TABLE "S_RESOURCES" (
+COMMENT ON COLUMN "S_MODULE_META"."STATUS" IS '状态';
+CREATE TABLE "S_RESOURCES" (
   "U_ID"        VARCHAR2(32)   NOT NULL,
   "NAME"        VARCHAR2(256)  NOT NULL,
   "PATH"        VARCHAR2(1024) NOT NULL,
@@ -211,13 +170,13 @@ COMMENT ON COLUMN "S_ROLE_MODULES"."MODULE_ID" IS '模块ID';
 COMMENT ON COLUMN "S_ROLE_MODULES"."ROLE_ID" IS '角色ID';
 COMMENT ON COLUMN "S_ROLE_MODULES"."ACTIONS" IS '可操作权限';
 CREATE TABLE "S_SCRIPT" (
-  "U_ID"    VARCHAR2(256)  NOT NULL,
-  "NAME"    VARCHAR2(256)  NOT NULL,
-  "CLASSIFIED_ID"    VARCHAR2(1024) NOT NULL,
-  "TYPE"    VARCHAR2(256)  NOT NULL,
-  "CONTENT" CLOB           NOT NULL,
-  "REMARK"  VARCHAR2(512)  NULL,
-  "STATUS"  NUMBER(4)      NULL
+  "U_ID"          VARCHAR2(256)  NOT NULL,
+  "NAME"          VARCHAR2(256)  NOT NULL,
+  "CLASSIFIED_ID" VARCHAR2(1024) NOT NULL,
+  "TYPE"          VARCHAR2(256)  NOT NULL,
+  "CONTENT"       CLOB           NOT NULL,
+  "REMARK"        VARCHAR2(512)  NULL,
+  "STATUS"        NUMBER(4)      NULL
 );
 COMMENT ON TABLE "S_SCRIPT" IS '脚本';
 COMMENT ON COLUMN "S_SCRIPT"."U_ID" IS 'UID';
@@ -247,7 +206,8 @@ COMMENT ON COLUMN "S_USER"."EMAIL" IS '邮箱';
 COMMENT ON COLUMN "S_USER"."PHONE" IS '联系电话';
 COMMENT ON COLUMN "S_USER"."STATUS" IS '状态';
 COMMENT ON COLUMN "S_USER"."CREATE_DATE" IS '创建日期';
-COMMENT ON COLUMN "S_USER"."UPDATE_DATE" IS '修改日期';CREATE TABLE "S_USER_ROLE" (
+COMMENT ON COLUMN "S_USER"."UPDATE_DATE" IS '修改日期';
+CREATE TABLE "S_USER_ROLE" (
   "U_ID"    VARCHAR2(256) NOT NULL,
   "USER_ID" VARCHAR2(256) NOT NULL,
   "ROLE_ID" VARCHAR2(256) NOT NULL
@@ -255,7 +215,8 @@ COMMENT ON COLUMN "S_USER"."UPDATE_DATE" IS '修改日期';CREATE TABLE "S_USER_
 COMMENT ON TABLE "S_USER_ROLE" IS '用户角色关联表';
 COMMENT ON COLUMN "S_USER_ROLE"."U_ID" IS 'UID';
 COMMENT ON COLUMN "S_USER_ROLE"."USER_ID" IS '用户ID';
-COMMENT ON COLUMN "S_USER_ROLE"."ROLE_ID" IS '角色ID';CREATE TABLE "S_HISTORY"
+COMMENT ON COLUMN "S_USER_ROLE"."ROLE_ID" IS '角色ID';
+CREATE TABLE "S_HISTORY"
 (
   "U_ID"              VARCHAR2(32) NOT NULL,
   "TYPE"              VARCHAR2(64) NOT NULL,

hsweb-web-bean/src/main/resources/system/install/sql/mysql/install.sql

@@ -16,6 +16,7 @@ ALTER TABLE `s_config` COMMENT '系统配置文件表';
 CREATE TABLE `s_form` (
   `u_id`        VARCHAR(32)  NOT NULL PRIMARY KEY
   COMMENT 'uid',
+  "classified_id" VARCHAR(32) COMMENT '分类ID',
   `name`        VARCHAR(256) NOT NULL
   COMMENT '名称',
   `html`        TEXT COMMENT 'html内容',

hsweb-web-bean/src/main/resources/system/install/sql/oracle/install.sql

@@ -14,7 +14,8 @@ COMMENT ON COLUMN ${jdbc.username}."S_CONFIG"."CLASSIFIED_ID" IS '分类ID';
 COMMENT ON COLUMN ${jdbc.username}."S_CONFIG"."CREATE_DATE" IS '创建日期';
 COMMENT ON COLUMN ${jdbc.username}."S_CONFIG"."UPDATE_DATE" IS '修改日期';
 CREATE TABLE ${jdbc.username}."S_FORM" (
-"U_ID" VARCHAR2(256) NOT NULL,
+"U_ID" VARCHAR2(32) NOT NULL,
+"CLASSIFIED_ID" VARCHAR2(32),
 "NAME" VARCHAR2(256) NOT NULL,
 "HTML" CLOB NULL,
 "META" CLOB NULL,
@@ -28,6 +29,7 @@ CREATE TABLE ${jdbc.username}."S_FORM" (
 "REMARK" VARCHAR2(200) NULL
 );
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."U_ID" IS 'UID';
+COMMENT ON COLUMN ${jdbc.username}."S_FORM"."CLASSIFIED_ID" IS '分类ID';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."NAME" IS '名称';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."HTML" IS 'HTML内容';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."META" IS '结构定义';
@@ -67,51 +69,6 @@ COMMENT ON COLUMN ${jdbc.username}."S_TEMPLATE"."VERSION" IS '版本';
 COMMENT ON COLUMN ${jdbc.username}."S_TEMPLATE"."REVISION" IS '修订版';
 COMMENT ON COLUMN ${jdbc.username}."S_TEMPLATE"."RELEASE" IS '当前发布版本';
 COMMENT ON COLUMN ${jdbc.username}."S_TEMPLATE"."USING" IS '是否使用中';
-CREATE TABLE ${jdbc.username}."S_LOGGER" (
-"U_ID" VARCHAR2(256)  NOT NULL,
-"CLIENT_IP" VARCHAR2(256)  NULL,
-"REQUEST_URI" VARCHAR2(1024) NOT NULL,
-"REQUEST_URL" VARCHAR2(2048) NOT NULL,
-"REQUEST_METHOD" VARCHAR2(512)  NOT NULL,
-"RESPONSE_CONTENT" CLOB NOT NULL,
-"USER_ID" VARCHAR2(64)   NOT NULL,
-"REQUEST_TIME" DATE NULL,
-"RESPONSE_TIME" DATE NULL,
-"USER_AGENT" CLOB NULL,
-"REFERER" VARCHAR2(64)   NOT NULL,
-"RESPONSE_CODE" CLOB NULL,
-"REQUEST_HEADER" CLOB NULL,
-"CLASS_NAME" VARCHAR2(512)  NULL,
-"MODULE_DESC" VARCHAR2(256)  NULL,
-"REQUEST_PARAM" CLOB NULL,
-"EXCEPTION_INFO" CLOB NULL,
-"CACHE_KEY" CLOB NULL,
-"SERVER_IP" VARCHAR2(64)   NULL,
-"APP_NAME" VARCHAR2(128)  NULL,
-"USE_TIME" NUMBER(32)     NULL
-);
-COMMENT ON TABLE ${jdbc.username}."S_LOGGER" IS '日志表';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."U_ID" IS 'UID';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."CLIENT_IP" IS '客户端IP';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_URI" IS 'URI';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_URL" IS 'URL';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_METHOD" IS '请求方法';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."RESPONSE_CONTENT" IS '相应内容';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."USER_ID" IS '操作用户';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_TIME" IS '请求时间';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."RESPONSE_TIME" IS '响应时间';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."USER_AGENT" IS '用户标识';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REFERER" IS 'referer';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."RESPONSE_CODE" IS '响应码';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_HEADER" IS '请求头';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."CLASS_NAME" IS '对于class名称';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."MODULE_DESC" IS '描述';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."REQUEST_PARAM" IS '请求参数';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."EXCEPTION_INFO" IS '异常';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."CACHE_KEY" IS '缓存';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."SERVER_IP" IS '服务器ID';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."APP_NAME" IS '应用名称';
-COMMENT ON COLUMN ${jdbc.username}."S_LOGGER"."USE_TIME" IS '请求耗时';
 CREATE TABLE ${jdbc.username}."S_MODULES" (
 "U_ID" VARCHAR2(256)  NOT NULL,
 "NAME" VARCHAR2(256)  NOT NULL,

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/mysql/form/FormMapper.xml

@@ -17,6 +17,7 @@
         <result property="using" column="using" javaType="boolean" jdbcType="INTEGER"/>
         <result property="createDate" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
         <result property="updateDate" column="update_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
+        <result property="classifiedId" column="classified_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--用于动态生成sql所需的配置-->

hsweb-web-dao-impl-mybatis/src/main/resources/org/hsweb/web/dao/impl/mybatis/mapper/oracle/form/FormMapper.xml

@@ -17,6 +17,7 @@
         <result property="using" column="using" javaType="boolean" jdbcType="INTEGER"/>
         <result property="createDate" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
         <result property="updateDate" column="update_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
+        <result property="classifiedId" column="classified_id" javaType="java.lang.String" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--用于动态生成sql所需的配置-->