Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

@@ -5,28 +5,27 @@
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.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.ZfEquipment;
import com.ruoyi.mapper.ZfEquipmentMapper;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfEquipmentService;
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.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

import static com.ruoyi.constant.MenuAuthority.*;
@@ -50,6 +49,21 @@

    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    EsService esService;

    @Resource
    private RestHighLevelClient restHighLevelClient;

    @Resource
    private ZfEquipShareService zfEquipShareService;

    @Resource
    private ZfEquipDownloadService zfEquipDownloadService;

    @Resource
    private MemoBookService memoBookService;

    private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
@@ -212,16 +226,26 @@
        //要查自己家庭的
        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.getInfoBysysId(myself.getMomId()).getFamilyId();
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

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

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

    @Override
@@ -251,10 +275,10 @@
//        }).collect(Collectors.toList());
//    }

    public List<ZfEquipment> markOwnData(Long familyId,List<ZfEquipment> beanRecords){
    public List<ZfEquipment> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfEquipment> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId) {
                    if (bean.getFamilyId() == familyId ||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
@@ -281,12 +305,28 @@

        //要查自己家庭的
        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(EQUIPMENT_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<ZfEquipment> lqw = buildCondition(zfEquipment, idList);
@@ -297,7 +337,7 @@

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

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

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

        if (save(zfEquipment)) {

            EsModel esModel = new EsModel();
            Integer inte = zfEquipment.getId().intValue();
            String uuid = UUID.randomUUID().toString().replace("-","");
            esModel.setId(uuid);
            esModel.setCtId(Long.valueOf(inte));
            esModel.setCtTableName("家庭设备");
            esModel.setBy1(zfEquipment.getName());
            esModel.setBy2(zfEquipment.getBuyer());
            esModel.setBy3(zfEquipment.getContent());
            esModel.setBy4(zfEquipment.getLocation());
            esModel.setBy5("/family/zfEquipment");
            esModel.setRemark(zfEquipment.getRemark());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);
            
            return AjaxResult.success();
        } else {
            return AjaxResult.error();
@@ -407,8 +464,6 @@
//    }




    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {
@@ -422,12 +477,18 @@
        log.info("资产列表为：{}", propertyList);

        for (ZfEquipment zfEquipment : propertyList) {
            zfEquipmentService.addData(zfEquipment);
            if (zfEquipment.getName().length() != 0  && zfEquipment.getContent().length() != 0 && zfEquipment.getBuyer() .length() != 0){
                zfEquipmentService.addData(zfEquipment);
            }

        }

        return AjaxResult.success("导入数据成功");

    }

    @Resource
    ZfLogService zfLogService;

    @Override
    public AjaxResult updateData(ZfEquipment zfEquipment) {
@@ -446,7 +507,71 @@
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }

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

        if(updateById(zfEquipment)){
            //到数据库中查询对应的数据
            ZfEquipment dataById = getById(zfEquipment.getId());

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "家庭设备");

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

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

            if(zfEquipment.getBuyer()!=null){
                newModel.setBy2(zfEquipment.getBuyer());
            }else {
                newModel.setBy2(dataById.getBuyer());
            }

            if(zfEquipment.getContent()!=null){
                newModel.setBy3(zfEquipment.getContent());
            }else {
                newModel.setBy3(dataById.getContent());
            }

            if(zfEquipment.getLocation()!=null){
                newModel.setBy4(zfEquipment.getLocation());
            }else {
                newModel.setBy4(dataById.getLocation());
            }

            if(zfEquipment.getRemark()!=null){
                newModel.setRemark(zfEquipment.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();
@@ -470,9 +595,32 @@
            if (!familyIdList.contains(data.getFamilyId())){
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }

            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId(),2017L);
            if (!memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }

        List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
        if (! (zfEquipDownloadService.deleteData(ids) && zfEquipShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }

        if (zfEquipmentService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfEquipments.stream().forEach(zfEquipment -> {
                EsModel esModel = esService.findByCtId(zfEquipment.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();