ibizdev提交

ibzdict-core/src/main/java/cn/ibizlab/core/dict/domain/IBZDict.java

@@ -105,7 +105,7 @@ public class IBZDict extends EntityMP implements Serializable {
      */
     public void setItems(List<cn.ibizlab.core.dict.domain.IBZDictItem> items){
         this.items = items ;
-        this.modify("items",(items!=null)?items:(new ArrayList()));
+        this.modify("cfg",(items!=null)?items:(new ArrayList()));
     }
 
     /**

ibzdict-core/src/main/resources/liquibase/h2_table.xml

@@ -24,7 +24,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDICTITEM]数据结构 -->
-    <changeSet author="a_A_5ae9eb39a" id="tab-ibzdictitem-70-2">
+    <changeSet author="a_A_5ae9eb39a" id="tab-ibzdictitem-71-2">
         <createTable tableName="IBZDICTITEM">
                 <column name="IBZDICTITEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDICTITEM_IBZDICTITEMID"/>
@@ -58,7 +58,7 @@
 
         <!--输出实体[IBZDICT]外键关系 -->
         <!--输出实体[IBZDICTITEM]外键关系 -->
-    <changeSet author="a_A_5ae9eb39a" id="fk-ibzdictitem-70-3">
+    <changeSet author="a_A_5ae9eb39a" id="fk-ibzdictitem-71-3">
        <addForeignKeyConstraint baseColumnNames="DICTID" baseTableName="IBZDICTITEM" constraintName="DER1N_IBZDICTITEM_IBZDICT_DICT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBZDICTID" referencedTableName="IBZDICT" validate="true"/>
     </changeSet>
 

ibzdict-core/src/main/resources/mapper/dict/ibzdict/IBZDictMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper	namespace="cn.ibizlab.core.dict.mapper.IBZDictMapper">
-
-    <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
-	<select id="selectById"  resultMap="IBZDictResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CFG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`IBZDICTID`, t1.`IBZDICTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZDICT` t1  ) t1 where ibzdictid=#{id}]]>
-    </select>
-
-    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
-    <resultMap id="IBZDictResultMap" type="cn.ibizlab.core.dict.domain.IBZDict" autoMapping="true">
-        <id property="dictid" column="ibzdictid" /><!--主键字段映射-->
-		<result property="dictname" column="ibzdictname" />
-
-    </resultMap>
-
-
-    <!--数据集合[Default]-->
-	 <select id="searchDefault"  parameterType="cn.ibizlab.core.dict.filter.IBZDictSearchContext"  resultMap="IBZDictResultMap">
-         select t1.* from (
-                <include refid="Default" />
-         )t1
-         <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
-         <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
-     </select>
-
-    <!--数据查询[Default]-->
-    <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`IBZDICTID`, t1.`IBZDICTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZDICT` t1  
-				 WHERE 	t1.ENABLE = 1
-			]]>
-    </sql>
-
-    <!--数据查询[View]-->
-    <sql id="View" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CFG`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENABLE`, t1.`IBZDICTID`, t1.`IBZDICTNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `IBZDICT` t1  
-				 WHERE 	t1.ENABLE = 1
-			]]>
-    </sql>
-
-</mapper>
-
+!!!!模版产生代码错误:----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: #if defield.isKeyDEField() != true &&...  [in template "CODETEMPL_zh_CN" at line 49, column 13]
+----
\ No newline at end of file

ibzdict-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java

@@ -34,23 +34,23 @@ public class DTOBase implements Serializable {
     }
 
     @JsonIgnore
-    private Map<String,Object> extensions=new HashMap<String,Object>();
+    private Map<String,Object> extensionparams=new HashMap<String,Object>();
 
-    public Map<String, Object> getExtensions() {
-        return extensions;
+    public Map<String, Object> getExtensionparams() {
+        return extensionparams;
     }
 
-    public void setExtensions(Map<String, Object> extensions) {
-        this.extensions = extensions;
+    public void setExtensionparams(Map<String, Object> extensionparams) {
+        this.extensionparams = extensionparams;
     }
 
     @JsonAnyGetter
     public Map<String , Object> any() {
-        return extensions;
+        return extensionparams;
     }
 
     @JsonAnySetter
     public void set(String name, Object value) {
-        extensions.put(name.toLowerCase(), value);
+        extensionparams.put(name.toLowerCase(), value);
     }
 }

ibzdict-util/src/main/java/cn/ibizlab/util/domain/EntityBase.java

@@ -64,8 +64,8 @@ public class EntityBase implements Serializable {
         return extensionparams;
     }
 
-    public void setExtensionparams(Map<String, Object> extensions) {
-        this.extensionparams = extensions;
+    public void setExtensionparams(Map<String, Object> extensionparams) {
+        this.extensionparams = extensionparams;
     }