From 962d64e8e4c6e34b65d188d3caf3b43c181e076d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 16:35:10 +0800
Subject: [PATCH] 过程图返回报备标识
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 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 0cdb6d0..95a973d 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
@@ -6,12 +6,14 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
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.excel.PointExport;
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.platform.domain.form.YwPointForm;
import com.ycl.platform.domain.query.YwPointQuery;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
@@ -200,20 +202,8 @@
@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();
+ 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());
@@ -248,10 +238,10 @@
}
@Override
- public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
+ 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);
+ this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
} catch (ExecutionException e) {
e.printStackTrace();
} catch (InterruptedException e) {
@@ -262,6 +252,11 @@
return Result.ok();
}
+ @Override
+ public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+ return baseMapper.getReportResult(serialNumber, reportType);
+ }
+
/**
* 淇敼鐐逛綅鐨勮繍缁村崟浣�
*
@@ -269,7 +264,7 @@
* @param unitId
*/
@Transactional(rollbackFor = Exception.class)
- public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) throws ExecutionException, InterruptedException {
+ public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws ExecutionException, InterruptedException {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -277,11 +272,19 @@
YwPoint point = new YwPoint();
point.setImportantCommandImageTag("鏄�".equals(item.getImportantCommandImageTagString()));
point.setProvinceTag("鏄�".equals(item.getProvinceTagString()));
- if (Objects.nonNull(unitId)) {
- point.setUnitId(Long.valueOf(unitId));
+ 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.setStartTime(startTime);
- point.setEndTime(endTime);
+
point.setPointName(item.getPointName());
point.setSerialNumber(item.getSerialNumber());
return point;
@@ -290,19 +293,17 @@
}
public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws InterruptedException, ExecutionException {
- List<FutureTask<Boolean>> resultList = new ArrayList<>(512);
- List<Boolean> data = new ArrayList<>(512);
int start = 0;
Date startTime = new Date();
while (true) {
- if (dataList.size() < start + 100) {
+ 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 + 100);
+ List<YwPoint> list = dataList.subList(start, start + 800);
this.baseMapper.updatePoint(list);
- start += 100;
+ start += 800;
}
}
Date endTime = new Date();
--
Gitblit v1.8.0