|
@@ -10,24 +10,15 @@ import com.persagy.apm.common.context.poems.PoemsContext;
|
|
|
import com.persagy.apm.common.model.dto.Sort;
|
|
|
import com.persagy.apm.report.common.utils.ApmStrUtils;
|
|
|
import com.persagy.apm.report.common.utils.DateUtils;
|
|
|
-import com.persagy.apm.report.detail.model.dto.UpdateParagraphSupplementDTO;
|
|
|
-import com.persagy.apm.report.detail.model.dto.UpdateReportDetailDTO;
|
|
|
-import com.persagy.apm.report.detail.model.vo.AttrValueVO;
|
|
|
-import com.persagy.apm.report.userconfig.paragraph.model.vo.ParagraphItemVO;
|
|
|
-import com.persagy.apm.report.userconfig.paragraphcustom.model.ParagraphCustom;
|
|
|
-import com.persagy.apm.report.userconfig.paragraphcustom.service.IParagraphCustomService;
|
|
|
-import com.persagy.apm.report.userconfig.paragraphmodel.service.IParagraphModelService;
|
|
|
-import com.persagy.apm.report.userconfig.pargraphdefine.service.IParagraphDefineService;
|
|
|
-import com.persagy.apm.report.userconfig.reporttype.constant.enums.BelongTypeEnum;
|
|
|
-import com.persagy.apm.report.userconfig.reporttype.model.ReportType;
|
|
|
-import com.persagy.apm.report.userconfig.reporttype.model.vo.ResponseReportTypeListItemVO;
|
|
|
-import com.persagy.apm.report.userconfig.reporttype.service.IReportTypeService;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.ConvertSaasWebTool;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.vo.PoemsProjectVO;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.vo.ReportAreaVO;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.vo.ReportProjectVO;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.model.vo.SimpleProjectVO;
|
|
|
import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
|
|
|
+import com.persagy.apm.report.detail.model.dto.UpdateParagraphSupplementDTO;
|
|
|
+import com.persagy.apm.report.detail.model.dto.UpdateReportDetailDTO;
|
|
|
+import com.persagy.apm.report.detail.model.vo.AttrValueVO;
|
|
|
import com.persagy.apm.report.detail.model.vo.ParagraphVO;
|
|
|
import com.persagy.apm.report.detail.model.vo.ReportDetailItemVO;
|
|
|
import com.persagy.apm.report.detail.paragraphvalue.model.vo.ReportParagraphValueItemVO;
|
|
@@ -38,6 +29,15 @@ import com.persagy.apm.report.outline.model.ConvertReportOutlineTool;
|
|
|
import com.persagy.apm.report.outline.model.ReportOutline;
|
|
|
import com.persagy.apm.report.outline.model.dto.*;
|
|
|
import com.persagy.apm.report.outline.service.IReportOutlineService;
|
|
|
+import com.persagy.apm.report.userconfig.paragraph.model.vo.ParagraphItemVO;
|
|
|
+import com.persagy.apm.report.userconfig.paragraphcustom.model.ParagraphCustom;
|
|
|
+import com.persagy.apm.report.userconfig.paragraphcustom.service.IParagraphCustomService;
|
|
|
+import com.persagy.apm.report.userconfig.paragraphmodel.service.IParagraphModelService;
|
|
|
+import com.persagy.apm.report.userconfig.pargraphdefine.service.IParagraphDefineService;
|
|
|
+import com.persagy.apm.report.userconfig.reporttype.constant.enums.BelongTypeEnum;
|
|
|
+import com.persagy.apm.report.userconfig.reporttype.model.ReportType;
|
|
|
+import com.persagy.apm.report.userconfig.reporttype.model.vo.ResponseReportTypeListItemVO;
|
|
|
+import com.persagy.apm.report.userconfig.reporttype.service.IReportTypeService;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -281,7 +281,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- @Transactional(rollbackFor=Exception.class)
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public void batchDeleteReportOutline(List<String> ids) {
|
|
|
for (String id : ids) {
|
|
|
// 校验是否可删除
|
|
@@ -359,22 +359,25 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
|
|
|
// 查询当前用户可用的报告类型
|
|
|
IPage<ResponseReportTypeListItemVO> availableReportTypes = reportTypeService.queryAvailableReportTypes(
|
|
|
pageQueryReportOutlineDTO.getBelongType());
|
|
|
- if (availableReportTypes != null) {
|
|
|
- List<ResponseReportTypeListItemVO> records = availableReportTypes.getRecords();
|
|
|
- if (!CollectionUtils.isEmpty(records)) {
|
|
|
- // 每一类报告类型拼装一个or条件
|
|
|
- queryWrapper.and(wrapper -> {
|
|
|
- for (ResponseReportTypeListItemVO record : records) {
|
|
|
- // 根据报告类型id + 报告所属查询
|
|
|
- wrapper.or(
|
|
|
- innerWrapper -> innerWrapper.eq(
|
|
|
- ReportOutline.PROP_REPORT_TYPE_ID, record.getId()).in(
|
|
|
- ReportOutline.PROP_BELONG, record.getAvailableBelongIds())
|
|
|
- );
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ if (availableReportTypes == null) {
|
|
|
+ return new Page<>();
|
|
|
+ }
|
|
|
+ List<ResponseReportTypeListItemVO> records = availableReportTypes.getRecords();
|
|
|
+ if (CollectionUtils.isEmpty(records)) {
|
|
|
+ // 如果登录人没有报警类型权限,给一个返回空结果
|
|
|
+ return new Page<>();
|
|
|
}
|
|
|
+ // 每一类报告类型拼装一个or条件
|
|
|
+ queryWrapper.and(wrapper -> {
|
|
|
+ for (ResponseReportTypeListItemVO record : records) {
|
|
|
+ // 根据报告类型id + 报告所属查询
|
|
|
+ wrapper.or(
|
|
|
+ innerWrapper -> innerWrapper.eq(
|
|
|
+ ReportOutline.PROP_REPORT_TYPE_ID, record.getId()).in(
|
|
|
+ ReportOutline.PROP_BELONG, record.getAvailableBelongIds())
|
|
|
+ );
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
if (StringUtils.isNotEmpty(pageQueryReportOutlineDTO.getName())) {
|
|
|
queryWrapper.like(ReportOutline.PROP_NAME, pageQueryReportOutlineDTO.getName());
|