增加修订版和发布版字段

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

@@ -35,6 +35,12 @@ public class Form extends GenericPo<String> {
     //表单版本
     private int version;
 
+    //修订版本号
+    private int revision;
+
+    //发布版版本号
+    private int release;
+
     //是否正在使用
     private boolean using;
 
@@ -158,7 +164,19 @@ public class Form extends GenericPo<String> {
         this.using = using;
     }
 
-    public static void main(String[] args) {
-        System.out.println("AA2_2".matches("(^[a-z][a-z0-9_]*$)|(^[A-Z][A-Z0-9_]*$)"));
+    public int getRevision() {
+        return revision;
+    }
+
+    public void setRevision(int revision) {
+        this.revision = revision;
+    }
+
+    public int getRelease() {
+        return release;
+    }
+
+    public void setRelease(int release) {
+        this.release = release;
     }
 }

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

@@ -25,6 +25,8 @@ CREATE TABLE "S_FORM" (
   "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,
@@ -36,6 +38,8 @@ COMMENT ON COLUMN "S_FORM"."HTML" IS 'HTML内容';
 COMMENT ON COLUMN "S_FORM"."META" IS '结构定义';
 COMMENT ON COLUMN "S_FORM"."CONFIG" IS '配置';
 COMMENT ON COLUMN "S_FORM"."VERSION" IS '版本';
+COMMENT ON COLUMN "S_FORM"."REVISION" IS '修订版';
+COMMENT ON COLUMN "S_FORM"."RELEASE" IS '当前发布版本';
 COMMENT ON COLUMN "S_FORM"."USING" IS '是否使用中';
 COMMENT ON COLUMN "S_FORM"."CREATE_DATE" IS '创建日期';
 COMMENT ON COLUMN "S_FORM"."UPDATE_DATE" IS '修改日期';

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

@@ -27,6 +27,8 @@ CREATE TABLE `s_form` (
   `meta`        TEXT COMMENT '结构定义',
   `config`      TEXT COMMENT '配置',
   `version`     INT COMMENT '版本',
+  `revision`    INT COMMENT '修订版',
+  `release`     INT COMMENT '发布版',
   `using`       TINYINT COMMENT '是否使用中',
   `create_date` DATETIME     NOT NULL
   COMMENT '创建日期',

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

@@ -25,6 +25,8 @@ CREATE TABLE ${jdbc.username}."S_FORM" (
 "META" CLOB NULL,
 "CONFIG" CLOB NULL,
 "VERSION" NUMBER(32)    NULL,
+"REVISION" NUMBER(32)    NULL,
+"RELEASE" NUMBER(32)    NULL,
 "USING" NUMBER(4)     NULL,
 "CREATE_DATE" DATE NOT NULL,
 "UPDATE_DATE" DATE NULL,
@@ -36,6 +38,8 @@ COMMENT ON COLUMN ${jdbc.username}."S_FORM"."HTML" IS 'HTML内容';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."META" IS '结构定义';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."CONFIG" IS '配置';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."VERSION" IS '版本';
+COMMENT ON COLUMN ${jdbc.username}."S_FORM"."REVISION" IS '修订版';
+COMMENT ON COLUMN ${jdbc.username}."S_FORM"."RELEASE" IS '当前发布版本';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."USING" IS '是否使用中';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."CREATE_DATE" IS '创建日期';
 COMMENT ON COLUMN ${jdbc.username}."S_FORM"."UPDATE_DATE" IS '修改日期';

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

@@ -12,6 +12,8 @@
         <result property="config" column="config" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="version" column="version" javaType="int" jdbcType="INTEGER"/>
+        <result property="revision" column="revision" javaType="int" jdbcType="INTEGER"/>
+        <result property="release" column="release" javaType="int" jdbcType="INTEGER"/>
         <result property="using" column="using" javaType="boolean" jdbcType="INTEGER"/>
         <result property="create_date" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
         <result property="update_date" column="update_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
@@ -28,6 +30,8 @@
                     ,'config':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'version':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'revision':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'release':#{'jdbcType':'INTEGER','javaType':'number'}
                     ,'using':#{'jdbcType':'INTEGER','javaType':'boolean'}
                     ,'create_date':#{'jdbcType':'VARCHAR','javaType':'date'}
                     ,'update_date':#{'jdbcType':'VARCHAR','javaType':'date'}
@@ -66,15 +70,19 @@
     </select>
 
     <select id="selectLatestList" parameterType="org.hsweb.web.bean.common.QueryParam" resultMap="FormResultMap">
-        <include refid="fieldConfig"/><!--定义字段配置-->
-        <bind name="$tableName" value="'t2'"/><!--定义表名-->
+        <include refid="fieldConfig"/>
+        <!--定义字段配置-->
+        <bind name="$tableName" value="'t2'"/>
+        <!--定义表名-->
         select
-        <include refid="BasicMapper.buildSelectField"/> <!--动态生成要查询的字段-->
+        <include refid="BasicMapper.buildSelectField"/>
+        <!--动态生成要查询的字段-->
         from (
         select s_form.name,max(s_form.version) as version from s_form s_form
         <include refid="tableName"/>
         <where>
-            <include refid="BasicMapper.buildWhere"/> <!--动态查询条件-->
+            <include refid="BasicMapper.buildWhere"/>
+            <!--动态查询条件-->
         </where>
         group by name ) t1
         left join s_form t2 on t1.name=t2.name and t1.version =t2.version

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

@@ -12,6 +12,8 @@
         <result property="config" column="config" javaType="String" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" javaType="String" jdbcType="VARCHAR"/>
         <result property="version" column="version" javaType="int" jdbcType="INTEGER"/>
+        <result property="revision" column="revision" javaType="int" jdbcType="INTEGER"/>
+        <result property="release" column="release" javaType="int" jdbcType="INTEGER"/>
         <result property="using" column="using" javaType="boolean" jdbcType="INTEGER"/>
         <result property="create_date" column="create_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
         <result property="update_date" column="update_date" javaType="java.util.Date" jdbcType="TIMESTAMP"/>
@@ -28,6 +30,8 @@
                     ,'config':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'remark':#{'jdbcType':'VARCHAR','javaType':'string'}
                     ,'version':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'revision':#{'jdbcType':'INTEGER','javaType':'number'}
+                    ,'release':#{'jdbcType':'INTEGER','javaType':'number'}
                     ,'using':#{'jdbcType':'INTEGER','javaType':'boolean'}
                     ,'create_date':#{'jdbcType':'VARCHAR','javaType':'date'}
                     ,'update_date':#{'jdbcType':'VARCHAR','javaType':'date'}