1、SpringBoot优化

Former-commit-id: 1e7b858c6c8d88ba6d3078e37e86d19fdce42fe8
master
wangbing 5 years ago
parent f03cff9102
commit 1dc13220b2

@ -1,6 +1,7 @@
package ${basePackage}.action.screen; package ${basePackage}.action.screen;
import ${basePackage}.frame.base.Screen; import ${basePackage}.frame.base.Screen;
import ${basePackage}.frame.auth.LocalData;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import java.util.HashMap; import java.util.HashMap;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -18,5 +19,6 @@ public class Index extends Screen {
prop.put("tran", false);//是否展示动画 prop.put("tran", false);//是否展示动画
prop.put("full", false);//是否全屏 prop.put("full", false);//是否全屏
model.addAttribute("prop", prop); model.addAttribute("prop", prop);
model.addAttribute("token", LocalData.getToken());
} }
} }

@ -65,58 +65,4 @@ public class WebMvcConfig implements WebMvcConfigurer {
} }
} }
} }
// @Bean
// @Profile("prod")
// public ServletWebServerFactory servletContainer() {
// TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory();
//
// // 基本参数
// String keyStore = "1754557_www.wbsite.xyz.pfx";
// String keyStorePassword = "s98n7CLd";
// String keyStoreType = "PKCS12";
// int httpsPort = 443;
//
// File keystore = null;
// // 正常开发可以通过getFile()获取打包jar后无法直接获取File对象需将文件考出
// try {
// keystore = new ClassPathResource(keyStore).getFile();
// } catch (IOException ex) {
// try {
// ApplicationHome home = new ApplicationHome(getClass());
// // 当前运行jar文件
// File jarFile = home.getSource();
// //jar同目录
// keystore = new File(jarFile.getParent(), keyStore);
//
// InputStream inputStream = new ClassPathResource(keyStore).getInputStream();
// byte[] bytes = new byte[inputStream.available()];
//
// inputStream.read(bytes);
//
// inputStream.close();
//
// FileOutputStream fileOutputStream = new FileOutputStream(keystore);
// fileOutputStream.write(bytes);
// fileOutputStream.close();
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
//
// // 创建Connector
// Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
// Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler();
// connector.setScheme("https");
// connector.setSecure(true);
// connector.setPort(httpsPort);
// protocol.setSSLEnabled(true);
// protocol.setKeystoreFile(keystore.getAbsolutePath());
// protocol.setKeystorePass(keyStorePassword);
// protocol.setKeystoreType(keyStoreType);
//
// // 添加
// tomcat.addAdditionalTomcatConnectors(connector);
// return tomcat;
// }
} }

@ -136,10 +136,8 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
USER_NAME = ${r"#"}{request.userName,jdbcType=VARCHAR},
USER_CODE = ${r"#"}{request.userCode,jdbcType=VARCHAR}, USER_CODE = ${r"#"}{request.userCode,jdbcType=VARCHAR},
USER_ALIAS = ${r"#"}{request.userAlias,jdbcType=VARCHAR}, USER_ALIAS = ${r"#"}{request.userAlias,jdbcType=VARCHAR},
USER_PWD = ${r"#"}{request.userPwd,jdbcType=VARCHAR},
USER_STATUS = ${r"#"}{request.userStatus,jdbcType=VARCHAR}, USER_STATUS = ${r"#"}{request.userStatus,jdbcType=VARCHAR},
DEPT_ID = ${r"#"}{request.deptId,jdbcType=BIGINT}, DEPT_ID = ${r"#"}{request.deptId,jdbcType=BIGINT},
DEPT_CODE = ${r"#"}{request.deptCode,jdbcType=VARCHAR}, DEPT_CODE = ${r"#"}{request.deptCode,jdbcType=VARCHAR},

@ -22,6 +22,12 @@ public class UserUpdateRequest extends BaseUpdateRequest {
@NotNull(message = "[id]主键不能为NULL") @NotNull(message = "[id]主键不能为NULL")
private Long id; private Long id;
/**
*
*/
@Length(min = 0, max = 50, message = "[userCode]用户代码长度不合法(0-50)")
private String userCode;
/** /**
* *
*/ */
@ -60,6 +66,14 @@ public class UserUpdateRequest extends BaseUpdateRequest {
this.id = id; this.id = id;
} }
public String getUserCode() {
return this.userCode;
}
public void setUserCode(String userCode) {
this.userCode = userCode;
}
public String getUserAlias() { public String getUserAlias() {
return this.userAlias; return this.userAlias;
} }

