es支持

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/filter/%DE%SearchContext.java.ftl

@@ -330,27 +330,27 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
 <#macro esqueryCond formitem>
     <#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'>
         <#if formitem.getValueOp() == "LIKE">
-        this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("*%s*",${formitem.getName()?lower_case})));
+            this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("*%s*",${formitem.getName()?lower_case})));
         <#elseif formitem.getValueOp() == "LEFTLIKE">
-        this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("%s*",${formitem.getName()?lower_case})));
+            this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("%s*",${formitem.getName()?lower_case})));
         <#elseif formitem.getValueOp() == "RIGHTLIKE">
-        this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("*%s",${formitem.getName()?lower_case})));
+            this.getEsCond().must(QueryBuilders.wildcardQuery("${formitem.getPSDEField().getName()?lower_case}", String.format("*%s",${formitem.getName()?lower_case})));
         <#elseif formitem.getValueOp() == "EQ">
-        this.getEsCond().must(QueryBuilders.termQuery("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case}));
+            this.getEsCond().must(QueryBuilders.termQuery("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "NOTEQ">
-        this.getEsCond().mustNot(QueryBuilders.termQuery("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case}));
+            this.getEsCond().mustNot(QueryBuilders.termQuery("${formitem.getPSDEField().getName()?lower_case}", ${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "GT">
-        this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").gt(${formitem.getName()?lower_case}));
+            this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").gt(${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "GTANDEQ">
-        this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").gte(${formitem.getName()?lower_case}));
+            this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").gte(${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "LT">
-        this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").lt(${formitem.getName()?lower_case}));
+            this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").lt(${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "LTANDEQ">
-        this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").lte(${formitem.getName()?lower_case}));
+            this.getEsCond().must(QueryBuilders.rangeQuery("${formitem.getPSDEField().getName()?lower_case}").lte(${formitem.getName()?lower_case}));
         <#elseif formitem.getValueOp() == "ISNOTNULL">
-        this.getEsCond().mustNot(QueryBuilders.existsQuery("${formitem.getPSDEField().getName()?lower_case}"));
+            this.getEsCond().mustNot(QueryBuilders.existsQuery("${formitem.getPSDEField().getName()?lower_case}"));
         <#elseif formitem.getValueOp() == "ISNULL">
-        this.getEsCond().must(QueryBuilders.existsQuery("${formitem.getPSDEField().getName()?lower_case}"));
+            this.getEsCond().must(QueryBuilders.existsQuery("${formitem.getPSDEField().getName()?lower_case}"));
         <#elseif formitem.getValueOp() == "IN">
         <#elseif formitem.getValueOp() == "NOTIN">
         </#if>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/es/dao/%DE%Repository.java.ftl

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * 实体[${item.getLogicName()}]
  */
 @Repository
-public class ${item.getCodeName()}Repository extends ElasticsearchRepository<${item.getCodeName()}, String>{
+public interface ${item.getCodeName()}Repository extends ElasticsearchRepository<${item.getCodeName()}, String>{
 
 }
 </#if>

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/es/domain/%DE%.java.ftl

@@ -4,26 +4,12 @@ TARGET=PSDATAENTITY
 <#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'>
 package ${pub.getPKGCodeName()}.core.es.domain;
 
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.DigestUtils;
-import java.io.Serializable;
-import lombok.*;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 @Document(indexName = "${sys.codeName}", type = "${item.codeName}", shards = 5, replicas = 1)
 public class ${item.codeName} implements Serializable {

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/es/service/I%DE%Service.java.ftl

@@ -4,29 +4,16 @@ TARGET=PSDATAENTITY
 <#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'>
 package ${pub.getPKGCodeName()}.core.es.service;
 
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collection;
-import java.math.BigInteger;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.scheduling.annotation.Async;
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.cache.annotation.CacheEvict;
-
 import ${pub.getPKGCodeName()}.core.es.domain.${item.codeName};
-import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.filter.${de.getCodeName()}SearchContext;
-import com.baomidou.mybatisplus.extension.service.IService;
+import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.filter.${item.codeName}SearchContext;
+import org.springframework.data.domain.Page;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 实体[${item.codeName}] 服务对象接口
  */
-public interface I${item.codeName}Service extends IService<${item.codeName}>{
+public interface I${item.codeName}Service{
     <@addIDESerivceBody />
 }
 
@@ -37,7 +24,7 @@ public interface I${item.codeName}Service extends IService<${item.codeName}>{
         <#list item.getAllPSDEActions() as deaction>
             <#if deaction.isEnableBackend()>
                 <#if deaction.codeName?lower_case == 'get'>
-                    ${item.codeName} get(${srfr7javatype(keyfield.stdDataType)} key) ;
+    ${item.codeName} get(${srfr7javatype(keyfield.stdDataType)} key) ;
                 <#elseif deaction.codeName?lower_case == "create">
     boolean create(${item.codeName} et) ;
     void createBatch(List<${item.codeName}> list) ;

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/es/service/impl/%DE%ServiceImpl.java.ftl

@@ -17,6 +17,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Optional;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 实体[${item.getLogicName()}] 服务对象接口实现

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/filter/SearchContextBase.java.ftl

@@ -23,6 +23,9 @@ import org.springframework.data.domain.Sort;
 import org.springframework.util.StringUtils;
 import org.springframework.util.ObjectUtils;
 import java.util.*;
+<#if hasESEntity>
+import org.elasticsearch.index.query.BoolQueryBuilder;
+</#if>
 
 @Slf4j
 @Data