From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 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 759fd9c..b9df674 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
@@ -3,6 +3,7 @@
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.*;
@@ -68,10 +69,11 @@
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);
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -88,10 +90,10 @@
Report entity = ReportForm.getEntityByForm(form, null);
entity.setSerialNumber(point.getSerialNumber());
entity.setStatus(0);
- entity.setIdentify(IdUtils.randomNO());
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
+ entity.setIdentify(IdUtils.randomNO(now));
baseMapper.insert(entity);
List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(item -> {
ReportErrorType reportErrorType = new ReportErrorType();
@@ -116,17 +118,19 @@
@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.getEndCreateTime()));
+ form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
// 璇诲彇excel鏁版嵁
ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
+ Date now = DateUtils.getNowDate();
// 鎵归噺鎻掑叆
- String pid = IdUtils.randomNO();
+ String pid = IdUtils.randomNO(now);
Integer success = 0;
for (ReportImportDTO item : list) {
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
@@ -146,8 +150,7 @@
entity.setImportBatchNumber(pid);
entity.setSerialNumber(item.getSerialNumber());
entity.setStatus(0);
- entity.setIdentify(IdUtils.randomNO());
- Date now = DateUtils.getNowDate();
+ entity.setIdentify(IdUtils.randomNO(now));
entity.setCreateTime(now);
entity.setUpdateTime(now);
baseMapper.insert(entity);
@@ -252,6 +255,7 @@
@Override
public Result page(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(page, query);
List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
@@ -310,8 +314,35 @@
public List<ReportVO> export(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
page.setSize(-1);
+ query.setUnitId(SecurityUtils.getUnitId());
baseMapper.page(page, query);
+ 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("銆�");
+ }
+ });
+ item.setErrorType(sb.substring(0, sb.length() - 1));
+ }
+ // 瀹℃牳缁撴灉
+ 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());
+ } else {
+ item.setResultStr("瀹℃牳涓�");
+ }
item.setReportContent(EscapeUtil.clean(item.getReportContent()));
});
return page.getRecords();
@@ -347,7 +378,7 @@
// 娣诲姞涓�鏉″鏍歌褰�
ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
- reportAuditingRecord.setReportId(form.getId());
+ reportAuditingRecord.setReportId(id);
reportAuditingRecord.setDeleted(0);
reportAuditingRecord.setCreateTime(now);
reportAuditingRecord.setResultRemark(form.getAuditOpinion());
@@ -356,4 +387,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