@ -8,6 +8,7 @@ import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.auth.Token;
import ${basePackage}.frame.utils.MapperUtil;
import ${basePackage}.module.system.mgr.DictItemManager; import ${basePackage}.module.system.mgr.DictItemManager;
import ${basePackage}.module.system.mgr.DictManager; import ${basePackage}.module.system.mgr.DictManager;
import ${basePackage}.module.system.req.DictCreateRequest; import ${basePackage}.module.system.req.DictCreateRequest;

@ -4,24 +4,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper"> <mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper">
<#if dataBase == 'Oracle'>
<sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql>
<#elseif dataBase='MySQL'>
<sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql> <sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql>
</#if>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#if dataBase == 'Oracle'> <#list table.fields as field>`${field.fieldName}`<#if field_has_next>,</#if></#list>
<#list table.fields as f>"${f.fieldName}"<#if f_has_next>,</#if></#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>`${f.fieldName}`<#if f_has_next>,</#if></#list>
</#if>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -32,31 +23,17 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
1 = 1 1 = 1
<#list table.fields as f> <#list table.fields as field>
<#if f.isQuery> <#if field.isQuery>
<#if dataBase == 'Oracle'> <#if field.fieldType.javaType() == "String">
<#if f.fieldType.javaType() == "String"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> <#elseif field.fieldType.javaType() == "Boolean">
<#if f.fieldType.javaType() == "Boolean"> <if test="request.${field.getFName()} != null">
<if test="request.${f.getFName()} != null"> AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> </#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
</select> </select>
@ -66,26 +43,21 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
<#if table.hasSearchKey()>
<#list table.searchKeyList() as field>
<#if field_index = 0>
WHERE WHERE
<#if table.hasSeachKey()> (
1 = 2 `${field.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%')
<if test="request.keyword != null and request.keyword != ''"> <#else>
<#list table.fields as f> OR `${field.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%')
<#if f.isQuery>
<#if dataBase == 'Oracle'>
<#if f.fieldType.javaType() == "String">
OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%')
</#if>
</#if> </#if>
<#if !field_has_next>
)
</#if> </#if>
</#list> </#list>
</if>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</select> </select>
@ -97,8 +69,8 @@
) )
VALUES VALUES
( (
<#list table.fields as f> <#list table.fields as field>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>,</#if>
</#list> </#list>
) )
</insert> </insert>
@ -106,38 +78,16 @@
<delete id="delete"> <delete id="delete">
DELETE FROM DELETE FROM
<include refid="table"/> <include refid="table"/>
WHERE
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</delete> </delete>
@ -145,47 +95,21 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#if dataBase == 'Oracle'> <#list table.fields as field>
<#list table.fields as f> <#if !field.isPrimaryKey>
"${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> `${field.fieldName}` = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>
`${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if>
</#list>
</#if> </#if>
WHERE </#list>
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</update> </update>
</mapper> </mapper>

@ -7,12 +7,12 @@
<sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql> <sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#list table.fields as f>`${f.fieldName}`<#if f_has_next>,</#if></#list> <#list table.fields as field>`${field.fieldName}`<#if field_has_next>,</#if></#list>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -23,57 +23,56 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
`IS_DELETED` = 0 `IS_DELETED` = 0
</#if> <#list table.fields as field>
<#list table.fields as f> <#if field.isQuery>
<#if f.isQuery> <#if field.fieldType.javaType() == "Boolean">
<#if f.fieldType.javaType() == "Boolean"> <if test="request.${field.getFName()} != null">
<if test="request.${f.getFName()} != null"> AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Byte"> <#if field.fieldType.javaType() == "Byte">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Short"> <#if field.fieldType.javaType() == "Short">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Integer"> <#if field.fieldType.javaType() == "Integer">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Long"> <#if field.fieldType.javaType() == "Long">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Float"> <#if field.fieldType.javaType() == "Float">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Double"> <#if field.fieldType.javaType() == "Double">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Character"> <#if field.fieldType.javaType() == "Character">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "String"> <#if field.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}} AND `${field.fieldName}` = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Date"> <#if field.fieldType.javaType() == "Date">
<if test="request.${f.getFName()} != null"> <if test="request.${field.getFName()} != null">
AND DATE_FORMAT(`${f.fieldName}`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#{"}request.${f.getFName()}},"%Y-%m-%d %T") AND DATE_FORMAT(`${field.fieldName}`,"%Y-%m-%d %T") = DATE_FORMAT(${r"#{"}request.${field.getFName()}},"%Y-%m-%d %T")
</if> </if>
</#if> </#if>
</#if> </#if>
@ -87,14 +86,19 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
`IS_DELETED` = 0 `IS_DELETED` = 0
<#if table.hasSearchKey()>
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
1 = 2 AND (
<#list table.fields as f> <#list table.searchKeyList() as field>
<#if f.isSearch> <#if field_index == 0>
OR `${f.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%') `${field.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%')
<#else>
OR `${field.fieldName}` LIKE CONCAT('%',${r"#{request.keyword}"},'%')
</#if> </#if>
</#list> </#list>
)
</if> </if>
</#if>
</select> </select>
<insert id="insert"> <insert id="insert">
@ -106,9 +110,9 @@
VALUES VALUES
( (
${r"#{"}request.id}, ${r"#{"}request.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -130,9 +134,9 @@
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
${r"#{"}item.id}, ${r"#{"}item.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -157,18 +161,17 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#list table.fields as f> <#list table.fields as field>
<#if !f.isPrimaryKey> <#if !field.isPrimaryKey>
<#if !f.isSystem || f.fieldName == 'ID'> <#if !field.isSystem || field.fieldName == 'ID'>
`${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, `${field.fieldName}` = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#if> </#if>
</#list> </#list>
`ROW_VERSION` = `ROW_VERSION` + 1, `ROW_VERSION` = `ROW_VERSION` + 1,
`LAST_UPDATE_BY` = ${r"#{"}token.userId}, `LAST_UPDATE_BY` = ${r"#{"}token.userId},
`LAST_UPDATE_TIME` = sysdate() `LAST_UPDATE_TIME` = sysdate()
WHERE WHERE `IS_DELETED` = 0
`IS_DELETED` = 0
AND `ID` = ${r"#{"}request.id} AND `ID` = ${r"#{"}request.id}
AND `ROW_VERSION` = ${r"#{"}request.rowVersion} AND `ROW_VERSION` = ${r"#{"}request.rowVersion}
</update> </update>
@ -178,8 +181,7 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
WHERE WHERE `IS_DELETED` = 0
`IS_DELETED` = 0
AND `ID` = ${r"#{request.id}"} AND `ID` = ${r"#{request.id}"}
</select> </select>
</mapper> </mapper>

@ -4,24 +4,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper"> <mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper">
<#if dataBase == 'Oracle'>
<sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql> <sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql>
<#elseif dataBase='MySQL'>
<sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql>
</#if>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#if dataBase == 'Oracle'> <#list table.fields as field>"${field.fieldName}"<#if field_has_next>,</#if></#list>
<#list table.fields as f>"${f.fieldName}"<#if f_has_next>,</#if></#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>`${f.fieldName}`<#if f_has_next>,</#if></#list>
</#if>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -32,31 +23,17 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
1 = 1 1 = 1
<#list table.fields as f> <#list table.fields as field>
<#if f.isQuery> <#if field.isQuery>
<#if dataBase == 'Oracle'> <#if field.fieldType.javaType() == "String">
<#if f.fieldType.javaType() == "String"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> <#elseif field.fieldType.javaType() == "Boolean">
<#if f.fieldType.javaType() == "Boolean"> <if test="request.${field.getFName()} != null">
<if test="request.${f.getFName()} != null"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> </#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
</select> </select>
@ -66,26 +43,21 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
<#if table.hasSearchKey()>
<#list table.searchKeyList() as field>
<#if field_index = 0>
WHERE WHERE
1 = 1 (
<#if table.hasSeachKey()> "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<if test="request.keyword != null and request.keyword != ''"> <#else>
1 = 1 OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<#list table.fields as f>
<#if f.isQuery>
<#if dataBase == 'Oracle'>
<#if f.fieldType.javaType() == "String">
OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%')
</#if>
</#if> </#if>
<#if !field_has_next>
)
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</select> </select>
@ -97,8 +69,8 @@
) )
VALUES VALUES
( (
<#list table.fields as f> <#list table.fields as field>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>,</#if>
</#list> </#list>
) )
</insert> </insert>
@ -106,38 +78,16 @@
<delete id="delete"> <delete id="delete">
DELETE FROM DELETE FROM
<include refid="table"/> <include refid="table"/>
WHERE
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</delete> </delete>
@ -145,47 +95,21 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#if dataBase == 'Oracle'> <#list table.fields as field>
<#list table.fields as f> <#if !field.isPrimaryKey>
"${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>,</#if>
</#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>
`${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if>
</#list>
</#if> </#if>
WHERE </#list>
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</update> </update>
</mapper> </mapper>

@ -7,12 +7,12 @@
<sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql> <sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#list table.fields as f>"${f.fieldName}"<#if f_has_next>,</#if></#list> <#list table.fields as field>"${field.fieldName}"<#if field_has_next>,</#if></#list>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -23,56 +23,56 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
"IS_DELETED" = 0 "IS_DELETED" = 0
<#list table.fields as f> <#list table.fields as field>
<#if f.isQuery> <#if field.isQuery>
<#if f.fieldType.javaType() == "Boolean"> <#if field.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null"> <if test="request.${field.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Byte"> <#if field.fieldType.javaType() == "Byte">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Short"> <#if field.fieldType.javaType() == "Short">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Integer"> <#if field.fieldType.javaType() == "Integer">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Long"> <#if field.fieldType.javaType() == "Long">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Float"> <#if field.fieldType.javaType() == "Float">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Double"> <#if field.fieldType.javaType() == "Double">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Character"> <#if field.fieldType.javaType() == "Character">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "String"> <#if field.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}} AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Date"> <#if field.fieldType.javaType() == "Date">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND to_char("${f.fieldName}",'yyyy-MM-dd HH24:mi:ss') = to_char(${r"#{"}request.${f.getFName()}},'yyyy-MM-dd HH24:mi:ss') 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> </#if>
</#if> </#if>
@ -86,13 +86,19 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
"IS_DELETED" = 0 "IS_DELETED" = 0
<#if table.hasSearchKey()>
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
1 = 2 AND (
<#list table.fields as f> <#list table.searchKeyList() as field>
<#if f.isSearch> <#if field_index == 0>
OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%' "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<#else>
OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
</#if>
</#list> </#list>
)
</if> </if>
</#if>
</select> </select>
<insert id="insert"> <insert id="insert">
@ -104,9 +110,9 @@
VALUES VALUES
( (
${r"#{"}request.id}, ${r"#{"}request.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -128,9 +134,9 @@
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
${r"#{"}item.id}, ${r"#{"}item.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -155,18 +161,17 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#list table.fields as f> <#list table.fields as field>
<#if !f.isPrimaryKey> <#if !field.isPrimaryKey>
<#if !f.isSystem || f.fieldName == 'ID'> <#if !field.isSystem || field.fieldName == 'ID'>
"${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#if> </#if>
</#list> </#list>
"ROW_VERSION" = "ROW_VERSION" + 1, "ROW_VERSION" = "ROW_VERSION" + 1,
"LAST_UPDATE_BY" = ${r"#{"}token.userId}, "LAST_UPDATE_BY" = ${r"#{"}token.userId},
"LAST_UPDATE_TIME" = sysdate "LAST_UPDATE_TIME" = sysdate
WHERE WHERE "IS_DELETED" = 0
"IS_DELETED" = 0
AND "ID" = ${r"#{"}request.id} AND "ID" = ${r"#{"}request.id}
AND "ROW_VERSION" = ${r"#{"}request.rowVersion} AND "ROW_VERSION" = ${r"#{"}request.rowVersion}
</update> </update>
@ -176,8 +181,7 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
WHERE WHERE "IS_DELETED" = 0
"IS_DELETED" = 0
AND "ID" = ${r"#{request.id}"} AND "ID" = ${r"#{request.id}"}
</select> </select>
</mapper> </mapper>

