增加ES维护性功能

jyzb-biz/src/main/java/com/junmp/jyzb/Repository/SizeRepository.java

+package com.junmp.jyzb.Repository;
+
+import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.EquipmentType;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+
+public interface SizeRepository extends ElasticsearchRepository<EquipmentSize, Long> {
+}
+

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

@@ -44,6 +44,15 @@ public class CrudController {
     public Object testOrgDocument() {
         return pubOrgService.AddToEs();
     }
+
+    @ApiOperation("一键初始化ES")
+    @PostMapping("UpdateES")
+    public Object UpdateES() {
+        pubOrgService.AddToEs();
+        equipmentTypeService.addEs();
+
+        return true;
+    }
     @ApiOperation("添加单个文档")
     @PostMapping("addDocument")
     public Blog addDocument() {

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

 package com.junmp.jyzb.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -9,18 +10,23 @@ import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
 
 @ApiModel(value = "com-junmp-jyzb-domain-EquipmentSize")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("base_equipment_size")
+@Document(indexName = "size_pinyin")
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class EquipmentSize implements Serializable {
     /**
      * 装备号型ID
      */
     @ApiModelProperty(value = "装备号型ID")
     @TableField("id")
+    @Id
     private String id;
 
     /**

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentSizeService.java

@@ -11,6 +11,8 @@ import com.junmp.v2.db.api.page.PageResult;
 import java.util.List;
 
 public interface EquipmentSizeService extends IService<EquipmentSize> {
+    Object addEs();
+
     String addSize(UpdateEquipmentSizeReq req);
 
     EquipmentSize getOneSize(QueryEquipmentSizeReq req);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -4,12 +4,16 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.Repository.SizeRepository;
+import com.junmp.jyzb.Repository.TypeRepository;
 import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
+import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
 import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.entity.ProductSku;
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
 import com.junmp.jyzb.service.EquipmentSizeService;
@@ -22,6 +26,7 @@ import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.EquipmentSizeMapper;
@@ -35,8 +40,16 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
     @Resource
     private EquipmentSizeMapper equipmentSizeMapper;
+    @Autowired
+    private SizeRepository sizeRepository;
 
-
+    @Override
+    public Object addEs() {
+        QueryEquipmentTypeReq req =new QueryEquipmentTypeReq();
+        req.setType(0);
+        List<EquipmentSize> esDto=this.list();
+        return sizeRepository.saveAll(esDto);
+    }
     @Override
     public String addSize(UpdateEquipmentSizeReq req) {
         EquipmentSize size = new EquipmentSize();
@@ -44,6 +57,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         BeanPlusUtil.copyProperties(req, size);
         size.setId(sizeID);
         this.save(size);
+        sizeRepository.save(size);
         return sizeID;
     }
 
@@ -54,6 +68,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
 
     @Override
     public Boolean deleteSize(UpdateEquipmentSizeReq req) {
+        sizeRepository.deleteById(Long.valueOf(req.getId()));
         return this.removeById(req.getId());
 
     }
@@ -62,6 +77,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     public Boolean updateSize(UpdateEquipmentSizeReq req) {
         EquipmentSize size = this.querySize(req);
         BeanPlusUtil.copyProperties(req, size);
+        sizeRepository.save(size);
         return this.updateById(size);
     }
 
@@ -69,6 +85,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     public Boolean changeSizeState(UpdateEquipmentSizeReq req) {
         EquipmentSize size = this.querySize(req);
         size.setState(Integer.valueOf(req.getState()));
+        sizeRepository.save(size);
         return this.updateById(size);
     }