ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(资料中心): 80856

Browse Source
This commit is contained in:
yjz
2024-01-23 14:10:55 +08:00
parent 9810c69878
commit fc137f0006
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+13 -9
View File
@@ -21,16 +21,15 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
import com.spire.ms.System.Collections.ArrayList; import com.spire.ms.System.Collections.ArrayList;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
@@ -52,6 +51,9 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
private SendMessageAPI sendMessageAPI; private SendMessageAPI sendMessageAPI;
@Autowired @Autowired
private LawsDataCenterFileMapper lawsDataCenterFileMapper; private LawsDataCenterFileMapper lawsDataCenterFileMapper;
@Value("${adminRoleCode}")
private String adminRoleCode;
private static final String UPLOADER = "uploader";
/** /**
* 分页查询 * 分页查询
@@ -68,14 +70,16 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
queryWrapper.like(StringUtils.isNotBlank(lawsDataCenterFile.getFileName()), queryWrapper.like(StringUtils.isNotBlank(lawsDataCenterFile.getFileName()),
"file_name", lawsDataCenterFile.getFileName()); "file_name", lawsDataCenterFile.getFileName());
queryWrapper.like(StringUtils.isNotBlank(lawsDataCenterFile.getUploader()), queryWrapper.like(StringUtils.isNotBlank(lawsDataCenterFile.getUploader()),
"uploader", lawsDataCenterFile.getUploader()); UPLOADER, lawsDataCenterFile.getUploader());
if (StringUtils.isNotBlank(lawsDataCenterFile.getUploadTime())) { if (StringUtils.isNotBlank(lawsDataCenterFile.getUploadTime())) {
String[] timeArr = lawsDataCenterFile.getUploadTime().split(","); String[] timeArr = lawsDataCenterFile.getUploadTime().split(",");
queryWrapper.between("create_time", queryWrapper.between("create_time",
DateUtil.getDateSecond(timeArr[0]), DateUtil.getDateSecond(timeArr[1])); DateUtil.getDateSecond(timeArr[0]), DateUtil.getDateSecond(timeArr[1]));
} }
queryWrapper.eq(StringUtils.isNotBlank(lawsDataCenterFile.getFolderId()), "folder_id", lawsDataCenterFile.getFolderId()); queryWrapper.eq(StringUtils.isNotBlank(lawsDataCenterFile.getFolderId()), "folder_id", lawsDataCenterFile.getFolderId());
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN)) { List<String> adminRoleCodeList = Arrays.asList(adminRoleCode.split(","));
Collection<String> intersection = CollectionUtils.intersection(Arrays.asList(CurrentUserUtil.getRoles().split(",")), adminRoleCodeList);
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)) {
queryWrapper.and(qw -> qw queryWrapper.and(qw -> qw
.eq("owner_id", CurrentUserUtil.getId()) .eq("owner_id", CurrentUserUtil.getId())
.or().like("auth_view_ids", CurrentUserUtil.getId()) .or().like("auth_view_ids", CurrentUserUtil.getId())
@@ -85,7 +89,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
} }
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
Page<LawsDataCenterFile> result = lawsDataCenterFileMapper.queryByPage(page, queryWrapper); Page<LawsDataCenterFile> result = lawsDataCenterFileMapper.queryByPage(page, queryWrapper);
if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN)){ if (!CurrentUserUtil.getRoles().contains(FieldCommon.ROLE_ADMIN) && CollectionUtils.isEmpty(intersection)){
for (LawsDataCenterFile file : result.getRecords()) { for (LawsDataCenterFile file : result.getRecords()) {
// 管理权限标识 // 管理权限标识
String authManageIds = file.getAuthManageIds(); String authManageIds = file.getAuthManageIds();
@@ -143,7 +147,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
Map<String, String> sendMap = new HashMap<>(); Map<String, String> sendMap = new HashMap<>();
sendMap.put("fileName", String.join(",", fileNameList)); sendMap.put("fileName", String.join(",", fileNameList));
sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription()); sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription());
sendMap.put("uploader", lawsDataCenterFile.getUploader()); sendMap.put(UPLOADER, lawsDataCenterFile.getUploader());
sendMessageDTO.setMap(sendMap); sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO); sendMessageAPI.sendMessage(sendMessageDTO);
} }
@@ -214,7 +218,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
Map<String, String> sendMap = new HashMap<>(); Map<String, String> sendMap = new HashMap<>();
sendMap.put("fileName", lawsDataCenterFile.getFileName()); sendMap.put("fileName", lawsDataCenterFile.getFileName());
sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription()); sendMap.put("fileDescription", StringUtils.isBlank(lawsDataCenterFile.getFileDescription()) ? "" : lawsDataCenterFile.getFileDescription());
sendMap.put("uploader", dataCenterFile.getUploader()); sendMap.put(UPLOADER, dataCenterFile.getUploader());
sendMessageDTO.setMap(sendMap); sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO); sendMessageAPI.sendMessage(sendMessageDTO);
} }