@ -4,24 +4,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper"> <mapper namespace="${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper">
<#if dataBase == 'Oracle'>
<sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql> <sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql>
<#elseif dataBase='MySQL'>
<sql id="table">`${module.modulePrefix?default("")}${table.tableName}`</sql>
</#if>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#if dataBase == 'Oracle'> <#list table.fields as field>"${field.fieldName}"<#if field_has_next>,</#if></#list>
<#list table.fields as f>"${f.fieldName}"<#if f_has_next>,</#if></#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>`${f.fieldName}`<#if f_has_next>,</#if></#list>
</#if>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -32,31 +23,17 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
1 = 1 1 = 1
<#list table.fields as f> <#list table.fields as field>
<#if f.isQuery> <#if field.isQuery>
<#if dataBase == 'Oracle'> <#if field.fieldType.javaType() == "String">
<#if f.fieldType.javaType() == "String"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> <#elseif field.fieldType.javaType() == "Boolean">
<#if f.fieldType.javaType() == "Boolean"> <if test="request.${field.getFName()} != null">
<if test="request.${f.getFName()} != null"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if> </if>
</#if> </#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
</select> </select>
@ -66,26 +43,21 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
<#if table.hasSearchKey()>
<#list table.searchKeyList() as field>
<#if field_index = 0>
WHERE WHERE
1 = 1 (
<#if table.hasSeachKey()> "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<if test="request.keyword != null and request.keyword != ''"> <#else>
1 = 1 OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<#list table.fields as f>
<#if f.isQuery>
<#if dataBase == 'Oracle'>
<#if f.fieldType.javaType() == "String">
OR "${f.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
OR `${f.fieldName}` LIKE CONCAT(CONCAT('%',${r"#{"}request.keyword}),'%')
</#if>
</#if> </#if>
<#if !field_has_next>
)
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</select> </select>
@ -97,8 +69,8 @@
) )
VALUES VALUES
( (
<#list table.fields as f> <#list table.fields as field>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>,</#if>
</#list> </#list>
) )
</insert> </insert>
@ -106,38 +78,16 @@
<delete id="delete"> <delete id="delete">
DELETE FROM DELETE FROM
<include refid="table"/> <include refid="table"/>
WHERE
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</delete> </delete>
@ -145,47 +95,21 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#if dataBase == 'Oracle'> <#list table.fields as field>
<#list table.fields as f> <#if !field.isPrimaryKey>
"${f.fieldName}" = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if> "${field.fieldName}" = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}}<#if field_has_next>,</#if>
</#list>
<#elseif dataBase='MySQL'>
<#list table.fields as f>
`${f.fieldName}` = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}<#if f_has_next>,</#if>
</#list>
</#if> </#if>
WHERE </#list>
<#if table.hasPrimaryKey()> <#if table.hasPrimaryKey()>
1 = 1 <#list table.primaryKeyList() as field>
<#list table.fields as f> <#if field_index = 0>
<#if f.isPrimaryKey> WHERE "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<#if dataBase == 'Oracle'> <#else>
<#if f.fieldType.javaType() == "String"> AND "${field.fieldName}" = ${r"#{"}request.${field.getFName()}}
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND "${f.fieldName}" = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#elseif dataBase='MySQL'>
<#if f.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
<#if f.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null">
AND `${f.fieldName}` = ${r"#{"}request.${f.getFName()}}
</if>
</#if>
</#if>
</#if> </#if>
</#list> </#list>
<#else> <#else>
1 = 2 WHERE 1 = 2
</#if> </#if>
</update> </update>
</mapper> </mapper>

