Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-07 0d6b7a153b1e2c087810523e8e2d8422a62de97e

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/domain/Banner.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.time.LocalDateTime;

@@ -14,10 +15,9 @@
import javax.validation.constraints.NotNull;

/**
 *
 * @TableName banner
 */
@TableName(value ="banner")
@TableName(value = "banner")
@Data
public class Banner implements Serializable {
    @TableId(type = IdType.INPUT)
@@ -29,11 +29,16 @@
    private String bannerUrl;

    /**
     *
     * 用户ID
     */
    private Integer bindingAuthor;

    /**
     * 上级用户ID
     */
    private Long clientId;

    /**
     * 创建时间
     */
    private LocalDateTime createTime;

 dao/src/main/resources/mapper/BannerMapper.xml

@@ -8,6 +8,7 @@
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="bannerUrl" column="banner_url" jdbcType="VARCHAR"/>
            <result property="bindingAuthor" column="binding_author" jdbcType="INTEGER"/>
            <result property="clientId" column="client_id" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>


 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java

@@ -1,13 +1,17 @@
package com.sandu.ximon.admin.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.BannerDto;
import com.sandu.ximon.admin.param.BannerParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.BannerService;
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.dao.domain.Banner;
import com.sandu.ximon.dao.domain.Client;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -23,10 +27,14 @@
public class BannerController {

    private final BannerService contentBannerService;
    private final ClientService clientService;

    @PostMapping("/addbanner")
    public ResponseVO<Object> addBanner(@Validated @RequestBody BannerParam bannerParam) {
        boolean result = contentBannerService.addBanner(bannerParam);
        Client client  = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, bannerParam.getBinding_author()));


        boolean result = contentBannerService.addBanner(bannerParam, client);
        if (result) {
            return ResponseUtil.success("添加成功");
        } else {
@@ -42,7 +50,7 @@

    @PostMapping("/{bannerId}")
    public ResponseVO<Object> updateBanner(@PathVariable Long bannerId, @Validated @RequestBody BannerParam bannerParam) {
        boolean result = contentBannerService.updateBanner(bannerId,bannerParam);
        boolean result = contentBannerService.updateBanner(bannerId, bannerParam);
        if (result) {
            return ResponseUtil.success("更新成功");
        } else {
@@ -58,8 +66,13 @@

    @GetMapping
    public ResponseVO<Object> listMainBanner() {
        List<Banner> list = contentBannerService.listBanner();
        return ResponseUtil.success(list);
        if (SecurityUtils.getClientId() != null) {
            List<Banner> list = contentBannerService.listBanner();
            return ResponseUtil.success(list);
        } else {
            return ResponseUtil.success(contentBannerService.list());
        }

    }

    @PostMapping("/delete/{bannerId}")

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/BannerService.java

@@ -9,7 +9,9 @@
import com.sandu.ximon.admin.dto.BannerDto;
import com.sandu.ximon.admin.param.BannerParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Banner;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.mapper.BannerMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -34,11 +36,14 @@
    /**
     * 添加banner
     */
    public boolean addBanner(BannerParam bannerParam) {
    public boolean addBanner(BannerParam bannerParam, Client client) {
        Banner banner = new Banner();
        banner.setId(snowflake.nextId());
        banner.setBannerUrl(ResUtils.removePrefix(bannerParam.getUrl()));
        banner.setBindingAuthor(bannerParam.getBinding_author());
        if (client != null && client.getSuperiorId() != null) {
            banner.setClientId(client.getSuperiorId());
        }
        return save(banner);
    }

@@ -81,8 +86,11 @@
     * @return
     */
    public List<Banner> listBanner() {
        LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class).eq(Banner::getBindingAuthor, SecurityUtils.getUserId())
                .or(wrapper1 -> {
                    wrapper1.eq(Banner::getClientId, SecurityUtils.getUserId());
                });

        LambdaQueryWrapper<Banner> wrapper = Wrappers.lambdaQuery(Banner.class).eq(Banner::getBindingAuthor, SecurityUtils.getUserId());
        List<Banner> list = list(wrapper);
        for (Banner banner : list) {
            banner.setBannerUrl(ResUtils.addPrefix(banner.getBannerUrl()));