mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
报表基础模块:新增保存/修改/复制时校验xml、新增页眉页脚不支持的表达式提示
This commit is contained in:
+15
-2
@@ -57,6 +57,7 @@ import com.cf.imes.module.report.dal.mysql.datasource.ReportDatasourceMapper;
|
|||||||
import com.cf.imes.module.report.dal.mysql.template.ReportTemplateMapper;
|
import com.cf.imes.module.report.dal.mysql.template.ReportTemplateMapper;
|
||||||
import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum;
|
import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum;
|
||||||
import com.cf.imes.module.report.utils.TenantParamsUtils;
|
import com.cf.imes.module.report.utils.TenantParamsUtils;
|
||||||
|
import jodd.util.StringUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -135,7 +136,10 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
|
|||||||
// url解码xml
|
// url解码xml
|
||||||
String content = createReqVO.getContent();
|
String content = createReqVO.getContent();
|
||||||
if (StringUtils.isNotEmpty(content)) {
|
if (StringUtils.isNotEmpty(content)) {
|
||||||
createReqVO.setContent(URLUtil.decode(content));
|
String decode = URLUtil.decode(content);
|
||||||
|
createReqVO.setContent(decode);
|
||||||
|
// 解析xml
|
||||||
|
new ReportParser().parse(new ByteArrayInputStream(decode.getBytes()), createReqVO.getName());
|
||||||
}
|
}
|
||||||
// 新增模板
|
// 新增模板
|
||||||
ReportTemplateDO template = BeanUtils.toBean(createReqVO, ReportTemplateDO.class);
|
ReportTemplateDO template = BeanUtils.toBean(createReqVO, ReportTemplateDO.class);
|
||||||
@@ -184,6 +188,12 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
|
|||||||
copyTemplateDO.setUpdater(null);
|
copyTemplateDO.setUpdater(null);
|
||||||
copyTemplateDO.setUpdateTime(null);
|
copyTemplateDO.setUpdateTime(null);
|
||||||
copyTemplateDO.setCreateTime(null);
|
copyTemplateDO.setCreateTime(null);
|
||||||
|
// 解析xml
|
||||||
|
String content = copyTemplateDO.getContent();
|
||||||
|
if (StringUtil.isNotEmpty(content)) {
|
||||||
|
// 解析xml
|
||||||
|
new ReportParser().parse(new ByteArrayInputStream(content.getBytes()), createReqVO.getName());
|
||||||
|
}
|
||||||
// 生成id
|
// 生成id
|
||||||
copyTemplateDO.setId((Long) snowFlakeGenerator.nextId(null));
|
copyTemplateDO.setId((Long) snowFlakeGenerator.nextId(null));
|
||||||
// 新增模版
|
// 新增模版
|
||||||
@@ -204,7 +214,10 @@ public class ReportTemplateServiceImpl implements ReportTemplateService {
|
|||||||
// url解码xml
|
// url解码xml
|
||||||
String content = updateReqVO.getContent();
|
String content = updateReqVO.getContent();
|
||||||
if (StringUtils.isNotEmpty(content)) {
|
if (StringUtils.isNotEmpty(content)) {
|
||||||
updateReqVO.setContent(URLUtil.decode(content));
|
String decode = URLUtil.decode(content);
|
||||||
|
updateReqVO.setContent(decode);
|
||||||
|
// 解析xml
|
||||||
|
new ReportParser().parse(new ByteArrayInputStream(decode.getBytes()), updateReqVO.getName());
|
||||||
}
|
}
|
||||||
// 更新模板
|
// 更新模板
|
||||||
ReportTemplateDO updateObj = BeanUtils.toBean(updateReqVO, ReportTemplateDO.class);
|
ReportTemplateDO updateObj = BeanUtils.toBean(updateReqVO, ReportTemplateDO.class);
|
||||||
|
|||||||
BIN
Binary file not shown.
Reference in New Issue
Block a user