修改保洁收纳&通讯录的导入，新增直播删除

zqy

2024-09-10 d7a97b8520a3cf0dd174ddda5669ef68a2a6b018

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

@@ -5,30 +5,29 @@
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.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.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.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.*;
@@ -53,6 +52,15 @@

    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    ZfLogService zfLogService;
    
    @Resource
    EsService esService;
    
    @Resource
    RestHighLevelClient restHighLevelClient;

    private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
@@ -288,6 +296,11 @@

        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        if(myself==null)
        {
            //   System.out.println("ssssss");
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -313,6 +326,9 @@
    @Override
    public AjaxResult addData(ZfClean zfClean) {


        if(zfClean.getKind()==null)
            zfClean.setKind(0);
//        String familyIds = listFamilyIds();
//        boolean flag = false;//判断当前用户的id是否有权加入当前家庭id的对象
//        if (familyIds.contains(",")) {
@@ -368,6 +384,23 @@
        }

        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());
            esModel.setFid(familyId);
            //这里存储查询详情的路径
            esService.insertTable(esModel);
            
            
            return AjaxResult.success();
        } else {
            return AjaxResult.error();
@@ -425,9 +458,10 @@
            throw new RuntimeException(e);
        }
        log.info("数据列表为：{}", dataList);

        for (ZfClean zfClean : dataList) {
            zfCleanService.addData(zfClean);
            if (zfClean.getMethod().length() != 0 && zfClean.getPlace().length() != 0 && zfClean.getSuitable().length() != 0) {
                zfCleanService.addData(zfClean);
            }
        }

        return AjaxResult.success("导入数据成功");
@@ -450,7 +484,73 @@
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }

        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("保洁收纳");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);


        if(updateById(zfClean)){

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

            //先到es中查询到对应那条数据在es的id
            EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "保洁与收纳");

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

            //操作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();
@@ -476,7 +576,23 @@
            }
        }

        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(), "保洁与收纳");

                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();