From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 151 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 117 insertions(+), 34 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 99893fb..e9e1726 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -1,8 +1,11 @@
package com.ycl.platform.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.dto.ReportImportDTO;
import com.ycl.platform.domain.entity.*;
@@ -31,6 +34,7 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +52,7 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
private final YwUnitMapper unitMapper;
@@ -68,10 +73,13 @@
if (Objects.isNull(form.getPointId())) {
throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
}
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
+ Long userId = SecurityUtils.getLoginUser().getUserId();
+ form.setPeopleId(Integer.parseInt(userId+""));
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -116,10 +124,11 @@
@SneakyThrows
@Transactional
public Result importData(ReportForm form) {
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
// 璇诲彇excel鏁版嵁
@@ -252,8 +261,23 @@
@Override
public Result page(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
+ if (query.getReportTimeEnd() != null) {
+ query.setReportTimeEnd(DateUtils.getDayEnd(query.getReportTimeEnd()));
+ }
+
+ if (query.getEffectTimeEnd() != null) {
+ query.setEffectTimeEnd(DateUtils.getDayEnd(query.getEffectTimeEnd()));
+ }
+ long dbStartTime = System.currentTimeMillis();
baseMapper.page(page, query);
+ long dbCostTime = System.currentTimeMillis() - dbStartTime;
+ // 5. 鎵撳嵃鑰楁椂鏃ュ織锛堝惈璇锋眰鍙傛暟锛屾柟渚垮悗缁帓鏌ユ參鏌ヨ锛�
+ log.info("鎶ヨ〃鏁版嵁搴撴煡璇㈣�楁椂锛歿}ms锛屾煡璇㈠弬鏁帮細{}", dbCostTime, JSON.toJSONString(query));
+
+ long dictStartTime = System.currentTimeMillis();
List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
+ long dictEndTime = System.currentTimeMillis() - dictStartTime;
Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
page.getRecords().stream().forEach(item -> {
if (StringUtils.hasText(item.getErrorType())) {
@@ -265,9 +289,16 @@
sb.append(s).append("銆�");
}
});
- item.setErrorType(sb.substring(0, sb.length() - 1));
+ if (sb.length() > 0) {
+ item.setErrorType(sb.substring(0, sb.length() - 1));
+ } else {
+ // 鏃犲尮閰嶆爣绛炬椂锛屽彲璁句负绌哄瓧绗︿覆鎴栦繚鐣欏師濮� errorType
+ item.setErrorType("");
+ // 鎴� item.setErrorType(item.getErrorType()); // 淇濈暀鍘熷缂栫爜
+ }
}
});
+ log.info("缁勮淇℃伅鑰楁椂锛歿}ms", dictEndTime);
return Result.ok().data(page).total(page.getTotal());
}
@@ -308,41 +339,79 @@
@Override
public List<ReportVO> export(ReportQuery query) {
+ // 1. 鍒嗛〉鏌ヨ涓绘暟鎹紙涓嶅彉锛�
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
page.setSize(-1);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(page, query);
+ List<ReportVO> records = page.getRecords();
+ if (CollectionUtils.isEmpty(records)) {
+ return Collections.emptyList();
+ }
+
+ // 2. 鎵归噺鏌ヨ瀛楀吀鏁版嵁锛堜笉鍙橈紝寤鸿鍔犵紦瀛橈級
List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
- Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
- page.getRecords().forEach(item -> {
- if (StringUtils.hasText(item.getErrorType())) {
- item.setErrorTypeList(List.of(item.getErrorType().split(",")));
- StringBuilder sb = new StringBuilder();
- item.getErrorTypeList().stream().forEach(err -> {
- String s = dictMap.get(err);
- if (org.springframework.util.StringUtils.hasText(s)) {
- sb.append(s).append("銆�");
+ Map<String, String> errorDictMap = errorTypeList.stream()
+ .collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (k1, k2) -> k2));
+
+ // 3. 鎵归噺鏌ヨ瀹℃牳璁板綍锛堟牳蹇冧慨鏀癸細鐢ㄥ瓙鏌ヨ鏇夸唬绐楀彛鍑芥暟锛屽吋瀹逛綆鐗堟湰MySQL锛�
+ List<Integer> reportIds = records.stream().map(ReportVO::getId).collect(Collectors.toList());
+ // 瀛愭煡璇細鑾峰彇姣忎釜reportId鐨勬渶鏂板垱寤烘椂闂�
+ LambdaQueryWrapper<ReportAuditingRecord> maxTimeQuery = new LambdaQueryWrapper<ReportAuditingRecord>()
+ .in(ReportAuditingRecord::getReportId, reportIds)
+ .groupBy(ReportAuditingRecord::getReportId)
+ .select(ReportAuditingRecord::getReportId, ReportAuditingRecord::getCreateTime); // 鍒嗙粍鏌eportId鍜屾渶澶ф椂闂�
+
+ // 涓绘煡璇細鍏宠仈瀛愭煡璇紝鎷垮埌姣忎釜reportId鏈�鏂扮殑瀹℃牳璁板綍
+ List<ReportAuditingRecord> allAuditRecords = reportAuditingRecordService.getBaseMapper().selectList(
+ new LambdaQueryWrapper<ReportAuditingRecord>()
+ .in(ReportAuditingRecord::getReportId, reportIds)
+ // 鍏宠仈瀛愭煡璇紝鍖归厤reportId鍜屾渶鏂板垱寤烘椂闂�
+ .inSql(ReportAuditingRecord::getCreateTime,
+ "SELECT MAX(create_time) FROM t_report_auditing_record WHERE report_id IN (" +
+ reportIds.stream().map(String::valueOf).collect(Collectors.joining(",")) +
+ ") GROUP BY report_id")
+ );
+
+ // 鏋勫缓reportId -> 鏈�鏂板鏍歌褰曠殑Map锛堜笉鍙橈級
+ Map<Integer, ReportAuditingRecord> auditRecordMap = allAuditRecords.stream()
+ .collect(Collectors.toMap(ReportAuditingRecord::getReportId, record -> record, (k1, k2) -> {
+ // 鏋佺鎯呭喌锛氬悓涓�reportId鏈夌浉鍚屽垱寤烘椂闂寸殑璁板綍锛屽彇浠绘剰涓�涓紙鎸夊垱寤烘椂闂村�掑簭鍙栫涓�涓級
+ return k1.getCreateTime().after(k2.getCreateTime()) ? k1 : k2;
+ }));
+
+ // 4. 寰幆澶勭悊鏁版嵁锛堜笉鍙橈紝淇濈暀涔嬪墠鐨勫瓧绗︿覆浼樺寲鍜岀┖鍊煎鐞嗭級
+ records.forEach(item -> {
+ // 澶勭悊鏁呴殰绫诲瀷锛堜笉鍙橈級
+ String errorType = item.getErrorType();
+ if (StringUtils.hasText(errorType)) {
+ String[] errorTypeArr = StringUtils.split(errorType, ",");
+ StringJoiner sj = new StringJoiner("銆�");
+ for (String err : errorTypeArr) {
+ String dictLabel = errorDictMap.get(err);
+ if (StringUtils.hasText(dictLabel)) {
+ sj.add(dictLabel);
}
- });
- item.setErrorType(sb.substring(0, sb.length() - 1));
+ }
+ item.setErrorTypeList(Arrays.asList(errorTypeArr));
+ item.setErrorType(sj.toString());
}
- // 瀹℃牳缁撴灉
- List<ReportAuditingRecord> records = new LambdaQueryChainWrapper<>(reportAuditingRecordService.getBaseMapper())
- .eq(ReportAuditingRecord::getReportId, item.getId())
- .orderByDesc(ReportAuditingRecord::getCreateTime)
- .last("limit 1")
- .list();
- if (! CollectionUtils.isEmpty(records)) {
- item.setResultStr(records.get(0).getResult() ? "閫氳繃" : "鏈�氳繃");
- item.setResultRemark(records.get(0).getResultRemark());
- item.setAuditingTime(records.get(0).getCreateTime());
+
+ // 澶勭悊瀹℃牳缁撴灉锛堜笉鍙橈紝浠嶮ap鑾峰彇锛�
+ ReportAuditingRecord auditRecord = auditRecordMap.get(item.getId());
+ if (auditRecord != null) {
+ item.setResultStr(auditRecord.getResult() ? "閫氳繃" : "鏈�氳繃");
+ item.setResultRemark(auditRecord.getResultRemark());
+ item.setAuditingTime(auditRecord.getCreateTime());
} else {
item.setResultStr("瀹℃牳涓�");
}
- item.setReportContent(EscapeUtil.clean(item.getReportContent()));
- });
- return page.getRecords();
- }
+ item.setReportContent(EscapeUtil.clean(StringUtils.defaultString(item.getReportContent())));
+ });
+
+ return records;
+ }
@Override
public Result auditingRecord(Integer id) {
@@ -382,4 +451,18 @@
}
return Result.ok("鎿嶄綔鎴愬姛");
}
+
+ @Override
+ public Result getListByGb(String gb) {
+ List<ReportVO> list = baseMapper.getListByGb(gb);
+ for (ReportVO report : list) {
+ List<ReportErrorType> errors = new LambdaQueryChainWrapper<>(reportErrorTypeService.getBaseMapper())
+ .eq(ReportErrorType::getReportId, report.getId())
+ .orderByDesc(ReportErrorType::getCreateTime)
+ .list();
+ String err = errors.stream().map(ReportErrorType::getErrorType).collect(Collectors.joining(","));
+ report.setErrorType(err);
+ }
+ return Result.ok().data(list);
+ }
}
--
Gitblit v1.8.0