修改前端生成页面

appbuild-manager/src/main/bin/start.sh

@@ -75,7 +75,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6913 \
+				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6913 \个大
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

appbuild-manager/src/main/resources/template/java/entityQuery.java.ftl

@@ -26,11 +26,16 @@ public class ${ClassName}Query extends ${ClassName}Entity {
     /** ${column.columnComment}列表 */
     private List <${column.javaType}> ${column.javaField}List;
 
+    /** ${column.columnComment}排除列表 */
+    private List <${column.javaType}> ${column.javaField}NotList;
+
 </#if>
 <#if column.javaType == "String">
     /** ${column.columnComment} */
     private List<${column.javaType}> ${column.javaField}List;
 
+    /** ${column.columnComment}排除列表 */
+    private List <${column.javaType}> ${column.javaField}NotList;
 </#if>
 <#if column.javaType == "Date">
     /** 开始 ${column.columnComment} */
@@ -115,6 +120,23 @@ public class ${ClassName}Query extends ${ClassName}Entity {
         this.${column.javaField}List = ${column.javaField}List;
     }
 
+    /**
+    * 获取 ${column.columnComment}
+    * @return ${column.javaField}NotList
+    */
+    public List<${column.javaType}> get${column.javaField?cap_first}NotList(){
+        return this.${column.javaField}NotList;
+    }
+
+    /**
+    * 设置 ${column.columnComment}
+    * @param ${column.javaField}NotList
+    */
+    public void set${column.javaField?cap_first}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+    }
+
+
     </#if>
     <#if column.javaType == "String">
     /**
@@ -132,6 +154,23 @@ public class ${ClassName}Query extends ${ClassName}Entity {
     public void set${column.javaField?cap_first}List(List<${column.javaType}> ${column.javaField}List){
         this.${column.javaField}List = ${column.javaField}List;
     }
+
+    /**
+    * 获取 ${column.columnComment}
+    * @return ${column.javaField}NotList
+    */
+    public List<${column.javaType}> get${column.javaField?cap_first}NotList(){
+        return this.${column.javaField}NotList;
+    }
+
+    /**
+    * 设置 ${column.columnComment}
+    * @param ${column.javaField}NotList
+    */
+    public void set${column.javaField?cap_first}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+    }
+
     </#if>
     <#if column.javaType == "Date">
     /**
@@ -214,6 +253,15 @@ public class ${ClassName}Query extends ${ClassName}Entity {
         this.${column.javaField}List = ${column.javaField}List;
 		return this;
         }
+
+        /**
+        * 设置 ${column.columnComment}
+        * @param ${column.javaField}NotList
+        */
+        public ${ClassName}Query ${column.javaField}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+        return this;
+        }
     </#if>
 
     <#if column.javaType  == "String">

appbuild-manager/src/main/resources/template/java/pdu.java.ftl

@@ -10,18 +10,20 @@ package com.mortals.xhx.common.pdu.${businessName};
     <#else>
         <#assign Entity = "BaseEntityLong">
     </#if>
+<#else>
+    <#assign Entity = "BaseEntityLong">
 </#if>
 import java.util.Date;
 import java.util.List;
 import com.mortals.framework.model.BaseEntityLong;
-
+import lombok.Data;
 /**
 * ${functionName}Pdu对象
 *
 * @author ${author}
 * @date ${datetime}
 */
