fix

zhanzhiqin

2022-09-14 258a8436775a314287717c85895646a5bd5f8968

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/AllUserInfoParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

/**
 * @author ZZQ
 * @date 2022/9/14 14:54
 */
@Data
public class AllUserInfoParam {
    /**
     * ç”¨æˆ·ID
     */
    private Long id;

    /**
     * ç”¨æˆ·å
     */
    private String name;

    /**
     * ç±»åˆ«ï¼Œç®¡ç†å‘˜ã€æ™®é€šç”¨æˆ·
     */
    private String type;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PlatformFilePermissionParam.java

@@ -1,9 +1,23 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/9/14
 * å¹³å°æ–‡ä»¶
 */
@Data
public class PlatformFilePermissionParam {
    /**
     * æ–‡ä»¶ID
     */
    private Long fileId;

    /**
     * ç”¨æˆ·ID集合
     */
    private List<Long> userIdList;
}

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

@@ -7,18 +7,24 @@
import com.sandu.common.file.impl.AliOssFileServiceImpl;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.AllUserInfoParam;
import com.sandu.ximon.admin.param.EditFileParam;
import com.sandu.ximon.admin.param.PlatformFilePermissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.PlatformFileListBo;
import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.PlatformFile;
import com.sandu.ximon.dao.domain.PlatformFileUser;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlatformFileMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.ArrayStack;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;

import java.util.ArrayList;
import java.util.List;

/**
@@ -32,6 +38,8 @@

    private final AliOssFileServiceImpl aliOssFileService;
    private final PlatformFileUserService platformFileUserService;
    private final AdminService adminService;
    private final ClientService clientService;

    /**
     * æ–‡ä»¶ä¸Šä¼ 
@@ -52,6 +60,7 @@

    /**
     * ä¿®æ”¹æ–‡ä»¶åç§°
     *
     * @param param
     * @return
     */
@@ -70,6 +79,7 @@

    /**
     * åˆ é™¤æ–‡ä»¶
     *
     * @param param
     * @return
     */
@@ -88,6 +98,7 @@

    /**
     * å¹³å°æ–‡ä»¶èµ„源列表
     *
     * @param vo
     * @param keyword
     * @return
@@ -106,11 +117,12 @@

    /**
     * ä¸‹è½½æ–‡ä»¶
     *
     * @param fileId
     * @return
     */
    public String downFile(Long fileId) {
        if(!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())){
        if (!AdministratorEnums.ADMIN.getCode().equals(SecurityUtils.getUserDetails().getAdministratorType())) {
            PlatformFileUser one = platformFileUserService.getOne(Wrappers.lambdaQuery(PlatformFileUser.class)
                    .eq(PlatformFileUser::getUserId, SecurityUtils.getUserId()).eq(PlatformFileUser::getFileId, fileId));
            if (one == null) {
@@ -122,7 +134,63 @@
    }


//    public boolean  setPermission(){}
    /**
     * è®¾ç½®æ–‡ä»¶æµè§ˆæƒé™
     *
     * @param platformFilePermissionParam
     * @return
     */
    public String setPermission(PlatformFilePermissionParam platformFilePermissionParam) {
        //删除旧关系
        platformFileUserService.remove(Wrappers.lambdaQuery(PlatformFileUser.class)
                .eq(PlatformFileUser::getFileId, platformFilePermissionParam.getFileId()));

        //添加新关系
        List<PlatformFileUser> list = new ArrayList<>();
        PlatformFileUser bean;
        for (Long userId : platformFilePermissionParam.getUserIdList()) {
            bean = new PlatformFileUser();
            bean.setFileId(platformFilePermissionParam.getFileId());
            bean.setUserId(userId);
            list.add(bean);
        }

        if (platformFileUserService.saveBatch(list)) {
            return "关系存储成功！";
        } else {
            throw new BusinessException("关系存储失败！");
        }
    }

    /**
     * è¿”回所有用户
     * @return
     */
    public List<AllUserInfoParam> allUserList() {
        List<Admin> adminList = adminService.list(Wrappers.lambdaQuery(Admin.class).ne(Admin::getId, 1));
        List<Client> clientList = clientService.list();

        List<AllUserInfoParam> list = new ArrayList<>();
        AllUserInfoParam allUserInfoParam;

        for (Admin admin : adminList) {
            allUserInfoParam = new AllUserInfoParam();
            allUserInfoParam.setId(admin.getId());
            allUserInfoParam.setName(admin.getUsername());
            allUserInfoParam.setType("管理员");
            list.add(allUserInfoParam);
        }

        for (Client client : clientList) {
            allUserInfoParam = new AllUserInfoParam();
            allUserInfoParam.setId(client.getId());
            allUserInfoParam.setName(client.getClientName());
            allUserInfoParam.setType("普通用户");
            list.add(allUserInfoParam);
        }

        return list;
    }


    /**