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/ZfCleanServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 97 insertions(+), 8 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java index 4b73ee4..a09327c 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java @@ -5,6 +5,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; @@ -14,23 +15,22 @@ import com.ruoyi.domain.ZfClean; import com.ruoyi.mapper.ZfCleanMapper; -import com.ruoyi.service.ZAuthorityService; -import com.ruoyi.service.ZInfoUserService; -import com.ruoyi.service.ZfCleanService; +import com.ruoyi.service.*; -import com.ruoyi.service.ZfLogService; 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.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.constant.MenuAuthority.*; @@ -58,6 +58,12 @@ @Resource ZfLogService zfLogService; + + @Resource + EsService esService; + + @Resource + RestHighLevelClient restHighLevelClient; private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) { LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>(); @@ -373,6 +379,22 @@ } if (save(zfClean)) { + EsModel esModel = new EsModel(); + Integer inte = zfClean.getId().intValue(); + String uuid = UUID.randomUUID().toString().replace("-",""); + esModel.setId(uuid); + esModel.setCtId(Long.valueOf(inte)); + esModel.setCtTableName("淇濇磥涓庢敹绾�"); + esModel.setBy1(zfClean.getType()); + esModel.setBy2(zfClean.getMethod()); + esModel.setBy3(zfClean.getPlace()); + esModel.setBy4(zfClean.getSuitable()); + esModel.setBy5("/family/zfClean"); + esModel.setRemark(zfClean.getRemark()); + //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰� + esService.insertTable(esModel); + + return AjaxResult.success(); } else { return AjaxResult.error(); @@ -464,6 +486,60 @@ if(updateById(zfClean)){ + + //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁 + ZfClean dataById = getById(zfClean.getId()); + + //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d + EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "淇濇磥涓庢敹绾�"); + + //鎿嶄綔es淇敼鏁版嵁 + EsModel newModel = new EsModel(); + if(zfClean.getType()!=null){ + newModel.setBy1(zfClean.getType()); + }else { + newModel.setBy1(dataById.getType()); + } + + if(zfClean.getMethod()!=null){ + newModel.setBy2(zfClean.getMethod()); + }else { + newModel.setBy2(dataById.getMethod()); + } + + if(zfClean.getPlace()!=null){ + newModel.setBy3(zfClean.getPlace()); + }else { + newModel.setBy3(dataById.getPlace()); + } + + if(zfClean.getSuitable()!=null){ + newModel.setBy4(zfClean.getSuitable()); + }else { + newModel.setBy4(dataById.getSuitable()); + } + + if(zfClean.getRemark()!=null){ + newModel.setRemark(zfClean.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(), + "remark",newModel.getRemark() + ); + + try { + restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } return AjaxResult.success(); }else { return AjaxResult.error(); @@ -489,7 +565,20 @@ } } + List<ZfClean> zfCleans = listByIds(Arrays.asList(ids)); + if (zfCleanService.removeByIds(Arrays.asList(ids))) { + + //鍒犻櫎es涓殑鏁版嵁 + zfCleans.stream().forEach(zfClean -> { + EsModel esModel = esService.findByCtId(zfClean.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