From 175366e2c593e037f385799bc0266e6ae2141e3b Mon Sep 17 00:00:00 2001 From: 王彬 Date: Tue, 31 Jul 2018 11:25:34 +0800 Subject: [PATCH] 1.提交修正 --- src/com/taover/base/template/DAOTemplate.ftl | 91 ++----------------------------------------------------------------------------------------- src/com/taover/base/template/HtmlLayuiTemplate.ftl | 2 +- src/com/taover/base/template/POTemplate.ftl | 29 ----------------------------- 3 files changed, 3 insertions(+), 119 deletions(-) diff --git a/src/com/taover/base/template/DAOTemplate.ftl b/src/com/taover/base/template/DAOTemplate.ftl index 1bb82d3..46bdbdf 100644 --- a/src/com/taover/base/template/DAOTemplate.ftl +++ b/src/com/taover/base/template/DAOTemplate.ftl @@ -22,7 +22,7 @@ public class ${beanName}Dao { @Resource private JdbcTemplate jdbcegroceryWrite; - Log logger = LogFactory.getLog(this.getClass()); + Log logger = LogFactory.getLog(this.getClass()); /** @@ -567,83 +567,7 @@ public class ${beanName}Dao { } return count; } - - /** - * 根据对象ID修改。 - */ - public int update${beanName}PO(${beanName}PO ${beanName}) { - if (null == ${beanName} || null == ${beanName}.get${pkBeanName}()) { - LogUtils.error("error:", logger, new Exception("请求条件异常，请求对象和对象ID不能为空！"), null, null); - return -1; - } - Date starttime = new Date(); - StringBuffer sql = new StringBuffer("UPDATE ${tableName} SET"); - StringBuffer pql = new StringBuffer(sql.toString()); - List list = new ArrayList(); - <#if columnList?exists> - <#list columnList as clist> - <#if clist.seqName?exists> - <#else> - <#if clist.columnJAVAType = "Long" || clist.columnJAVAType = "Integer" || clist.columnJAVAType = "Short" || clist.columnJAVAType = "Float" || clist.columnJAVAType = "Double"> - boolean ${clist.columnUName}IsZero = false; - Object variation${clist.columnUName} = ${beanName}.getVariation${clist.columnUName}(); - if (variation${clist.columnUName} instanceof BigDecimal) { - ${clist.columnUName}IsZero = (((BigDecimal)variation${clist.columnUName}).compareTo(BigDecimal.ZERO) == 0); - } else { - Long l${clist.columnUName} = Long.parseLong(String.valueOf(variation${clist.columnUName})); - ${clist.columnUName}IsZero = (l${clist.columnUName} == 0); - } - if (!${clist.columnUName}IsZero) { - sql.append(" ${clist.columnName} = ${clist.columnName} + ?, "); - pql.append(" ${clist.columnName} = ${clist.columnName} + " + ${beanName}.getVariation${clist.columnUName}() + ","); - list.add(${beanName}.getVariation${clist.columnUName}()); - } else { - sql.append(" ${clist.columnName} = ?, "); - pql.append(" ${clist.columnName} = " + ${beanName}.get${clist.columnUName}() + ","); - list.add(${beanName}.get${clist.columnUName}()); - } - <#elseif clist.columnJAVAType = "java.math.BigDecimal"> - if (${beanName}.getVariation${clist.columnUName}().compareTo(BigDecimal.ZERO) != 0) { - sql.append(" ${clist.columnName} = ${clist.columnName} + ?, "); - pql.append(" ${clist.columnName} = ${clist.columnName} + " + ${beanName}.getVariation${clist.columnUName}() + ","); - list.add(${beanName}.getVariation${clist.columnUName}()); - } else { - sql.append(" ${clist.columnName} = ?, "); - pql.append(" ${clist.columnName} = " + ${beanName}.get${clist.columnUName}() + ","); - list.add(${beanName}.get${clist.columnUName}()); - } - <#else> - sql.append(" ${clist.columnName} = ?, "); - pql.append(" ${clist.columnName} = " + ${beanName}.get${clist.columnUName}() + ","); - list.add(${beanName}.get${clist.columnUName}()); - - - - - - String where = " WHERE ${pkColumName} = ?"; - String pwhere = " WHERE ${pkColumName} = " + ${beanName}.get${pkBeanName}(); - list.add(${beanName}.get${pkBeanName}()); - int count = 0; - try { - count = jdbcegroceryWrite.update(StringUtil.removeLast(sql.toString()) + where, list.toArray()); - return count; - } catch (Exception e) { - LogUtils.error("error:", logger, e, StringUtil.removeLast(pql.toString()) + pwhere, null); - } finally { - Date endtime = new Date(); - LogUtils.info("info", logger, - "${beanName}Dao.update${beanName}PO(${beanName}PO ${beanName})\n" - + "执行SQL：" + StringUtil.removeLast(pql.toString()) + pwhere + "\n" - + "方法执行时长：" + (endtime.getTime()-starttime.getTime()) + "毫秒, 影响记录数：" + count + "(" - + StringUtil.dateToFormatStr(starttime, "yyyy-MM-dd HH:mm:ss.SSS") - + "*-*" - + StringUtil.dateToFormatStr(endtime, "yyyy-MM-dd HH:mm:ss.SSS") - + ")"); - } - return -1; - } - + /** * 根据ID修改指定的值 */ @@ -705,17 +629,6 @@ public class ${beanName}Dao { } /** - * 批量修改。 - */ - public int update${beanName}POList(List<${beanName}PO> ${beanName}list) { - int count = 0; - for (${beanName}PO ${beanName} : ${beanName}list) { - count += update${beanName}PO(${beanName}); - } - return count; - } - - /** * List updateObj 要修改成的值，数组长度为2，第一个值为列名，第二个值是要改成的值。 * List condition 修改的条件， 数组长度是3, 第一个参数是列名，第二个参数是操作符，第三个参数是查询条件的值。 */ diff --git a/src/com/taover/base/template/HtmlLayuiTemplate.ftl b/src/com/taover/base/template/HtmlLayuiTemplate.ftl index 4e533a1..19ea78a 100644 --- a/src/com/taover/base/template/HtmlLayuiTemplate.ftl +++ b/src/com/taover/base/template/HtmlLayuiTemplate.ftl @@ -2,7 +2,7 @@ - 八爪云ERP系统 + 爱风尚ERP系统 diff --git a/src/com/taover/base/template/POTemplate.ftl b/src/com/taover/base/template/POTemplate.ftl index 5f43059..6edba50 100644 --- a/src/com/taover/base/template/POTemplate.ftl +++ b/src/com/taover/base/template/POTemplate.ftl @@ -36,35 +36,6 @@ import java.io.Serializable; this.${clist.columnName} = ${clist.columnName}; } - <#if clist.columnJAVAType = "Long" || clist.columnJAVAType = "java.math.BigDecimal" || clist.columnJAVAType = "Integer" || clist.columnJAVAType = "Short" || clist.columnJAVAType = "Float" || clist.columnJAVAType = "Double"> - <#if clist.columnJAVAType = "Long"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = 0L; - - <#if clist.columnJAVAType = "java.math.BigDecimal"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = new java.math.BigDecimal(0.0); - - <#if clist.columnJAVAType = "Integer"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = 0; - - <#if clist.columnJAVAType = "Short"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = 0; - - <#if clist.columnJAVAType = "Double"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = 0d; - - <#if clist.columnJAVAType = "Float"> - private ${clist.columnJAVAType} variation${clist.columnMethodName} = 0f; - - public ${clist.columnJAVAType} getVariation${clist.columnMethodName}(){ - return variation${clist.columnMethodName}; - } - - public void setVariation${clist.columnMethodName}(${clist.columnJAVAType} variation${clist.columnName}){ - this.variation${clist.columnMethodName} = variation${clist.columnName}; - } - - - -- libgit2 0.21.2