-
+@Data
 public class ${ClassName}Pdu extends ${Entity} {
     private static final long serialVersionUID = 1L;
 
@@ -34,325 +36,7 @@ public class ${ClassName}Pdu extends ${Entity} {
 </#if>
 </#list>
 
-<#list columns as column>
-<#if column.javaType == "Long"||column.javaType == "Integer"||column.javaType == "BigDecimal">
-    /** 开始 ${column.columnComment} */
-    private ${column.javaType} ${column.javaField}Start;
-
-    /** 结束 ${column.columnComment} */
-    private ${column.javaType} ${column.javaField}End;
-
-    /** 增加 ${column.columnComment} */
-    private ${column.javaType} ${column.javaField}Increment;
-
-    /** ${column.columnComment}列表 */
-    private List <${column.javaType}> ${column.javaField}List;
-
-</#if>
-<#if column.javaType == "String">
-    /** ${column.columnComment} */
-    private List<${column.javaType}> ${column.javaField}List;
-
-</#if>
-<#if column.javaType == "Date">
-    /** 开始 ${column.columnComment} */
-    private String ${column.javaField}Start;
-
-    /** 结束 ${column.columnComment} */
-    private String ${column.javaField}End;
-
-</#if>
-</#list>
-
-    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
-    private List<${ClassName}Pdu> orConditionList;
-
-    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
-    private List<${ClassName}Pdu> andConditionList;
-
-    public ${ClassName}Pdu(){}
-<#--get set属性 -->
-<#list columns as column>
-    <#if !column.isSuperColumn(column.javaField)>
-        <#if column.javaField[0..1]?matches("[A-Z]")>
-            <#assign AttrName = column.javaField>
-            <#else>
-            <#assign AttrName = column.javaField?cap_first>
-        </#if>
-    /**
-    * 获取 ${column.columnComment}
-    * @return ${column.javaType}
-    */
-    public ${column.javaType} get${AttrName}(){
-        return ${column.javaField};
-    }
-    /**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}
-    */
-    public void set${AttrName}(${column.javaType} ${column.javaField}){
-        this.${column.javaField} = ${column.javaField};
-    }
-    </#if>
-</#list>
-
-<#list columns as column>
-    <#if column.javaType == "Long"||column.javaType == "Integer"||column.javaType == "BigDecimal">
-    /**
-    * 获取 开始 ${column.columnComment}
-    * @return ${column.javaField}Start
-    */
-    public ${column.javaType} get${column.javaField?cap_first}Start(){
-        return this.${column.javaField}Start;
-    }
-
-    /**
-    * 设置 开始 ${column.columnComment}
-    * @param ${column.javaField}Start
-    */
-    public void set${column.javaField?cap_first}Start(${column.javaType} ${column.javaField}Start){
-        this.${column.javaField}Start = ${column.javaField}Start;
-    }
-
-    /**
-    * 获取 结束 ${column.columnComment}
-    * @return $${column.javaField}End
-    */
-    public ${column.javaType} get${column.javaField?cap_first}End(){
-        return this.${column.javaField}End;
-    }
-
-    /**
-    * 设置 结束 ${column.columnComment}
-    * @param ${column.javaField}End
-    */
-    public void set${column.javaField?cap_first}End(${column.javaType} ${column.javaField}End){
-        this.${column.javaField}End = ${column.javaField}End;
-    }
-
-    /**
-    * 获取 增加 ${column.columnComment}
-    * @return ${column.javaField}Increment
-    */
-    public ${column.javaType} get${column.javaField?cap_first}Increment(){
-        return this.${column.javaField}Increment;
-    }
-
-    /**
-    * 设置 增加 ${column.columnComment}
-    * @param ${column.javaField}Increment
-    */
-    public void set${column.javaField?cap_first}Increment(${column.javaType} ${column.javaField}Increment){
-        this.${column.javaField}Increment = ${column.javaField}Increment;
-    }
-
-    /**
-    * 获取 ${column.columnComment}
-    * @return ${column.javaField}List
-    */
-    public List<${column.javaType}> get${column.javaField?cap_first}List(){
-        return this.${column.javaField}List;
-    }
-
-    /**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}List
-    */
-    public void set${column.javaField?cap_first}List(List<${column.javaType}> ${column.javaField}List){
-        this.${column.javaField}List = ${column.javaField}List;
-    }
-
-    </#if>
-    <#if column.javaType == "String">
-    /**
-    * 获取 ${column.columnComment}
-    * @return ${column.javaField}List
-    */
-    public List<${column.javaType}> get${column.javaField?cap_first}List(){
-        return this.${column.javaField}List;
-    }
-
-    /**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}List
-    */
-    public void set${column.javaField?cap_first}List(List<${column.javaType}> ${column.javaField}List){
-        this.${column.javaField}List = ${column.javaField}List;
-    }
-    </#if>
-    <#if column.javaType == "Date">
-    /**
-    * 获取 开始 ${column.columnComment}
-    * @return ${column.javaField}Start
-    */
-    public String get${column.javaField?cap_first}Start(){
-        return this.${column.javaField}Start;
-    }
-
-    /**
-    * 设置 开始 ${column.columnComment}
-    * @param ${column.javaField}Start
-    */
-    public void set${column.javaField?cap_first}Start(String ${column.javaField}Start){
-        this.${column.javaField}Start = ${column.javaField}Start;
-    }
-
-    /**
-    * 获取 结束 ${column.columnComment}
-    * @return ${column.javaField}End
-    */
-    public String get${column.javaField?cap_first}End(){
-        return this.${column.javaField}End;
-    }
-
-    /**
-    * 设置 结束 ${column.columnComment}
-    * @param ${column.javaField}End
-    */
-    public void set${column.javaField?cap_first}End(String ${column.javaField}End){
-        this.${column.javaField}End = ${column.javaField}End;
-    }
-
-    </#if>
-    </#list>
-    <#list columns as column>
-    <#if column.javaType == "Long"||column.javaType == "Integer"||column.javaType == "BigDecimal">
-    /**
-    * 设置  ${column.columnComment}
-    * @param ${column.javaField}
-    */
-    public ${ClassName}Pdu ${column.javaField}(${column.javaType} ${column.javaField}){
-	    set${column.javaField?cap_first}(${column.javaField});
-		return this;
-    }
-
-	 /**
-    * 设置 开始 ${column.columnComment}
-    * @param ${column.javaField}Start
-    */
-    public ${ClassName}Pdu ${column.javaField}Start(${column.javaType} ${column.javaField}Start){
-		this.${column.javaField}Start = ${column.javaField}Start;
-		return this;
-    }
-
-    /**
-    * 设置 结束 ${column.columnComment}
-    * @param ${column.javaField}End
-    */
-    public ${ClassName}Pdu ${column.javaField}End(${column.javaType} ${column.javaField}End){
-		this.${column.javaField}End = ${column.javaField}End;
-		return this;
-    }
-
-    /**
-    * 设置 增加 ${column.columnComment}
-    * @param ${column.javaField}Increment
-    */
-    public ${ClassName}Pdu ${column.javaField}Increment(${column.javaType} ${column.javaField}Increment){
-		this.${column.javaField}Increment = ${column.javaField}Increment;
-		return this;
-    }
-
-    /**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}List
-    */
-    public ${ClassName}Pdu ${column.javaField}List(List<${column.javaType}> ${column.javaField}List){
-        this.${column.javaField}List = ${column.javaField}List;
-		return this;
-        }
-    </#if>
-
-    <#if column.javaType  == "String">
-	/**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}
-    */
-    public ${ClassName}Pdu ${column.javaField}(${column.javaType} ${column.javaField}){
-        set${column.javaField?cap_first}(${column.javaField});
-		return this;
-    }
-
-    /**
-    * 设置 ${column.columnComment}
-    * @param ${column.javaField}List
-    */
-    public ${ClassName}Pdu ${column.javaField}List(List<${column.javaType}> ${column.javaField}List){
-        this.${column.javaField}List = ${column.javaField}List;
-		return this;
-    }
-
-    </#if>
-    <#if column.javaType == "java.util.Date">
-    /**
-    * 设置 开始 ${column.columnComment}
-    * @param ${column.javaField}Start
-    */
-    public ${ClassName}Pdu ${column.javaField}Start(String ${column.javaField}Start){
-		this.${column.javaField}Start = ${column.javaField}Start;
-		return this;
-    }
-
-    /**
-    * 设置 结束 ${column.columnComment}
-    * @param ${column.javaField}End
-    */
-    public ${ClassName}Pdu ${column.javaField}End(String ${column.javaField}End){
-		this.${column.javaField}End = ${column.javaField}End;
-		return this;
-    }
-    </#if>
-</#list>
-
-/**
-    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @return orConditionList
-    */
-    public List<${ClassName}Pdu> getOrConditionList(){
-    return this.orConditionList;
-    }
-
-    /**
-    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
-    * @param orConditionList
-    */
-    public void setOrConditionList(List<${ClassName}Pdu> orConditionList){
-        this.orConditionList = orConditionList;
-    }
-
-    /**
-    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @return andConditionList
-    */
-    public List<${ClassName}Pdu> getAndConditionList(){
-        return this.andConditionList;
-    }
-
-    /**
-    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
-    * @param andConditionList
-    */
-    public void setAndConditionList(List<${ClassName}Pdu> andConditionList){
-        this.andConditionList = andConditionList;
-    }
-
-    @Override
-    public int hashCode() {
-         return this.getId().hashCode();
-    }
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) return false;
-        if (obj instanceof ${ClassName}Pdu) {
-            ${ClassName}Pdu tmp = (${ClassName}Pdu) obj;
-            if (this.getId() == tmp.getId()) {
-                 return true;
-            }
-        }
-        return false;
-    }
-
-    public void initAttrValue(){
+public void initAttrValue(){
     <#list columns as column>
         <#if !column.isSuperColumn(column.javaField)>
 

appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl

@@ -334,6 +334,12 @@
                     <#noparse>#{item}</#noparse>
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('${column.javaField}NotList')">
+                <#noparse>${_conditionType_}</#noparse> a.${column.columnName} not in
+                <foreach collection="conditionParamRef.${column.javaField}NotList" open="(" close=")" index="index" item="item" separator=",">
+                    <#noparse>#{item}</#noparse>
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('${column.javaField}Start') and conditionParamRef.${column.javaField}Start != null">
                 <#noparse>${_conditionType_}</#noparse> a.${column.columnName} <![CDATA[ >= ]]> <#noparse>#{${_conditionParam_}</#noparse>.${column.javaField}Start}
             </if>
@@ -357,6 +363,12 @@
                     <#noparse>#</#noparse>{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('${column.javaField}NotList')">
+                <#noparse>${_conditionType_}</#noparse> a.${column.columnName} not in
+                <foreach collection="conditionParamRef.${column.javaField}NotList" open="(" close=")" index="index" item="item" separator=",">
+                    <#noparse>#</#noparse>{item}
+                </foreach>
+            </if>
         </#if>
         <#if column.javaType == "Date">
             <if test="conditionParamRef.containsKey('${column.javaField}')">