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/YwPointServiceImpl.java | 222 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 168 insertions(+), 54 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 6941537..f2476f6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,43 +1,48 @@
package com.ycl.platform.service.impl;
+import com.alibaba.excel.EasyExcel;
+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.ycl.platform.base.BaseSelect;
-import com.ycl.platform.domain.entity.Region;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dataListener.CurrencyDataListener;
+import com.ycl.platform.domain.entity.ReportAuditingRecord;
import com.ycl.platform.domain.entity.YwPeople;
import com.ycl.platform.domain.entity.YwPoint;
-import com.ycl.platform.domain.entity.YwUnit;
+import com.ycl.platform.domain.excel.PointExport;
import com.ycl.platform.domain.form.BatchEditPointForm;
-import com.ycl.platform.mapper.RegionMapper;
+import com.ycl.platform.domain.form.YwPointForm;
+import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.result.BaseResult;
+import com.ycl.platform.domain.vo.CheckTagVO;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
+import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
-import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.YwPointForm;
-import com.ycl.platform.domain.vo.YwPointVO;
-import com.ycl.platform.domain.query.YwPointQuery;
-import java.util.List;
-
-import com.ycl.system.entity.SysUser;
import com.ycl.system.mapper.SysDeptMapper;
-import com.ycl.system.service.ISysDeptService;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
+import com.ycl.thread.PointImportCallable;
+import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
-import enumeration.general.RegionLevelEnum;
-import org.springframework.stereotype.Service;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
/**
* 杩愮淮鐐逛綅 鏈嶅姟瀹炵幇绫�
@@ -50,8 +55,8 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
private final SysDeptMapper sysDeptMapper;
- private final YwUnitService unitService;
- private final YwPeopleMapper ywPeopleMapper;
+ private final TMonitorMapper monitorMapper;
+
/**
* 娣诲姞
@@ -61,6 +66,9 @@
@Override
public Result add(YwPointForm form) {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -74,6 +82,9 @@
.forEach(form -> {
YwPoint entity = YwPointForm.getEntityByForm(form, null);
entity.setStatus("鏈紑濮�");
+ Date now = new Date();
+ entity.setCreateTime(now);
+ entity.setUpdateTime(now);
baseMapper.insert(entity);
});
return Result.ok("娣诲姞鎴愬姛");
@@ -86,8 +97,7 @@
new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getId, form.getIds())
.set(YwPoint::getUnitId, form.getUnitId())
- .set(YwPoint::getStartTime, form.getStartTime())
- .set(YwPoint::getEndTime, form.getEndTime())
+ .set(YwPoint::getUpdateTime, new Date())
.update();
} else {
new LambdaUpdateChainWrapper<>(baseMapper)
@@ -95,6 +105,7 @@
.set(YwPoint::getUnitId, form.getUnitId())
.set(YwPoint::getStartTime, null)
.set(YwPoint::getEndTime, null)
+ .set(YwPoint::getUpdateTime, new Date())
.update();
}
return Result.ok("淇敼鎴愬姛");
@@ -110,7 +121,8 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
- entity.setPointTag(form.getPointTag().stream().collect(Collectors.joining(",")));
+ Date now = new Date();
+ entity.setUpdateTime(now);
baseMapper.updateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -150,11 +162,6 @@
public Result page(YwPointQuery query) {
IPage<YwPointVO> page = PageUtil.getPage(query, YwPointVO.class);
baseMapper.page(page, query);
- page.getRecords().stream().forEach(point -> {
- if (StringUtils.hasText(point.getPointTagString())) {
- point.setPointTags(point.getPointTagString().split(","));
- }
- });
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -168,9 +175,6 @@
YwPoint entity = baseMapper.selectById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
- if (StringUtils.hasText(entity.getPointTag())) {
- vo.setPointTags(entity.getPointTag().split(","));
- }
if (Objects.nonNull(entity.getDeptId())) {
vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId()));
}
@@ -194,26 +198,136 @@
@Override
public Result select(String keyword) {
- Long userId = SecurityUtils.getUserId();
- // 鑾峰彇褰撳墠杩愮淮浜哄憳鐨勮繍缁村崟浣�
- YwPeople people = new LambdaQueryChainWrapper<>(ywPeopleMapper)
- .eq(YwPeople::getUserId, userId)
- .one();
- Integer unitId = null;
- if (Objects.nonNull(people)) {
- unitId = people.getBelongUnit();
- }
-
- List<YwPoint> list = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwPoint::getUnitId, unitId)
- .like(YwPoint::getPointName, keyword)
- .list();
- List<BaseSelect> data = list.stream().map(item -> {
- BaseSelect baseSelect = new BaseSelect();
- baseSelect.setId(item.getId());
- baseSelect.setValue(item.getPointName());
- return baseSelect;
+ Integer unitId = SecurityUtils.getUnitId();
+ List<YwPoint> list = baseMapper.select(keyword, unitId);
+ List data = list.stream().map(item -> {
+ Map map = new HashMap<String, Object>();
+ map.put("id", item.getSerialNumber());
+ map.put("value", item.getPointName());
+ return map;
}).collect(Collectors.toList());
return Result.ok().data(data);
}
+
+ @Override
+ public boolean updateRecovery(List<String> serialNumberList, int recovery) {
+ return new LambdaUpdateChainWrapper<>(baseMapper)
+ .in(YwPoint::getSerialNumber, serialNumberList)
+ .set(YwPoint::getRecovery, recovery)
+ .set(YwPoint::getUpdateTime, new Date())
+ .set(recovery == 0, YwPoint::getRecoveryTime, DateUtils.getNowDate())
+ .update();
+ }
+
+ @Override
+ public List<YwPoint> home() {
+ return baseMapper.home();
+ }
+
+ @Override
+ public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
+ // 瀵煎嚭鏁版嵁
+ List<PointExport> exportData = baseMapper.export(query);
+ EasyExcel.write(response.getOutputStream(), PointExport.class)
+ .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅")
+ .doWrite(exportData);
+ }
+
+ @Override
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException {
+ Consumer<List<PointExport>> consumer = (dataList) -> {
+ try {
+ this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ };
+ EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
+ return Result.ok();
+ }
+
+ @Override
+ public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+ return baseMapper.getReportResult(serialNumber, reportType);
+ }
+
+ /**
+ * 淇敼鐐逛綅鐨勮繍缁村崟浣�
+ *
+ * @param dataList
+ * @param unitId
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException {
+ if (CollectionUtils.isEmpty(dataList)) {
+ throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ List<YwPoint> pointList = dataList.stream().map(item -> {
+ YwPoint point = new YwPoint();
+ point.setImportantCommandImageTag("鏄�".equals(item.getImportantCommandImageTagString()));
+ point.setProvinceTag("鏄�".equals(item.getProvinceTagString()));
+ point.setDeptTag("鏄�".equals(item.getDeptTag()));
+ if (needUpdateUnit) {
+ if (Objects.nonNull(unitId)) {
+ point.setUnitId(Long.valueOf(unitId));
+ }
+ point.setStartTime(startTime);
+ point.setEndTime(endTime);
+ } else {
+ point.setUnitId(null);
+ point.setStartTime(null);
+ point.setEndTime(null);
+ }
+
+ point.setPointName(item.getPointName());
+ point.setSerialNumber(item.getSerialNumber());
+ return point;
+ }).collect(Collectors.toList());
+ this.waitAllFinishAndGetResult(pointList);
+ }
+
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws InterruptedException, ExecutionException {
+ int start = 0;
+ Date startTime = new Date();
+ while (true) {
+ if (dataList.size() < start + 800) {
+ List<YwPoint> list = dataList.subList(start, dataList.size() - 1);
+ this.baseMapper.updatePoint(list);
+ break;
+ } else {
+ List<YwPoint> list = dataList.subList(start, start + 800);
+ this.baseMapper.updatePoint(list);
+ start += 800;
+ }
+ }
+ Date endTime = new Date();
+ log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
+ }
+
+ @Override
+ public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList) {
+ List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
+ List<CheckTagVO> pointList = baseMapper.getTagsByGB(gbList);
+ Map<String, CheckTagVO> pointMap = pointList.stream().collect(Collectors.toMap(CheckTagVO::getNo, item -> item));
+ for (BaseResult data : dataList) {
+ CheckTagVO tag = pointMap.get(data.getNo());
+ if (Objects.nonNull(tag)) {
+ BeanUtils.copyProperties(tag, data);
+ }
+ }
+ }
+
+ @Override
+ public <T extends BaseResult> void setNew(List<T> dataList) {
+ List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList());
+ Map<String, BaseResult> pointMap = dataList.stream().collect(Collectors.toMap(BaseResult::getNo, item -> item));
+ List<String> dbGBList = monitorMapper.getGBbyGB(gbList);
+ for (String s : gbList) {
+ BaseResult baseResult = pointMap.get(s);
+ baseResult.setNewDevice(!dbGBList.contains(s));
+ }
+ }
+
}
--
Gitblit v1.8.0