Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、模板和数据源查询过滤修复，超管可看的内容和普通用户相同，但是可以通过组织树看其他组织；2、打印和文件下载同步租户优化；3、ureport-core包同步（修复页眉页脚保存、开源项目bug修复同步）；

Browse Source
This commit is contained in:
gaoqr
2024-11-20 10:48:39 +08:00
parent df51d733d5
commit ca0acb5896
8 changed files with 75 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java
+1
View File
@@ -14,6 +14,7 @@ public final class ErrorCodeConstants {
public static final ErrorCode TEMPLATE_NOT_EXISTS = new ErrorCode(1_003_001_001, "报表模板信息不存在");
public static final ErrorCode TEMPLATE_BUILDIN_OPERATION_PERMISSION_ERROR = new ErrorCode(1_003_001_002, "内置模板操作权限不足");
public static final ErrorCode TEMPLATE_NAME_UNIQE_ERROR = new ErrorCode(1_003_001_003, "模板名【{}】已存在，请编辑模板名后重试");
public static final ErrorCode TEMPLATE_PREIVEW_QUERYPARAM_EMPTY = new ErrorCode(1_003_001_004, "查询参数不能为空：{}");
// ========== UREPORT datasource模块 1-003-002-000 ==========
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/datasource/ReportDatasourceController.java
+2 -2
View File
@@ -87,8 +87,8 @@ public class ReportDatasourceController {
@GetMapping("/datasources")
@Operation(summary = "获取报表数据源列表")
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<List<ReportDatasourceRespVO>> getDatasourcePage() {
return success(BeanUtils.toBean(datasourceService.getDatasourceList(), ReportDatasourceRespVO.class));
public CommonResult<List<ReportDatasourceRespVO>> getDatasourcePage(@RequestParam(value = "organId", required = false) Long organId) {
return success(BeanUtils.toBean(datasourceService.getDatasourceList(organId), ReportDatasourceRespVO.class));
}
@GetMapping("/datasource/beans")
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
+4 -2
View File
@@ -101,8 +101,10 @@ public class ReportTemplateController {
@GetMapping("/templates")
@Operation(summary = "获取报表模板信息列表")
@PreAuthorize("@ss.hasPermission('report:design')")
public CommonResult<List<ReportTemplateRespVO>> getTemplatePage(@RequestParam(value = "name", required = false) @Size(max = 64, message = "模板名称长度不能超过64个字符") String name) {
ReportTemplateReqVO reqVO = new ReportTemplateReqVO(name, null);
public CommonResult<List<ReportTemplateRespVO>> getTemplatePage(
@RequestParam(value = "name", required = false) @Size(max = 64, message = "模板名称长度不能超过64个字符") String name,
@RequestParam(value = "organId", required = false) Long organId) {
ReportTemplateReqVO reqVO = new ReportTemplateReqVO(name, null, organId);
return success(BeanUtils.toBean(templateService.getReportTemplateList(reqVO), ReportTemplateRespVO.class));
}
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/vo/ReportTemplateReqVO.java
+3
View File
@@ -21,4 +21,7 @@ public class ReportTemplateReqVO {
@Schema(description = "模板类型，0内置、1自定义", example = "1")
private Integer type;
@Schema(description = "组织id")
private Long organId;
}
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceService.java
+2 -2
View File
@@ -49,10 +49,10 @@ public interface ReportDatasourceService {
/**
* 获取模板下的数据源列表
*
* @param reqVO 查询参数
* @param organId 组织id
* @return 报表数据源分页
*/
List<ReportDatasourceDO> getDatasourceList();
List<ReportDatasourceDO> getDatasourceList(Long organId);
/**
* 获取springbean数据源列表
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/datasource/ReportDatasourceServiceImpl.java
+12 -8
View File
@@ -133,16 +133,21 @@ public class ReportDatasourceServiceImpl implements ReportDatasourceService {
@Override
@OrganIgnore
public List<ReportDatasourceDO> getDatasourceList() {
public List<ReportDatasourceDO> getDatasourceList(Long organId) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
LambdaQueryWrapper<ReportDatasourceDO> queryWrapper = new LambdaQueryWrapperX<ReportDatasourceDO>().orderByDesc(ReportDatasourceDO::getCreateTime);
if (ObjectUtil.isNotNull(loginUser) && Boolean.FALSE.equals(loginUser.getIsSupAdmin())) {
// 普通用户查看机构下的和system数据源
queryWrapper.or(wrapper -> wrapper
.eq(ReportDatasourceDO::getOrganId, loginUser.getOrganId())
.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.CUSTOM))
.or(wrapper -> wrapper.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM));
// 当前登录人机构id
Long currentOrganId = loginUser.getOrganId();
// 超管查看不同组织数据源
if (ObjectUtil.isNotNull(loginUser) && Boolean.TRUE.equals(loginUser.getIsSupAdmin()) && ObjectUtil.isNotNull(organId)) {
currentOrganId = organId;
}
Long finalCurrentOrganId = currentOrganId;
queryWrapper.or(wrapper -> wrapper
.eq(ReportDatasourceDO::getOrganId, finalCurrentOrganId)
.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.CUSTOM))
.or(wrapper -> wrapper.eq(ReportDatasourceDO::getBuildinType, ReportTemplateTypeEnum.SYSTEM));
List<ReportDatasourceDO> reportDatasourceDOS = datasourceMapper.selectList(queryWrapper);
// 查询数据集
if (CollUtil.isNotEmpty(reportDatasourceDOS)) {
@@ -150,7 +155,6 @@ public class ReportDatasourceServiceImpl implements ReportDatasourceService {
queryDatasetInSource(reportDatasourceDO);
});
}
// 超管查看全部
return reportDatasourceDOS;
}
cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java
+50 -15
View File
@@ -30,6 +30,7 @@ import com.bstek.ureport.parser.ReportParser;
import com.bstek.ureport.utils.ToolUtils;
import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants;
import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.framework.security.core.LoginUser;
@@ -49,6 +50,7 @@ import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
@@ -70,6 +72,7 @@ import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.e
import static com.cf.imes.module.report.enums.ErrorCodeConstants.TEMPLATE_BUILDIN_OPERATION_PERMISSION_ERROR;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.TEMPLATE_NAME_UNIQE_ERROR;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.TEMPLATE_NOT_EXISTS;
import static com.cf.imes.module.report.enums.ErrorCodeConstants.TEMPLATE_PREIVEW_QUERYPARAM_EMPTY;
/**
* 报表模板信息 Service 实现类
@@ -340,28 +343,56 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
@Override
public List<ReportTemplateDO> getReportTemplateList(ReportTemplateReqVO reqVO) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
LambdaQueryWrapper<ReportTemplateDO> queryWrapper = new LambdaQueryWrapperX<ReportTemplateDO>().likeIfPresent(ReportTemplateDO::getName, reqVO.getName())
.orderByDesc(ReportTemplateDO::getCreateTime)
// 不返回content xml，点击具体的模板中返回xml
.select(ReportTemplateDO::getId, ReportTemplateDO::getName, ReportTemplateDO::getCreateTime, ReportTemplateDO::getRemark, ReportTemplateDO::getType);
if (ObjectUtil.isNotNull(loginUser) && Boolean.FALSE.equals(loginUser.getIsSupAdmin())) {
return templateMapper.selectNormalTemplateList(reqVO.getName(), loginUser.getOrganId());
} else {
// 超管查看全部
return templateMapper.selectList(queryWrapper);
// 当前登录人机构id
Long organId = loginUser.getOrganId();
// 超管查看不同组织模板
if (ObjectUtil.isNotNull(loginUser) && Boolean.TRUE.equals(loginUser.getIsSupAdmin()) && ObjectUtil.isNotNull(reqVO.getOrganId())) {
organId = reqVO.getOrganId();
}
return templateMapper.selectNormalTemplateList(reqVO.getName(), organId);
}
/**
* 检查查询参数不为空
*
* @param queryMap
*/
private void checkQueryNotEmpty(Map<String, Object> queryMap) {
if (ObjectUtil.isNotNull(queryMap)) {
for (Map.Entry<String, Object> entry : queryMap.entrySet()) {
String key = entry.getKey();
if (ObjectUtils.isEmpty(entry.getValue()) && (ObjectUtil.notEqual(key, "datasetIds") || ObjectUtil.notEqual(key, "datasourceIds "))) {
throw ServiceExceptionUtil.exception(TEMPLATE_PREIVEW_QUERYPARAM_EMPTY, key);
}
}
}
}
@Override
public HtmlReport preview(ReportTemplatePreviewReqVO reqVO) {
// 检查查询参数中的空值
checkQueryNotEmpty(reqVO.getQuery());
// 自定义请求vo转ureport对象
PreviewParameters params = BeanUtils.toBean(reqVO, PreviewParameters.class);
Long userOrganId = SecurityFrameworkUtils.getUserOrganId();
HtmlProducer htmlProducer = new HtmlProducer();
ReportRender reportRender = new ReportRender();
ReportDefinition reportDefinition = getReportDefinition(reportRender, params);
Map<String, Object> parameters = params.getQuery();
// 增加多租户参数
prepareTenantParam(parameters);
Report report = reportRender.render(reportDefinition, parameters);
return htmlProducer.produce(reportDefinition, report);
}
/**
* 往parameters中增加租户相关参数
*
* @param parameters
*/
private void prepareTenantParam(Map<String, Object> parameters) {
Long userOrganId = SecurityFrameworkUtils.getUserOrganId();
if (Boolean.FALSE.equals(SecurityFrameworkUtils.isSuperAdmin())) {
// 根据前端传递的数据集id，判断是不是内置数据源下的，是就把name传给ureport
List<Long> datasetIds = (List) parameters.get("datasetIds");
@@ -375,7 +406,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 查询数据源，如果是内置数据源则把数据集的name传给ureport
// 机构下 + 内置数据源查询
ReportDatasourceDO datasourceDO = datasourceMapper.selectNormalDatasourceById(datasourceId, userOrganId);
if (ObjectUtil.equal(datasourceDO.getBuildinType(), ReportTemplateTypeEnum.SYSTEM)) {
if (ObjectUtil.isNotNull(datasourceDO) && ObjectUtil.equal(datasourceDO.getBuildinType(), ReportTemplateTypeEnum.SYSTEM)) {
buildinDsNames.add(datasetDO.getName());
}
}
@@ -388,8 +419,6 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
// 用户组织id
parameters.put("organId", userOrganId);
}
Report report = reportRender.render(reportDefinition, parameters);
return htmlProducer.produce(reportDefinition, report);
}
@Override
@@ -400,7 +429,10 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
long start = System.currentTimeMillis();
ReportRender reportRender = new ReportRender();
ReportDefinition reportDefinition = getReportDefinition(reportRender, params);
Report report = reportRender.render(reportDefinition, params.getQuery());
Map<String, Object> query = params.getQuery();
// 增加多租户参数
prepareTenantParam(query);
Report report = reportRender.render(reportDefinition, query);
Map<String, String> chartImages = params.getChartImages();
report.setChartImages(chartImages);
try {
@@ -427,7 +459,10 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
ReportRender reportRender = new ReportRender();
ReportDefinition reportDefinition = getReportDefinition(reportRender, params);
Report report = reportRender.render(reportDefinition, params.getQuery());
Map<String, Object> query = params.getQuery();
// 增加多租户参数
prepareTenantParam(query);
Report report = reportRender.render(reportDefinition, query);
Map<String, String> chartImages = params.getChartImages();
report.setChartImages(chartImages);
try {
cf-module-report/cf-module-report-biz/src/test/java/com/cf/imes/module/report/service/template/ReportDatasourceServiceImplTest.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ReportDatasourceServiceImplTest extends ReportCommonServiceImplTest
reqVO.setTemplateId(templateId);
reqVO.setType(ReportDatasourceTypeEnum.JDBC.getCode());
reqVO.setName(updateReqVO.getName());
List<ReportDatasourceDO> templateDatasourceList = reportDatasourceService.getDatasourceList();
List<ReportDatasourceDO> templateDatasourceList = reportDatasourceService.getDatasourceList(null);
assertNotNull(templateDatasourceList);
assertNotEquals(0, templateDatasourceList.size());