增加ES数据

jyzb-biz/src/main/java/com/junmp/jyzb/controller/ES/CrudController.java

@@ -3,6 +3,7 @@ package com.junmp.jyzb.controller.ES;
 import com.junmp.jyzb.Repository.BlogRepository;
 import com.junmp.jyzb.entity.ES.Blog;
 import com.junmp.jyzb.service.EquipmentTypeService;
+import com.junmp.jyzb.service.PubOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -26,13 +27,18 @@ public class CrudController {
     private BlogRepository blogRepository;
     @Resource
     public EquipmentTypeService equipmentTypeService;
-
+    @Resource
+    public PubOrgService pubOrgService;
     @ApiOperation("测试")
     @PostMapping("testDocument")
     public Object testDocument() {
        return equipmentTypeService.addEs();
     }
-
+    @ApiOperation("测试组织机构")
+    @PostMapping("testOrgDocument")
+    public Object testOrgDocument() {
+        return pubOrgService.AddToEs();
+    }
     @ApiOperation("添加单个文档")
     @PostMapping("addDocument")
     public Blog addDocument() {

jyzb-biz/src/main/java/com/junmp/jyzb/entity/EquipmentType.java

@@ -16,7 +16,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("base_equipment_type")
-@Document(indexName = "type")
+@Document(indexName = "type_pinyin")
 public class EquipmentType implements Serializable {
     /**
      * 装备类型ID

jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.java

@@ -21,17 +21,17 @@ import org.springframework.data.elasticsearch.annotations.Document;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("pub_org")
-@Document(indexName = "org")
+@Document(indexName = "org_pinyin")
 public class PubOrg implements Serializable {
 
     //此项作为id，不会写到_source里边。
-    @Id
-    private String id;
+//    @Id
+//    private String id;
     /**
      * 主键
      */
     @TableId(type = IdType.AUTO, value = "org_id")
-
+    @Id
     private Long orgId;
     /**
      * 主键