From 944a01d60ffd53ca3a3b87ccfcaedc096219aba2 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期日, 17 九月 2023 23:42:47 +0800 Subject: [PATCH] 77777 --- zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 103 insertions(+), 4 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java index c9bbfa2..9a06fa0 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.EsModel; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -13,17 +14,19 @@ import com.ruoyi.constant.MenuAuthority; import com.ruoyi.domain.*; import com.ruoyi.mapper.ZfPropertyMapper; -import com.ruoyi.service.IZfPropertyService; -import com.ruoyi.service.ZAuthorityService; -import com.ruoyi.service.ZInfoUserService; -import com.ruoyi.service.ZfLogService; +import com.ruoyi.service.*; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; +import org.elasticsearch.action.delete.DeleteRequest; +import org.elasticsearch.action.update.UpdateRequest; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -53,6 +56,12 @@ @Resource ZfPropertyMapper zfPropertyMapper; + + @Resource + EsService esService; + + @Resource + RestHighLevelClient restHighLevelClient; // private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) { @@ -378,6 +387,23 @@ } if (save(zfProperty)) { + + EsModel esModel = new EsModel(); + Integer inte = zfProperty.getId().intValue(); + String uuid = UUID.randomUUID().toString().replace("-",""); + esModel.setId(uuid); + esModel.setCtId(Long.valueOf(inte)); + esModel.setCtTableName("瀹跺涵璧勪骇"); + esModel.setBy1(zfProperty.getType()); + esModel.setBy2(zfProperty.getTitle()); + esModel.setBy3(zfProperty.getLocation()); + esModel.setBy4(zfProperty.getHolder()); + esModel.setBy5("/family/zfProperty"); + esModel.setBy6(zfProperty.getAddress()); + esModel.setRemark(zfProperty.getRemark()); + //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰� + esService.insertTable(esModel); + return AjaxResult.success(); } else { return AjaxResult.error(); @@ -411,6 +437,66 @@ zfLogService.save(zfLog); if(updateById(zfProperty)){ + //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁 + ZfProperty dataById = getById(zfProperty.getId()); + + //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d + EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璧勪骇"); + + //鎿嶄綔es淇敼鏁版嵁 + EsModel newModel = new EsModel(); + if(zfProperty.getType()!=null){ + newModel.setBy1(zfProperty.getType()); + }else { + newModel.setBy1(dataById.getType()); + } + + if(zfProperty.getTitle()!=null){ + newModel.setBy2(zfProperty.getTitle()); + }else { + newModel.setBy2(dataById.getTitle()); + } + + if(zfProperty.getLocation()!=null){ + newModel.setBy3(zfProperty.getLocation()); + }else { + newModel.setBy3(dataById.getLocation()); + } + + if(zfProperty.getHolder()!=null){ + newModel.setBy4(zfProperty.getHolder()); + }else { + newModel.setBy4(dataById.getHolder()); + } + + if(zfProperty.getAddress()!=null){ + newModel.setBy6(zfProperty.getAddress()); + }else { + newModel.setBy6(dataById.getAddress()); + } + + if(zfProperty.getRemark()!=null){ + newModel.setRemark(zfProperty.getRemark()); + }else { + newModel.setRemark(dataById.getRemark()); + } + + + UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId()); + updateRequest.doc( + "by1",newModel.getBy1(), + "by2",newModel.getBy2(), + "by3",newModel.getBy3(), + "by4",newModel.getBy4(), + "by6",newModel.getBy6(), + "remark",newModel.getRemark() + ); + + try { + restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } return AjaxResult.success(); }else { return AjaxResult.error(); @@ -436,7 +522,20 @@ } } + List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids)); + if (zfPropertyService.removeByIds(Arrays.asList(ids))) { + + //鍒犻櫎es涓殑鏁版嵁 + zfPropertys.stream().forEach(zfProperty -> { + EsModel esModel = esService.findByCtId(zfProperty.getId().intValue(), "瀹跺涵璧勪骇"); + DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId()); + try { + restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); return AjaxResult.success(); }else { return AjaxResult.error(); -- Gitblit v1.9.1