@ -7,12 +7,12 @@
<sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql> <sql id="table">"${module.modulePrefix?default("")}${table.tableName}"</sql>
<sql id="entityColumnList"> <sql id="entityColumnList">
<#list table.fields as f>"${f.fieldName}"<#if f_has_next>,</#if></#list> <#list table.fields as field>"${field.fieldName}"<#if field_has_next>,</#if></#list>
</sql> </sql>
<resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}"> <resultMap id="${table.getFName()}" type="${basePackage}.module.${moduleName}.ent.${table.getCName()}">
<#list table.fields as f> <#list table.fields as field>
<result column="${f.fieldName}" jdbcType="${f.fieldType.jdbcType()}" property="${f.getFName()}"/> <result column="${field.fieldName}" jdbcType="${field.fieldType.jdbcType()}" property="${field.getFName()}"/>
</#list> </#list>
</resultMap> </resultMap>
@ -23,56 +23,56 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
"IS_DELETED" = 0 "IS_DELETED" = 0
<#list table.fields as f> <#list table.fields as field>
<#if f.isQuery> <#if field.isQuery>
<#if f.fieldType.javaType() == "Boolean"> <#if field.fieldType.javaType() == "Boolean">
<if test="request.${f.getFName()} != null"> <if test="request.${field.getFName()} != null">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Byte"> <#if field.fieldType.javaType() == "Byte">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Short"> <#if field.fieldType.javaType() == "Short">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Integer"> <#if field.fieldType.javaType() == "Integer">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Long"> <#if field.fieldType.javaType() == "Long">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Float"> <#if field.fieldType.javaType() == "Float">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Double"> <#if field.fieldType.javaType() == "Double">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != 0"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != 0">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Character"> <#if field.fieldType.javaType() == "Character">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "String"> <#if field.fieldType.javaType() == "String">
<if test="request.${f.getFName()} != null and request.${f.getFName()} != ''"> <if test="request.${field.getFName()} != null and request.${field.getFName()} != ''">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
<#if f.fieldType.javaType() == "Date"> <#if field.fieldType.javaType() == "Date">
<if test="request.${f.getFName()} != null"> <if test="request.${field.getFName()} != null">
AND ${f.fieldName} = ${r"#{"}request.${f.getFName()}} AND ${field.fieldName} = ${r"#{"}request.${field.getFName()}}
</if> </if>
</#if> </#if>
</#if> </#if>
@ -86,14 +86,19 @@
<include refid="table"/> <include refid="table"/>
WHERE WHERE
"IS_DELETED" = 0 "IS_DELETED" = 0
<#if table.hasSearchKey()>
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
1 = 2 AND (
<#list table.fields as f> <#list table.searchKeyList() as field>
<#if f.isSearch> <#if field_index == 0>
OR ${f.fieldName} LIKE CONCAT('%',${r"#{request.keyword}"},'%') "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
<#else>
OR "${field.fieldName}" LIKE '%'||${r"#{"}request.keyword}||'%'
</#if> </#if>
</#list> </#list>
)
</if> </if>
</#if>
</select> </select>
<insert id="insert"> <insert id="insert">
@ -105,9 +110,9 @@
VALUES VALUES
( (
${r"#{"}request.id}, ${r"#{"}request.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -129,9 +134,9 @@
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
${r"#{"}item.id}, ${r"#{"}item.id},
<#list table.fields as f> <#list table.fields as field>
<#if !f.isSystem> <#if !field.isSystem>
${r"#{"}item.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${r"#{"}item.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#list> </#list>
0, 0,
@ -156,18 +161,17 @@
UPDATE UPDATE
<include refid="table"/> <include refid="table"/>
SET SET
<#list table.fields as f> <#list table.fields as field>
<#if !f.isPrimaryKey> <#if !field.isPrimaryKey>
<#if !f.isSystem || f.fieldName == 'ID'> <#if !field.isSystem || field.fieldName == 'ID'>
${f.fieldName} = ${r"#{"}request.${f.getFName()},jdbcType=${f.fieldType.jdbcType()}}, ${field.fieldName} = ${r"#{"}request.${field.getFName()},jdbcType=${field.fieldType.jdbcType()}},
</#if> </#if>
</#if> </#if>
</#list> </#list>
"ROW_VERSION" = "ROW_VERSION" + 1, "ROW_VERSION" = "ROW_VERSION" + 1,
"LAST_UPDATE_BY" = ${r"#{"}token.userId}, "LAST_UPDATE_BY" = ${r"#{"}token.userId},
"LAST_UPDATE_TIME" = datetime('now','localtime') "LAST_UPDATE_TIME" = datetime('now','localtime')
WHERE WHERE "IS_DELETED" = 0
"IS_DELETED" = 0
AND "ID" = ${r"#{"}request.id} AND "ID" = ${r"#{"}request.id}
AND "ROW_VERSION" = ${r"#{"}request.rowVersion} AND "ROW_VERSION" = ${r"#{"}request.rowVersion}
</update> </update>
@ -177,8 +181,7 @@
<include refid="entityColumnList"/> <include refid="entityColumnList"/>
FROM FROM
<include refid="table"/> <include refid="table"/>
WHERE WHERE IS_DELETED = 0
IS_DELETED = 0
AND ID = ${r"#{request.id}"} AND ID = ${r"#{request.id}"}
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save

Powered by TurnKey Linux.