es支持

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

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

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

@@ -7,10 +7,13 @@ package ${pub.getPKGCodeName()}.core.es.domain;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.annotation.Id;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import lombok.Data;
 
+@Data
 @Document(indexName = "${sys.codeName}", type = "${item.codeName}", shards = 5, replicas = 1)
 public class ${item.codeName} implements Serializable {
 
@@ -31,7 +34,11 @@ public class ${item.codeName} implements Serializable {
             <#elseif javaType=='Timestamp'>
                 <#assign esType="FieldType.Date">
             </#if>
+    <#if defield.isKeyDEField()==true>
+    @Id
+    <#else>
     @Field(type = ${esType})
+    </#if>
     private ${javaType} ${privateCodeName};
         </#list>
     </#if>

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

@@ -18,17 +18,18 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
+import java.util.Collection;
 
 /**
  * 实体[${item.getLogicName()}] 服务对象接口实现
  */
 @Slf4j
 @Service("${item.getCodeName()}ServiceImpl")
-public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Service {
+public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}Service {
 
     @Autowired
     @Lazy
-    ${item.getCodeName()}Repository repository;
+    ${item.getCodeName()}ESRepository repository;
 <#assign keyfield=de.getKeyPSDEField()>
 <#comment>输出实体行为</#comment>
 <#if item.getAllPSDEActions()??>