修改权限问题

zqy

2025-06-09 bf1ce234766d113ca6380ab4d79cb5b2c5049395

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

@@ -1,31 +1,30 @@
package com.ruoyi.service.impl;


import com.alibaba.fastjson2.JSONObject;
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.fasterxml.jackson.core.JsonParser;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.domain.ZfCollection;
import com.ruoyi.mapper.ZfCollectionMapper;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCollectionService;
import com.ruoyi.util.ArraysUtil;
import com.ruoyi.service.*;
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.*;
import java.util.stream.Collectors;

@@ -54,6 +53,21 @@

    @Resource
    ZfCollectionMapper zfCollectionMapper;

    @Resource
    ZfLogService zfLogService;

    @Resource
    EsService esService;

    @Resource
    RestHighLevelClient restHighLevelClient;

    @Resource
    ZfCollectionShareService zfCollectionShareService;

    @Resource
    ZfCollectionDownloadService zfCollectionDownloadService;

    private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
@@ -218,16 +232,29 @@
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);

        LambdaQueryWrapper<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, idList);
        List<ZfCollection> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
    }

    @Override
@@ -258,10 +285,10 @@
//        }).collect(Collectors.toList());
//    }

    public List<ZfCollection> markOwnData(Long familyId,List<ZfCollection> beanRecords){
    public List<ZfCollection> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfCollection> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId) {
                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
@@ -288,12 +315,31 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();

        //查看父母的数据：
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(COLLECTION_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfCollection> lqw = buildCondition(zfCollection, idList);
@@ -304,7 +350,7 @@

        List<ZfCollection> beanRecords = pageResult.getRecords();//得到查询出来的数据

        List<ZfCollection> dtoResult = markOwnData(familyId, beanRecords);
        List<ZfCollection> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
@@ -378,6 +424,24 @@
        }

        if (save(zfCollection)) {

            EsModel esModel = new EsModel();
            Integer inte = zfCollection.getId().intValue();
            String uuid = UUID.randomUUID().toString().replace("-","");
            esModel.setId(uuid);
            esModel.setCtId(Long.valueOf(inte));
            esModel.setCtTableName("收藏和荣誉");
            esModel.setBy1(zfCollection.getType());
            esModel.setBy2(zfCollection.getName());
            esModel.setBy3(zfCollection.getSource());
            esModel.setBy4(zfCollection.getOwner());
            esModel.setBy5("/family/zfCollection");
            esModel.setBy6(zfCollection.getLocation());
            esModel.setRemark(zfCollection.getRemark());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);

            return AjaxResult.success();
        } else {
            return AjaxResult.error();
@@ -403,27 +467,99 @@

        //先记录下谁更新、何时更新、更新了哪里

        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZfCollection::getId,zfCollection.getId());
        zfCollectionService.getOne(lqw);
        ZfCollection oldData = getOne(lqw);
//        LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
//        lqw.eq(ZfCollection::getId,zfCollection.getId());
//        zfCollectionService.getOne(lqw);
//        ZfCollection oldData = getOne(lqw);
//
//        String oldJson = JSONObject.toJSONString(oldData);
//        String newJson = JSONObject.toJSONString(zfCollection);
//
//        Map oldMap = JSONObject.parseObject(oldJson, Map.class);
//        Map newMap = JSONObject.parseObject(newJson, Map.class);
//
//        for (Object key : oldMap.keySet()) {
//            if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
//                System.out.println(newMap.get(key)+"     "+oldMap.get(key));
//                Date date = new Date();
//                System.out.println("用户"+myself.getNickName()+"在"+date+"这个时间"+"修改了<收藏荣誉>模块的"+key+"字段");
//            }
//        }

        String oldJson = JSONObject.toJSONString(oldData);
        String newJson = JSONObject.toJSONString(zfCollection);

        Map oldMap = JSONObject.parseObject(oldJson, Map.class);
        Map newMap = JSONObject.parseObject(newJson, Map.class);

        for (Object key : oldMap.keySet()) {
            if(newMap.get(key)!=null && !newMap.get(key).equals(oldMap.get(key))){
                System.out.println(newMap.get(key)+"     "+oldMap.get(key));
                Date date = new Date();
                System.out.println("用户"+myself.getNickName()+"在"+date+"这个时间"+"修改了<收藏荣誉>模块的"+key+"字段");
            }
        }
        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("收藏荣誉");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);


        if(updateById(zfCollection)){

            //到数据库中查询对应的数据
            ZfCollection dataById = getById(zfCollection.getId());

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

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

            //操作es修改数据
            EsModel newModel = new EsModel();
            if(zfCollection.getType()!=null){
                newModel.setBy1(zfCollection.getType());
            }else {
                newModel.setBy1(dataById.getType());
            }

            if(zfCollection.getName()!=null){
                newModel.setBy2(zfCollection.getName());
            }else {
                newModel.setBy2(dataById.getName());
            }

            if(zfCollection.getSource()!=null){
                newModel.setBy3(zfCollection.getSource());
            }else {
                newModel.setBy3(dataById.getSource());
            }

            if(zfCollection.getOwner()!=null){
                newModel.setBy4(zfCollection.getOwner());
            }else {
                newModel.setBy4(dataById.getOwner());
            }

            if(zfCollection.getLocation()!=null){
                newModel.setBy6(zfCollection.getLocation());
            }else {
                newModel.setBy6(dataById.getLocation());
            }

            if(zfCollection.getRemark()!=null){
                newModel.setRemark(zfCollection.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 {
@@ -448,7 +584,26 @@
            }
        }

        List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids));
        if (! ( zfCollectionDownloadService.deleteData(ids) && zfCollectionShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfCollectionService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfCollections.stream().forEach(zfCollection -> {
                EsModel esModel = esService.findByCtId(zfCollection.getId().intValue(), "收藏和荣誉");

                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();
        }else {
            return AjaxResult.error();