修改代码

zqy

2024-04-26 a979d3b0f9bb814ffeb014fd210e4dff99462e81

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java

@@ -302,6 +302,11 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -406,6 +411,7 @@
            esModel.setBy5("/family/zfCollection");
            esModel.setBy6(zfCollection.getLocation());
            esModel.setRemark(zfCollection.getRemark());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);

@@ -468,6 +474,10 @@

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "收藏和荣誉");

            if (esResult == null){
                return AjaxResult.success();
            }

            //操作es修改数据
            EsModel newModel = new EsModel();
@@ -554,11 +564,15 @@
            //删除es中的数据
            zfCollections.stream().forEach(zfCollection -> {
                EsModel esModel = esService.findByCtId(zfCollection.getId().intValue(), "收藏和荣誉");
                DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                try {
                    restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                } catch (IOException e) {
                    throw new RuntimeException(e);

                if (esModel != null){

                    DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
                    try {
                        restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
                    } catch (IOException e) {
                        throw new RuntimeException(e);
                    }
                }
            });
            return AjaxResult.success();