|
|
|
@ -3,7 +3,6 @@ package com.kms.yxgh.df.service; |
|
|
|
import cn.hutool.core.collection.CollectionUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
@ -21,20 +20,17 @@ import com.kms.yxgh.df.dto.DfRecordDetailExportDto; |
|
|
|
import com.kms.yxgh.df.dto.DfRecordSearchDto; |
|
|
|
import com.kms.yxgh.df.dto.DfRecordSimpleDto; |
|
|
|
import com.kms.yxgh.df.dto.DfYhCharHiddenDangerDto; |
|
|
|
import com.kms.yxgh.df.dto.DfYhCharInfoDto; |
|
|
|
import com.kms.yxgh.df.dto.DfYhHiddenDangerQueDto; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingItemMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfCheckingLineMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfPlanOperatorMapper; |
|
|
|
import com.kms.yxgh.df.mapper.DfRecordMapper; |
|
|
|
import com.kms.yxgh.model.DfYhHiddenDangerModel; |
|
|
|
import com.kms.yxgh.model.DfYhStatisticsModelDto; |
|
|
|
import com.kms.yxgh.common.dto.DfYhHiddenDangerDto; |
|
|
|
import com.kms.yxgh.util.BeanCopyUtils; |
|
|
|
import com.kms.yxgh.util.StreamUtils; |
|
|
|
import com.shuili.common.core.domain.AjaxResult; |
|
|
|
import com.shuili.common.core.domain.SearchParam; |
|
|
|
import com.shuili.common.core.service.BaseService; |
|
|
|
import com.shuili.common.enums.DfEnum; |
|
|
|
import com.shuili.common.utils.StringUtils; |
|
|
|
import com.shuili.common.utils.poi.ExcelUtil; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
@ -75,22 +71,22 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
// 处置数
|
|
|
|
dfYhCharHiddenDangerDto.setCzNumber(baseMapper.clCountNumber(dto)); |
|
|
|
|
|
|
|
List<DfYhHiddenDangerModel> list = new ArrayList<>(); |
|
|
|
List<DfYhHiddenDangerDto> list = new ArrayList<>(); |
|
|
|
// 隐患数量数据
|
|
|
|
List<DfYhHiddenDangerModel> yhModel = baseMapper.yhNumberData(dto); |
|
|
|
List<DfYhHiddenDangerDto> yhModel = baseMapper.yhNumberData(dto); |
|
|
|
if (!CollectionUtil.isEmpty(yhModel)) { |
|
|
|
list.addAll(yhModel); |
|
|
|
} |
|
|
|
// 处理数量数据
|
|
|
|
List<DfYhHiddenDangerModel> clModel = baseMapper.clfNumberData(dto); |
|
|
|
List<DfYhHiddenDangerDto> clModel = baseMapper.clfNumberData(dto); |
|
|
|
if (CollectionUtil.isEmpty(list)) { |
|
|
|
return dfYhCharHiddenDangerDto; |
|
|
|
} |
|
|
|
|
|
|
|
list.addAll(clModel); |
|
|
|
Map<String, List<DfYhHiddenDangerModel>> groupingByList = list.stream() |
|
|
|
Map<String, List<DfYhHiddenDangerDto>> groupingByList = list.stream() |
|
|
|
.filter(s -> !StringUtils.isEmpty(s.getAdcd())) // 过滤掉空字符串
|
|
|
|
.collect(Collectors.groupingBy(DfYhHiddenDangerModel::getAdcd)); |
|
|
|
.collect(Collectors.groupingBy(DfYhHiddenDangerDto::getAdcd)); |
|
|
|
|
|
|
|
if (!CollectionUtil.isEmpty(groupingByList)) { |
|
|
|
List<String> xList = new ArrayList<>(); |
|
|
|
@ -109,7 +105,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
for (Map.Entry<String, List<DfYhHiddenDangerModel>> entry : groupingByList.entrySet()) { |
|
|
|
for (Map.Entry<String, List<DfYhHiddenDangerDto>> entry : groupingByList.entrySet()) { |
|
|
|
// 设置 x轴
|
|
|
|
// 转换名称
|
|
|
|
if (!flag) { |
|
|
|
@ -131,9 +127,9 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
return dfYhCharHiddenDangerDto; |
|
|
|
} |
|
|
|
|
|
|
|
private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry<String, List<DfYhHiddenDangerModel>> entry) { |
|
|
|
private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry<String, List<DfYhHiddenDangerDto>> entry) { |
|
|
|
List<DfYhCharHiddenDangerDto.Series> seriesList = new ArrayList<>(); |
|
|
|
for (DfYhHiddenDangerModel it : entry.getValue()) { |
|
|
|
for (DfYhHiddenDangerDto it : entry.getValue()) { |
|
|
|
DfYhCharHiddenDangerDto.Series series = new DfYhCharHiddenDangerDto.Series(); |
|
|
|
series.setCount(it.getCount()); |
|
|
|
series.setType(it.getProblem()); |
|
|
|
|
hxh
1 month ago