From 9606980aa32de18b4fc1cb7e3450b90c636cbf84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 十月 2024 18:14:10 +0800
Subject: [PATCH] 取图片依赖注释
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 167 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 133 insertions(+), 34 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 309b427..4a4cbb4 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,18 +1,28 @@
package com.ycl.platform.service.impl;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
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.service.impl.ServiceImpl;
import com.ycl.dataListener.CurrencyDataListener;
+import com.ycl.platform.base.AbsVo;
+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.result.BaseResult;
+import com.ycl.platform.domain.vo.CheckTagVO;
+import com.ycl.platform.domain.vo.DynamicColumnVO;
+import com.ycl.platform.domain.vo.ReportAuditingRecordVO;
import com.ycl.platform.domain.vo.YwPointVO;
+import com.ycl.platform.mapper.DynamicColumnMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.mapper.YwPeopleMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.YwPointService;
@@ -23,6 +33,8 @@
import com.ycl.thread.PointImportCallable;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.poi.EasyExcelImportUtils;
+import constant.PointHeaderConstant;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -30,12 +42,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
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.function.Function;
import java.util.stream.Collectors;
/**
@@ -49,19 +63,12 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
private final SysDeptMapper sysDeptMapper;
- private final YwUnitService unitService;
- private final YwPeopleMapper ywPeopleMapper;
-
- private static final ExecutorService executorService = new ThreadPoolExecutor(8,
- 24,
- 5000,
- TimeUnit.SECONDS,
- new ArrayBlockingQueue<>(10),
- new ThreadPoolExecutor.CallerRunsPolicy()
- );
+ private final TMonitorMapper monitorMapper;
+ private final DynamicColumnMapper dynamicColumnMapper;
/**
* 娣诲姞
+ *
* @param form
* @return
*/
@@ -71,7 +78,7 @@
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
- if(baseMapper.insert(entity) > 0) {
+ if (baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
return Result.error("娣诲姞澶辫触");
@@ -115,6 +122,7 @@
/**
* 淇敼
+ *
* @param form
* @return
*/
@@ -131,12 +139,13 @@
/**
* 鎵归噺鍒犻櫎
+ *
* @param ids
* @return
*/
@Override
public Result remove(List<String> ids) {
- if(baseMapper.deleteBatchIds(ids) > 0) {
+ if (baseMapper.deleteBatchIds(ids) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
return Result.error("鍒犻櫎澶辫触");
@@ -144,12 +153,13 @@
/**
* id鍒犻櫎
+ *
* @param id
* @return
*/
@Override
public Result removeById(String id) {
- if(baseMapper.deleteById(id) > 0) {
+ if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
return Result.error("鍒犻櫎澶辫触");
@@ -157,6 +167,7 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param query
* @return
*/
@@ -169,6 +180,7 @@
/**
* 鏍规嵁id鏌ユ壘
+ *
* @param id
* @return
*/
@@ -185,6 +197,7 @@
/**
* 鍒楄〃
+ *
* @return
*/
@Override
@@ -200,20 +213,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());
@@ -242,13 +243,72 @@
public void export(YwPointQuery query, HttpServletResponse response) throws IOException {
// 瀵煎嚭鏁版嵁
List<PointExport> exportData = baseMapper.export(query);
- EasyExcel.write(response.getOutputStream(), PointExport.class)
- .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅")
- .doWrite(exportData);
+ //鑾峰彇鍔ㄦ�佸垪鏁版嵁
+ List<String> dynamicsHeaders = dynamicColumnMapper.getHeader("t_yw_point");
+ List<DynamicColumnVO> dynamics = dynamicColumnMapper.getData();
+ Map<Integer, List<DynamicColumnVO>> dynamicMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(dynamics)) {
+ dynamicMap = dynamics.stream().filter(vo ->vo.getId()!=null).collect(Collectors.groupingBy(AbsVo::getId));
+ }
+ //瀹氫箟琛ㄥご鍒楄〃
+ LinkedHashSet<String> headers = new LinkedHashSet<>();
+ headers.add(PointHeaderConstant.Point_Name);
+ headers.add(PointHeaderConstant.Serial_Number);
+ headers.add(PointHeaderConstant.IP);
+ headers.add(PointHeaderConstant.Province_Tag);
+ headers.add(PointHeaderConstant.Impotrant_Command_Image);
+ headers.add(PointHeaderConstant.Dept_Tag);
+ List<String> headersList = new LinkedList<>();
+ if (!CollectionUtils.isEmpty(dynamicsHeaders)) {
+ //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+ headersList.addAll(dynamicsHeaders);
+ headers.addAll(headersList);
+ }
+ // 瀹氫箟鏁版嵁
+ List<List<Object>> data = new ArrayList<>();
+ for (PointExport export : exportData) {
+ List<Object> list = new ArrayList<>();
+ //闇�瑕佷繚璇侀『搴忎竴鑷�
+ list.add(export.getPointName());
+ list.add(export.getSerialNumber());
+ list.add(export.getPointIP());
+ list.add(export.getProvinceTagString());
+ list.add(export.getImportantCommandImageTagString());
+ list.add(export.getDeptTag());
+ for (String header : headersList) {
+ //鍒涘缓涓�涓彉閲忚褰曟壘娌℃壘鍒拌繖涓猦eader
+ boolean flag = false;
+ List<DynamicColumnVO> columnVOS = dynamicMap.get(export.getId());
+ if (!CollectionUtils.isEmpty(columnVOS)) {
+ for (DynamicColumnVO columnVO : columnVOS) {
+ if (header.equals(columnVO.getLabelValue())) {
+ list.add(columnVO.getColumnValue());
+ flag = true;
+ }
+ }
+ }
+ //娌℃壘鍒扮敤绌轰覆鍗犱綅
+ if (!flag) list.add("");
+ }
+ data.add(list);
+ }
+
+ List<List<String>> headList = new ArrayList<>();
+ for (String header : headers) {
+ headList.add(Collections.singletonList(header));
+ }
+
+ EasyExcel.write(response.getOutputStream())
+ .head(headList) // 璁剧疆琛ㄥご
+ .sheet("鐐逛綅鏇存崲杩愮淮鍗曚綅") // 璁剧疆sheet鍚嶇О
+ .doWrite(data); // 鍐欏叆鏁版嵁
}
+
@Override
- public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) throws IOException {
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean
+ needUpdateUnit) throws IOException {
+// List<Map<String,String>> list = EasyExcelImportUtils.makeData(file);
Consumer<List<PointExport>> consumer = (dataList) -> {
try {
this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
@@ -258,8 +318,21 @@
e.printStackTrace();
}
};
- EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
+ EasyExcel.read(file.getInputStream(), PointExport.class, new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
+// for (Map<String, String> map : list) {
+// PointExport pointExport = new PointExport();
+// pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
+// pointExport.setPointIP(map.get(PointHeaderConstant.IP));
+// pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
+// }
+// this.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
+// System.out.println(list);
return Result.ok();
+ }
+
+ @Override
+ public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+ return baseMapper.getReportResult(serialNumber, reportType);
}
/**
@@ -269,7 +342,8 @@
* @param unitId
*/
@Transactional(rollbackFor = Exception.class)
- public void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean needUpdateUnit) 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("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -297,7 +371,8 @@
this.waitAllFinishAndGetResult(pointList);
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws InterruptedException, ExecutionException {
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList) throws
+ InterruptedException, ExecutionException {
int start = 0;
Date startTime = new Date();
while (true) {
@@ -315,4 +390,28 @@
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