剩下的备忘录一起删除

zqy

2024-11-04 b7482c9b5a01258763fa88b292456819ca0a83c9

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

@@ -5,24 +5,23 @@
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;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.domain.ZSelfNote;
import com.ruoyi.mapper.ZSelfNoteMapper;
import com.ruoyi.service.EsService;
import com.ruoyi.service.ZSelfNoteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Resource;
import java.util.*;

/**
 * <p>
@@ -36,7 +35,10 @@
public class ZSelfNoteServiceImpl extends ServiceImpl<ZSelfNoteMapper, ZSelfNote> implements ZSelfNoteService {

    @Autowired
    ZSelfNoteServiceImpl zSelfNoteService;
    ZSelfNoteService zSelfNoteService;

    @Resource
    private EsService esSer;

    private LambdaQueryWrapper<ZSelfNote> uniqueCondition(ZSelfNote zSelfNote) {
        LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
@@ -54,6 +56,8 @@
        lqw.eq(userId != null, ZSelfNote::getUid, userId)
                .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
                .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
                .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress())
                .like(StringUtils.isNotEmpty(zSelfNote.getRemark()),ZSelfNote::getRemark,zSelfNote.getRemark())
                .between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
                .orderByDesc(ZSelfNote::getCreateTime);
        return lqw;
@@ -111,6 +115,17 @@
    }

    @Override
    public List<ZSelfNote> selectByCondition() {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        ZSelfNote zSelfNote = new ZSelfNote();
        LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote, userId);
        return list(lqw);
    }

    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {

@@ -125,7 +140,12 @@
        assert dataList != null;

        for (ZSelfNote zSelfNote : dataList) {
            zSelfNoteService.mySave(zSelfNote);

            if (zSelfNote.getTitle().length() != 0 && zSelfNote.getPeople().length() !=0){
                mySave(zSelfNote);}
            else {
                throw new RuntimeException("有数据的标题或人物为空");
            }
        }

        return AjaxResult.success();