Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

zhanglin

2023-07-23 257ce232897d0e4a232e827ba61516b747389078

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/PopServiceImpl.java

@@ -1,10 +1,12 @@
package com.ruoyi.system.service.impl.config;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.MgtPopEditDto;
import com.ruoyi.system.domain.pojo.config.Pop;
import com.ruoyi.system.domain.vo.AppPopVo;
import com.ruoyi.system.domain.vo.MgtPopGetVo;
import com.ruoyi.system.domain.vo.MgtPopPageVo;
import com.ruoyi.system.mapper.config.PopMapper;
@@ -13,6 +15,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.text.ParseException;
import java.util.Date;
import java.util.List;

@@ -62,9 +65,25 @@
        }
        // 将管理弹窗编辑DTO的属性复制到管理弹窗中
        BeanUtils.copyProperties(mgtPopEditDto, pop);
        if(pop.getTargetType()==1){
            pop.setJumpType(null);
            pop.setJumpId(null);
        }else if(pop.getTargetType()==2){
            pop.setLinkUrl(null);
        }else if(pop.getTargetType()==3){
            pop.setLinkUrl(null);
            pop.setJumpType(null);
            pop.setJumpId(null);
        }
        // 设置创建时间和创建者ID
        pop.setCreateTime(new Date());
        pop.setCreateUserId(mgtPopEditDto.getPopId());
        try {
            pop.setShowStartTime(DateUtils.parseDate(mgtPopEditDto.getShowStartTime(),"yyyy-MM-dd"));
            pop.setShowEndTime(DateUtils.parseDate(mgtPopEditDto.getShowEndTime(),"yyyy-MM-dd"));
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }
        // 保存或更新管理弹窗
        this.saveOrUpdate(pop);
    }
@@ -79,6 +98,16 @@
    @Override
    public MgtPopGetVo getMgtPop(Long popId){
        Pop pop = this.getById(popId);
        if(pop.getTargetType()==1){
            pop.setJumpType(null);
            pop.setJumpId(null);
        }else if(pop.getTargetType()==2){
            pop.setLinkUrl(null);
        }else if(pop.getTargetType()==3){
            pop.setLinkUrl(null);
            pop.setJumpType(null);
            pop.setJumpId(null);
        }
        MgtPopGetVo mgtPopGetVo = new MgtPopGetVo();
        BeanUtils.copyProperties(pop, mgtPopGetVo);
        return mgtPopGetVo;
@@ -95,7 +124,18 @@
    public void deleteMgtPop(MgtBaseGetDto mgtBaseGetDto){
        Pop pop = this.getById(Long.valueOf(mgtBaseGetDto.getId()));
        pop.setDelFlag(1);
        pop.insertOrUpdate();
        this.saveOrUpdate(pop);
    }

    /**
     * @description  获取首页弹窗
     * @author  jqs
     * @date    2023/7/20 17:19
     * @param
     * @return  AppPopVo
     */
    @Override
    public AppPopVo getAppPop(){
        return popMapper.getAppPop();
    }
}