From 052e1d5c47c4e536fde79074d53b0481c7d4f9b6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十月 2021 18:33:42 +0800
Subject: [PATCH] 自动化代码生成优化
---
src/main/resources/generater/dao/mongoDBDao.template | 56 +++++++++++++++++++++++++-------------------------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/generater/dao/mongoDBDao.template b/src/main/resources/generater/dao/mongoDBDao.template
index eeea6ba..32a5d1d 100644
--- a/src/main/resources/generater/dao/mongoDBDao.template
+++ b/src/main/resources/generater/dao/mongoDBDao.template
@@ -46,43 +46,37 @@
}
private Query getQuery(DaoQuery daoQuery){
- List<Criteria> andList=new ArrayList<>();
- <#list daoQueryColumnDataList as value>
- <#if (value.type!"") == "Date">
- if(daoQuery.min${value.columnName?cap_first}!=null){
- andList.add(Criteria.where("${value.columnName}").gte(daoQuery.min${value.columnName?cap_first}));
- }
- if(daoQuery.max${value.columnName?cap_first}!=null){
- andList.add(Criteria.where("${value.columnName}").lt(daoQuery.max${value.columnName?cap_first}));
- }
- <#else>
- if(daoQuery.${value.columnName}!=null){
- <#if (value.queryType!"") == "equal">
- andList.add(Criteria.where("${value.columnName}").is(daoQuery.${value.columnName}));
- <#else>
- andList.add(Criteria.where("${value.columnName}").regex(daoQuery.${value.columnName}));
- </#if>
- }
- </#if>
- </#list>
- Query query=new Query();
- Criteria[] ands=new Criteria[andList.size()];
- andList.toArray(ands);
- if(ands.length>0){
- query.addCriteria(new Criteria().andOperator(ands));
- }
- return query;
+ List<Criteria> andList=new ArrayList<>();
+ <#list daoQueryColumnDataList as value>
+ if(daoQuery.${value.columnName}!=null){
+ <#if (value.queryType!"") == "equal">
+ andList.add(Criteria.where("${value.columnData.property}").is(daoQuery.${value.columnName}));
+ <#elseif (value.queryType!"") == "gt">
+ andList.add(Criteria.where("${value.columnData.property}").gt(daoQuery.${value.columnName}));
+ <#elseif (value.queryType!"") == "gte">
+ andList.add(Criteria.where("${value.columnData.property}").gte(daoQuery.${value.columnName}));
+ <#elseif (value.queryType!"") == "lt">
+ andList.add(Criteria.where("${value.columnData.property}").lt(daoQuery.${value.columnName}));
+ <#elseif (value.queryType!"") == "lte">
+ andList.add(Criteria.where("${value.columnData.property}").lte(daoQuery.${value.columnName}));
+ <#else>
+ andList.add(Criteria.where("${value.columnData.property}").regex(daoQuery.${value.columnName}));
+ </#if>
+ }
+ </#list>
+ Query query=new Query();
+ Criteria[] ands=new Criteria[andList.size()];
+ andList.toArray(ands);
+ if(ands.length>0){
+ query.addCriteria(new Criteria().andOperator(ands));
+ }
+ return query;
}
public static class DaoQuery{
<#if daoQueryColumnDataList??>
<#list daoQueryColumnDataList as value>
- <#if (value.type!"") == "Date">
- public ${value.type} min${value.columnName?cap_first};
- public ${value.type} max${value.columnName?cap_first};
- <#else>
public ${value.type} ${value.columnName};
- </#if>
</#list>
</#if>
public int start;
--
Gitblit v1.8.0