WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参数项收集清单--添加搜索权限

Browse Source
This commit is contained in:
zhn
2023-10-25 16:44:41 +08:00
parent bfde61a3c0
commit 56eb2f746b
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestHistoryEO.java
+4
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.collect.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -37,4 +38,7 @@ public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO
@ApiModelProperty(value = "参考列")
private String referencesCol;
@TableField(exist = false)
private String userTypes;//用户类型
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+3 -1
View File
@@ -3671,7 +3671,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
//带入逻辑修改为只带入勾选的条目
list = list.stream().filter(e->paramsCollectManifestVO.getIds().contains(e.getId())).collect(Collectors.toList());
if(StringUtils.isNotBlank(paramsCollectManifestVO.getIds())){
list = list.stream().filter(e->paramsCollectManifestVO.getIds().contains(e.getId())).collect(Collectors.toList());
}
// 过滤出 状态为：待发起收集或变更，且工程接口人处为空的参数项
list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+55 -4
View File
@@ -16,7 +16,12 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.oss.CosBootUtil;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.cert.collect.entity.*;
import com.jero.modules.cert.collect.entity.ParamsCollectExport;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestHistoryEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataHistoryEO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.entity.ParamsConfigHistoryEO;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
@@ -36,13 +41,20 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.split.common.ReadExcel;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.IProjectUserDutyTerritoryService;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFCell;
import org.apache.poi.xssf.usermodel.XSSFCellStyle;
import org.apache.poi.xssf.usermodel.XSSFFont;
import org.apache.poi.xssf.usermodel.XSSFRichTextString;
import org.apache.poi.xssf.usermodel.XSSFRow;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.shiro.SecurityUtils;
import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,13 +65,31 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
/**
@@ -92,6 +122,8 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
private IParamsCollectExportService paramsCollectExportService;
@Autowired
private ICertCategoryParamsInfoPublishEOService certCategoryParamsInfoPublishEOService;
@Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Value(value = "${jero.path.upload}")
private String uploadpath;
@@ -120,6 +152,25 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
.orderByAsc(ParamsCollectManifestHistoryEO::getNioNumber);
String paramsManifestId = paramsCollectManifestHistoryEO.getParamsManifestId();
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
String userTypes = paramsCollectManifestHistoryEO.getUserTypes();
if (CollectManifestUserTypeEnum.SDT.getValue().equals(userTypes)) {
queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getSdt,loginUser.getUsername());
queryWrapper.lambda().in(ParamsCollectManifestHistoryEO::getState,new ArrayList<String>(Arrays.asList("2","4","5","6","7","8")));
} else if (CollectManifestUserTypeEnum.DRE.getValue().equals(userTypes)) {
queryWrapper.lambda().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername());
queryWrapper.lambda().in(ParamsCollectManifestHistoryEO::getState,new ArrayList<String>(Arrays.asList("4","6","7","8")));
} else if (CollectManifestUserTypeEnum.GUEST.getValue().equals(userTypes)) {
return page;
} else if (CollectManifestUserTypeEnum.VIEWER.getValue().equals(userTypes)) {
List<String> dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(loginUser.getId());
queryWrapper.lambda().and(q->{
q.eq(ParamsCollectManifestHistoryEO::getSdt,loginUser.getUsername());
q.or().eq(ParamsCollectManifestHistoryEO::getDre,loginUser.getUsername());
q.or().in(ParamsCollectManifestHistoryEO::getDutyTerritory,dutyTerritoryList);
});
}
IPage pageInfo = page(page, queryWrapper); // 查询固定列
// IPage pageInfo = paramsCollectManifestHistoryEOMapper.pageInfo(page, paramsCollectManifestEO); // 查询固定列