Mapper增加select

Former-commit-id: e6f0437270d6f08cbec303ae3d25ab54ebe0d9f2

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -321,8 +321,10 @@ public class SpringBootCallable implements Callable {
                         freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx);
                     }
 
-                    freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx);
+                    if(table.getCreate() || table.getDelete() || table.getUpdate() ||table.getFind() ||table.getGet() ||table.getSearch()){
-                    freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx);
+                        freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx);
+                        freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx);
+                    }
 
                     if (table.getCreate()) {
                         freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.ftl", ctx);

src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java

@@ -91,6 +91,10 @@ public class Table extends TreeItem {
         return true;
     }
 
+    public boolean needMgr() {
+        return create || delete || update || find || get || search;
+    }
+
     public String getCName() {
         return Tool.ABB2Abb(this.tableName);
     }

src/main/resources/modules/SpringBoot/java/module/mpr/Mapper.java

@@ -66,10 +66,19 @@ public interface ${table.getCName()}Mapper {
      * @return 返回数量
      */
     long update(@Param("request") ${table.getCName()} request, @Param("token") Token token);
+
+    /**
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+     List<${table.getCName()}> select(@Param("request") ${table.getCName()} request, @Param("token") Token token);
 <#if table.getFind()>
 
     /**
-     * 查询
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/mpr/Mapper_NSYS.java

@@ -54,10 +54,19 @@ public interface ${table.getCName()}Mapper {
      * @return 返回数量
      */
     long update(@Param("request") ${table.getCName()} request, @Param("token") Token token);
+
+    /**
+     * 普通查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<${table.getCName()}> find(@Param("request") ${table.getCName()} request, @Param("token") Token token);
 <#if table.getFind()>
 
     /**
-     * 查询
+     * 高级查询
      *
      * @param request 请求对象
      * @param token   令牌

src/main/resources/modules/SpringBoot/java/module/mpr/MySQL_NSYS_mapper.xml

@@ -16,6 +16,28 @@
     </#list>
     </resultMap>
 
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+        1 = 1
+<#list table.fields as field>
+  <#if field.isQuery>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    <#elseif field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+  </#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/mpr/MySQL_mapper.xml

@@ -100,6 +100,68 @@
         AND `ROW_VERSION` = ${r"#{"}request.rowVersion}
     </update>
 
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE `IS_DELETED` = 0
+<#list table.fields as field>
+<#if field.isQuery>
+    <#if field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Byte">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Short">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Integer">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Long">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Float">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Double">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Character">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Date">
+        <if test="request.${field.getFName()} != null">
+            AND DATE_FORMAT(`${field.fieldName}`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#{"}request.${field.getFName()}},"%Y-%m-%d %T")
+        </if>
+    </#if>
+</#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/mpr/Oracle_NSYS_mapper.xml

@@ -16,6 +16,28 @@
     </#list>
     </resultMap>
 
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+            1 = 1
+<#list table.fields as field>
+  <#if field.isQuery>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    <#elseif field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+     </#if>
+  </#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/mpr/Oracle_mapper.xml

@@ -102,6 +102,68 @@
         AND "ROW_VERSION" = ${r"#{"}request.rowVersion}
     </update>
 	
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+<#list table.fields as field>
+<#if field.isQuery>
+    <#if field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Byte">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Short">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Integer">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Long">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Float">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Double">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Character">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Date">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND to_char("${field.fieldName}",'yyyy-MM-dd HH24:mi:ss') = to_char(${r"#{"}request.${field.getFName()}},'yyyy-MM-dd HH24:mi:ss')
+        </if>
+    </#if>
+</#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/mpr/SQLite_NSYS_mapper.xml

@@ -16,6 +16,28 @@
     </#list>
     </resultMap>
 
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE
+            1 = 1
+<#list table.fields as field>
+  <#if field.isQuery>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    <#elseif field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+     </#if>
+  </#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/mpr/SQLite_mapper.xml

@@ -100,6 +100,68 @@
         AND "ROW_VERSION" = ${r"#{"}request.rowVersion}
     </update>
 
+    <select id="select" resultMap="${table.getFName()}">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+<#list table.fields as field>
+<#if field.isQuery>
+    <#if field.getFieldTypeJava() == "Boolean">
+        <if test="request.${field.getFName()} != null">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Byte">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Short">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Integer">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Long">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Float">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Double">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Character">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "String">
+        <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+    <#if field.getFieldTypeJava() == "Date">
+        <if test="request.${field.getFName()} != null">
+            AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
+        </if>
+    </#if>
+</#if>
+</#list>
+    </select>
+
     <select id="find" resultMap="${table.getFName()}">
         SELECT
         <include refid="entityColumnList"/>

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">`SYS_TOKENS`</sql>
 
     <sql id="entityColumnList">
-        `ID`,`TOKEN`,`USER_ID`,`USER_NAME`,`LOGIN_TIME`,`VALID_TIME`,`VALID`,`DEPT_ID`,`DEPT_CODE`,`DEPT_NAME`,`TERMINAL_TYPE`,`TERMINAL_IP`,`TERMINAL_INFO`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
+        `ID`,`TOKEN`,`USER_ID`,`USER_NAME`,`LOGIN_TIME`,`VALID_TIME`,`VALID`,`DEPT_ID`,`DEPT_CODE`,`DEPT_NAME`,`TERMINAL`,`TERMINAL_IP`,`TERMINAL_INFO`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
     </sql>
 
     <resultMap id="tokens" type="${domain}.module.wsys.ent.Tokens">
@@ -21,7 +21,7 @@
         <result column="DEPT_ID"  jdbcType="BIGINT" property="deptId"/>
         <result column="DEPT_CODE"  jdbcType="VARCHAR" property="deptCode"/>
         <result column="DEPT_NAME"  jdbcType="VARCHAR" property="deptName"/>
-        <result column="TERMINAL_TYPE"  jdbcType="VARCHAR" property="terminalType"/>
+        <result column="TERMINAL"  jdbcType="VARCHAR" property="terminal"/>
         <result column="TERMINAL_IP"  jdbcType="VARCHAR" property="terminalIp"/>
         <result column="TERMINAL_INFO"  jdbcType="VARCHAR" property="terminalInfo"/>
         <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
@@ -50,7 +50,7 @@
         ${r"#"}{request.deptId,jdbcType=BIGINT},
         ${r"#"}{request.deptCode,jdbcType=VARCHAR},
         ${r"#"}{request.deptName,jdbcType=VARCHAR},
-        ${r"#"}{request.terminalType,jdbcType=VARCHAR},
+        ${r"#"}{request.terminal,jdbcType=VARCHAR},
         ${r"#"}{request.terminalIp,jdbcType=VARCHAR},
         ${r"#"}{request.terminalInfo,jdbcType=VARCHAR},
         0,
@@ -80,7 +80,7 @@
             ${r"#"}{item.deptId,jdbcType=BIGINT},
             ${r"#"}{item.deptCode,jdbcType=VARCHAR},
             ${r"#"}{item.deptName,jdbcType=VARCHAR},
-            ${r"#"}{item.terminalType,jdbcType=VARCHAR},
+            ${r"#"}{item.terminal,jdbcType=VARCHAR},
             ${r"#"}{item.terminalIp,jdbcType=VARCHAR},
             ${r"#"}{item.terminalInfo,jdbcType=VARCHAR},
             0,
@@ -124,7 +124,7 @@
         `DEPT_ID` = ${r"#"}{request.deptId,jdbcType=BIGINT},
         `DEPT_CODE` = ${r"#"}{request.deptCode,jdbcType=VARCHAR},
         `DEPT_NAME` = ${r"#"}{request.deptName,jdbcType=VARCHAR},
-        `TERMINAL_TYPE` = ${r"#"}{request.terminalType,jdbcType=VARCHAR},
+        `TERMINAL` = ${r"#"}{request.terminal,jdbcType=VARCHAR},
         `TERMINAL_IP` = ${r"#"}{request.terminalIp,jdbcType=VARCHAR},
         `TERMINAL_INFO` = ${r"#"}{request.terminalInfo,jdbcType=VARCHAR},
         `ROW_VERSION` = `ROW_VERSION` + 1,
@@ -168,8 +168,8 @@
         <if test="request.deptName != null and request.deptName != ''">
             AND `DEPT_NAME` = ${r"#"}{request.deptName}
         </if>
-        <if test="request.terminalType != null and request.terminalType != ''">
+        <if test="request.terminal != null and request.terminal != ''">
-            AND `TERMINAL_TYPE` = ${r"#"}{request.terminalType}
+            AND `TERMINAL` = ${r"#"}{request.terminal}
         </if>
         <if test="request.terminalIp != null and request.terminalIp != ''">
             AND `TERMINAL_IP` = ${r"#"}{request.terminalIp}

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">"SYS_TOKENS"</sql>
 
     <sql id="entityColumnList">
-        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL_TYPE","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="tokens" type="${domain}module.wsys.ent.Tokens">
@@ -21,7 +21,7 @@
         <result column="DEPT_ID" jdbcType="BIGINT" property="deptId"/>
         <result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
         <result column="DEPT_NAME" jdbcType="VARCHAR" property="deptName"/>
-        <result column="TERMINAL_TYPE" jdbcType="VARCHAR" property="terminalType"/>
+        <result column="TERMINAL" jdbcType="VARCHAR" property="terminal"/>
         <result column="TERMINAL_IP" jdbcType="VARCHAR" property="terminalIp"/>
         <result column="TERMINAL_INFO" jdbcType="VARCHAR" property="terminalInfo"/>
         <result column="ROW_VERSION" jdbcType="BIGINT" property="rowVersion"/>
@@ -50,7 +50,7 @@
         ${r'#'}{request.deptId,jdbcType=BIGINT},
         ${r'#'}{request.deptCode,jdbcType=VARCHAR},
         ${r'#'}{request.deptName,jdbcType=VARCHAR},
-        ${r'#'}{request.terminalType,jdbcType=VARCHAR},
+        ${r'#'}{request.terminal,jdbcType=VARCHAR},
         ${r'#'}{request.terminalIp,jdbcType=VARCHAR},
         ${r'#'}{request.terminalInfo,jdbcType=VARCHAR},
         0,
@@ -80,7 +80,7 @@
             ${r'#'}{item.deptId,jdbcType=BIGINT},
             ${r'#'}{item.deptCode,jdbcType=VARCHAR},
             ${r'#'}{item.deptName,jdbcType=VARCHAR},
-            ${r'#'}{item.terminalType,jdbcType=VARCHAR},
+            ${r'#'}{item.terminal,jdbcType=VARCHAR},
             ${r'#'}{item.terminalIp,jdbcType=VARCHAR},
             ${r'#'}{item.terminalInfo,jdbcType=VARCHAR},
             0,
@@ -124,7 +124,7 @@
         "DEPT_ID" = ${r'#'}{request.deptId,jdbcType=BIGINT},
         "DEPT_CODE" = ${r'#'}{request.deptCode,jdbcType=VARCHAR},
         "DEPT_NAME" = ${r'#'}{request.deptName,jdbcType=VARCHAR},
-        "TERMINAL_TYPE" = ${r'#'}{request.terminalType,jdbcType=VARCHAR},
+        "TERMINAL" = ${r'#'}{request.terminal,jdbcType=VARCHAR},
         "TERMINAL_IP" = ${r'#'}{request.terminalIp,jdbcType=VARCHAR},
         "TERMINAL_INFO" = ${r'#'}{request.terminalInfo,jdbcType=VARCHAR},
         "ROW_VERSION" = "ROW_VERSION" + 1,
@@ -169,8 +169,8 @@
         <if test="request.deptName != null and request.deptName != ''">
             AND "DEPT_NAME" = ${r'#'}{request.deptName}
         </if>
-        <if test="request.terminalType != null and request.terminalType != ''">
+        <if test="request.terminal != null and request.terminal != ''">
-            AND "TERMINAL_TYPE" = ${r'#'}{request.terminalType}
+            AND "TERMINAL" = ${r'#'}{request.terminal}
         </if>
         <if test="request.terminalIp != null and request.terminalIp != ''">
             AND "TERMINAL_IP" = ${r'#'}{request.terminalIp}

src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_TokensMapper.xml

@@ -7,7 +7,7 @@
     <sql id="table">"SYS_TOKENS"</sql>
 
     <sql id="entityColumnList">
-        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL_TYPE","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
+        "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
     </sql>
 
     <resultMap id="tokens" type="${domain}.module.wsys.ent.Tokens">
@@ -21,7 +21,7 @@
         <result column="DEPT_ID"  jdbcType="BIGINT" property="deptId"/>
         <result column="DEPT_CODE"  jdbcType="VARCHAR" property="deptCode"/>
         <result column="DEPT_NAME"  jdbcType="VARCHAR" property="deptName"/>
-        <result column="TERMINAL_TYPE"  jdbcType="VARCHAR" property="terminal"/>
+        <result column="TERMINAL"  jdbcType="VARCHAR" property="terminal"/>
         <result column="TERMINAL_IP"  jdbcType="VARCHAR" property="terminalIp"/>
         <result column="TERMINAL_INFO"  jdbcType="VARCHAR" property="terminalInfo"/>
         <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
@@ -124,7 +124,7 @@
         DEPT_ID = ${r"#"}{request.deptId,jdbcType=BIGINT},
         DEPT_CODE = ${r"#"}{request.deptCode,jdbcType=VARCHAR},
         DEPT_NAME = ${r"#"}{request.deptName,jdbcType=VARCHAR},
-        TERMINAL_TYPE = ${r"#"}{request.terminal,jdbcType=VARCHAR},
+        TERMINAL = ${r"#"}{request.terminal,jdbcType=VARCHAR},
         TERMINAL_IP = ${r"#"}{request.terminalIp,jdbcType=VARCHAR},
         TERMINAL_INFO = ${r"#"}{request.terminalInfo,jdbcType=VARCHAR},
         "ROW_VERSION" = "ROW_VERSION" + 1,
@@ -169,7 +169,7 @@
             AND DEPT_NAME = ${r"#"}{request.deptName}
         </if>
         <if test="request.terminal != null and request.terminal != ''">
-            AND TERMINAL_TYPE = ${r"#"}{request.terminal}
+            AND TERMINAL = ${r"#"}{request.terminal}
         </if>
         <if test="request.terminalIp != null and request.terminalIp != ''">
             AND TERMINAL_IP = ${r"#"}{request.terminalIp}

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql

@@ -138,7 +138,7 @@ CREATE TABLE IF NOT EXISTS SYS_TOKENS (
     "DEPT_ID" BIGINT,
     "DEPT_CODE" VARCHAR(50),
     "DEPT_NAME" VARCHAR(100),
-    "TERMINAL_TYPE" VARCHAR(20),
+    "TERMINAL" VARCHAR(20),
     "TERMINAL_IP" VARCHAR(50),
     "TERMINAL_INFO" VARCHAR(500),
     "ROW_VERSION" BIGINT NOT NULL,

src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_TOKENS.sql

@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS SYS_TOKENS (
     "DEPT_ID" BIGINT,
     "DEPT_CODE" VARCHAR(50),
     "DEPT_NAME" VARCHAR(100),
-    "TERMINAL_TYPE" VARCHAR(20),
+    "TERMINAL" VARCHAR(20),
     "TERMINAL_IP" VARCHAR(50),
     "TERMINAL_INFO" VARCHAR(500),
     "ROW_VERSION" BIGINT NOT NULL,

src/main/resources/modules/SpringBoot/test/test.ftl

@@ -10,7 +10,9 @@ import org.springframework.transaction.annotation.Transactional;
 ${table.getImport()}
 </#if>
 import ${domain}.frame.auth.Token;
+<#if table.needMgr()>
 import ${domain}.module.${moduleName}.mgr.${table.getCName()}Manager;
+</#if>
 <#if table.getCreate()>
 import ${domain}.module.${moduleName}.req.${table.getCName()}CreateRequest;
 </#if>
@@ -58,11 +60,12 @@ public class ${table.getCName()}Test {
 
     @Autowired
     private Token token;
+<#if table.needMgr()>
 
     @Autowired
     private ${table.getCName()}Manager ${table.getFName()}Manager;
-
 <#if table.getCreate()>
+
     @Test
     public void testCreate() {
         ${table.getCName()}CreateRequest request = new ${table.getCName()}CreateRequest();
@@ -196,4 +199,5 @@ public class ${table.getCName()}Test {
         assertTrue(!response.hasError());
     }
 </#if>
+</#if>
 }