增加了 查询的路径

feige

2023-09-15 f51250cb93f590b8e5f8c64489b999a4b1075b5c

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.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,9 +15,7 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfEventService;
import com.ruoyi.service.*;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -24,10 +23,8 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.constant.MenuAuthority.*;
@@ -52,7 +49,9 @@

    @Resource
    ZAuthorityService zAuthorityService;

    //加入到es中
    @Resource
    private esService esSer;
    private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfEvent::getCreateTime);
@@ -236,7 +235,7 @@
                        bean.setOwnData(0);
                    }
                }
        ).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }

//    private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> beanRecords) {
@@ -344,6 +343,21 @@
        }

        if (save(zfEvent)) {
            //  飞  加入
            EsModel esModel = new EsModel();
            Integer inte = zfEvent.getId();
            String uuid = UUID.randomUUID().toString().replace("-","");
            esModel.setId(uuid);
            esModel.setCtId(Long.valueOf(inte));
            esModel.setCtName(zfEvent.getTitle());
            esModel.setCtContent(zfEvent.getAddress());
            esModel.setBy1(zfEvent.getRemark());
            //这里存储查询详情的路径
            esModel.setBy5("/family/zfEvent");
            // esModel.setCtTableName("tb_ajk");
            //   esModel.setCtName("大家");
            //  esModel.setCtContent("大家好，才是真的好");//处事由
            esSer.insertTable(esModel);
            return AjaxResult.success();
        } else {
            return AjaxResult.error();
@@ -406,6 +420,9 @@

    }

    @Resource
    ZfLogService zfLogService;

    @Override
    public AjaxResult updateData(ZfEvent zfEvent) {
        ZInfoUser myself = zInfoUserService.getMyself();
@@ -422,6 +439,13 @@
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }

        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("家大事记");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);

        if(updateById(zfEvent)){
            return AjaxResult.success();
        }else {