From 0d243e7f5dc593cdc6e0608bb52cd635f8fc6982 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 19 九月 2025 11:59:44 +0800
Subject: [PATCH] 新需求
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 356 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 292 insertions(+), 64 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..f5adcac 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,20 +1,30 @@
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.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.service.impl.ServiceImpl;
import com.ycl.dataListener.CurrencyDataListener;
-import com.ycl.platform.domain.entity.YwPeople;
-import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.base.AbsVo;
+import com.ycl.platform.domain.entity.*;
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.DynamicColumnService;
import com.ycl.platform.service.YwPointService;
import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
@@ -23,19 +33,27 @@
import com.ycl.thread.PointImportCallable;
import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
+import com.ycl.utils.poi.EasyExcelImportUtils;
+import com.ycl.utils.uuid.IdUtils;
+import constant.CheckConstants;
+import constant.PointHeaderConstant;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
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;
/**
@@ -46,22 +64,17 @@
*/
@Service
@RequiredArgsConstructor
+@Slf4j
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;
+ private final ApplicationContext context;
/**
* 娣诲姞
+ *
* @param form
* @return
*/
@@ -71,7 +84,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 +128,7 @@
/**
* 淇敼
+ *
* @param form
* @return
*/
@@ -123,20 +137,26 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ if (form.getUnitId() != null) {
+ entity.setUnitId(Long.valueOf(form.getUnitId()));
+ }else {
+ entity.setUnitId(null);
+ }
Date now = new Date();
entity.setUpdateTime(now);
- baseMapper.updateById(entity);
+ baseMapper.myUpdateById(entity);
return Result.ok("淇敼鎴愬姛");
}
/**
* 鎵归噺鍒犻櫎
+ *
* @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 +164,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 +178,7 @@
/**
* 鍒嗛〉鏌ヨ
+ *
* @param query
* @return
*/
@@ -169,6 +191,7 @@
/**
* 鏍规嵁id鏌ユ壘
+ *
* @param id
* @return
*/
@@ -178,13 +201,18 @@
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
YwPointVO vo = YwPointVO.getVoByEntity(entity, null);
if (Objects.nonNull(entity.getDeptId())) {
- vo.setDeptIds(sysDeptMapper.selectParents(entity.getDeptId()));
+ //TODO:鏂规硶寰呭畬鍠� 绠�鍗曞鐞�
+ List<Long> deptIds = sysDeptMapper.selectParents(entity.getDeptId());
+ deptIds.remove(deptIds.size()-1);
+ deptIds.add(entity.getDeptId());
+ vo.setDeptIds(deptIds);
}
return Result.ok().data(vo);
}
/**
* 鍒楄〃
+ *
* @return
*/
@Override
@@ -200,20 +228,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,24 +258,137 @@
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.getRefId() != null).collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+ }
+ //瀹氫箟鍥哄畾琛ㄥご鍒楄〃
+ LinkedHashSet<String> headers = new LinkedHashSet<>();
+ headers.add(PointHeaderConstant.ID);
+ headers.add(PointHeaderConstant.Point_Name);
+ headers.add(PointHeaderConstant.Serial_Number);
+ headers.add(PointHeaderConstant.IP);
+ headers.add(PointHeaderConstant.Area);
+ headers.add(PointHeaderConstant.Unit);
+ headers.add(PointHeaderConstant.Province_Tag_Video);
+ headers.add(PointHeaderConstant.Province_Tag_Car);
+ headers.add(PointHeaderConstant.Province_Tag_Face);
+ headers.add(PointHeaderConstant.Impotrant_Command_Image);
+ headers.add(PointHeaderConstant.Dept_Tag);
+ headers.add(PointHeaderConstant.Username);
+ headers.add(PointHeaderConstant.Password);
+ 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.getId());
+ list.add(export.getPointName());
+ list.add(export.getSerialNumber());
+ list.add(export.getPointIP());
+ list.add(export.getArea());
+ list.add(export.getUnitName());
+ list.add(export.getProvinceTagVideoString());
+ list.add(export.getProvinceTagCarString());
+ list.add(export.getProvinceTagFaceString());
+ list.add(export.getImportantCommandImageTagString());
+ list.add(export.getDeptTagString());
+ list.add(export.getUsername());
+ list.add(export.getPassword());
+ 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
+ @Transactional(rollbackFor = Exception.class)
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean
+ needUpdateUnit) throws IOException, ExecutionException, InterruptedException {
+ List<Map<String, String>> list = EasyExcelImportUtils.makeData(file);
+ List<PointExport> dataList = new ArrayList<>();
+// 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();
+ for (Map<String, String> map : list) {
+ PointExport pointExport = new PointExport();
+ pointExport.setId(Integer.valueOf(map.get(PointHeaderConstant.ID)));
+ pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
+ pointExport.setPointIP(map.get(PointHeaderConstant.IP));
+ pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
+ pointExport.setProvinceTagVideo("鏄�".equals(map.get(PointHeaderConstant.Province_Tag_Video)));
+ pointExport.setProvinceTagCar("鏄�".equals(map.get(PointHeaderConstant.Province_Tag_Car)));
+ pointExport.setProvinceTagFace("鏄�".equals(map.get(PointHeaderConstant.Province_Tag_Face)));
+ pointExport.setImportantCommandImageTag("鏄�".equals(map.get(PointHeaderConstant.Impotrant_Command_Image)));
+ pointExport.setDeptTag("鏄�".equals(map.get(PointHeaderConstant.Dept_Tag)));
+ pointExport.setUsername(map.get(PointHeaderConstant.Username));
+ pointExport.setPassword(map.get(PointHeaderConstant.Password));
+ List<DynamicColumnVO> dynamics = new ArrayList<>();
+ // 澶勭悊鍔ㄦ�佸垪
+ for (Map.Entry<String, String> entry : map.entrySet()) {
+ String key = entry.getKey();
+ if (!PointHeaderConstant.KNOWN_KEYS.contains(key)) {
+ DynamicColumnVO dynamicColumnVO = new DynamicColumnVO();
+ dynamicColumnVO.setRefId(pointExport.getId());
+ dynamicColumnVO.setLabelValue(entry.getKey());
+ dynamicColumnVO.setColumnValue(entry.getValue());
+ dynamicColumnVO.setPropName(IdUtils.randomNO(new Date()));
+ dynamicColumnVO.setTableName("t_yw_point");
+ dynamics.add(dynamicColumnVO);
+ }
+ }
+ pointExport.setDynamicData(dynamics);
+ dataList.add(pointExport);
+ }
+ YwPointServiceImpl self = context.getBean(YwPointServiceImpl.class);
+ self.updatePoint(dataList, unitId, startTime, endTime, needUpdateUnit);
+ self.updateDynamic(dataList);
+ return Result.ok();
}
@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();
+ public ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) {
+ return baseMapper.getReportResult(serialNumber, reportType);
}
/**
@@ -268,19 +397,25 @@
* @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 {
+ 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()));
+ point.setImportantCommandImageTag(item.getImportantCommandImageTag());
+ point.setProvinceTagVideo(item.getProvinceTagVideo());
+ point.setProvinceTagCar(item.getProvinceTagCar());
+ point.setProvinceTagFace(item.getProvinceTagFace());
+ point.setDeptTag(item.getDeptTag());
+ point.setUsername(item.getUsername());
+ point.setPassword(item.getPassword());
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
+ } else {
+ point.setUnitId(null);
}
point.setStartTime(startTime);
point.setEndTime(endTime);
@@ -294,25 +429,118 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
- 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;
+ @Override
+ public void updateDynamic(List<PointExport> dataList) {
+ List<DynamicColumnValue> insertList = new ArrayList<>();
+ List<DynamicColumnValue> updateList = new ArrayList<>();
+ List<Integer> deleteList = new ArrayList<>();
+ //鏌ュ嚭鎵�鏈夌绫诲姩鎬佸垪浣滀负瀛楀吀
+ Map<String, Integer> dictionary = new LambdaQueryChainWrapper<>(dynamicColumnMapper)
+ .list().stream().collect(Collectors.toMap(DynamicColumn::getLabelValue, DynamicColumn::getId));
+ //鏌ュ嚭鐐逛綅琛ㄧ殑鎵�鏈夊姩鎬佸垪
+ List<DynamicColumnVO> dynamicVOList = dynamicColumnMapper.getData();
+ Map<Integer, List<DynamicColumnVO>> dynamicVOMap = new HashMap<>();
+ if (!CollectionUtils.isEmpty(dynamicVOList)) {
+ dynamicVOMap = dynamicVOList.stream().filter(vo -> vo.getRefId() != null).collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+ }
+ //鏍规嵁label_value鍜宺ef_id鍒ゆ柇鏄惁鏄悓涓�鏁版嵁
+ for (PointExport pointExport : dataList) {
+ //鏁版嵁搴撲腑鐨勫姩鎬佸垪
+ List<DynamicColumnVO> dynamicColumnVOS = dynamicVOMap.getOrDefault(pointExport.getId(), Collections.emptyList());
+ Map<String, DynamicColumnVO> databaseMap = dynamicColumnVOS.stream()
+ .collect(Collectors.toMap(DynamicColumnVO::getLabelValue, Function.identity()));
+
+ for (DynamicColumnVO excelVo : pointExport.getDynamicData()) {
+ String labelValue = excelVo.getLabelValue();
+ DynamicColumnVO databaseVo = databaseMap.get(labelValue);
+ //濡傛灉excel鍊间笉涓虹┖鍒ゅ畾涓烘柊澧炴垨淇敼
+ if (excelVo.getColumnValue() != null) {
+ Integer dynamicId = dictionary.get(labelValue);
+ DynamicColumnValue entity = new DynamicColumnValue();
+ entity.setColumnValue(excelVo.getColumnValue());
+ entity.setRefId(pointExport.getId());
+ //鏁版嵁搴撴壘涓嶅埌涓烘柊澧炲惁鍒欎负淇敼
+ if (databaseVo != null) {
+ entity.setDynamicColumnId(databaseVo.getId());
+ entity.setId(databaseVo.getValueId());
+ updateList.add(entity);
+ } else {
+ entity.setDynamicColumnId(dynamicId);
+ insertList.add(entity);
+ }
+ } else if (databaseVo != null) {
+ //excel閲屼负绌轰絾鏄暟鎹簱瀛樺湪 鍒犻櫎
+ deleteList.add(databaseVo.getValueId());
+ }
}
}
+ //mybaits鏂规硶
+ //鎻掑叆
+ if (!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
+ //鏇存柊
+ if (!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
+ //鍒犻櫎
+ if (!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
+ }
+
+ /**
+ * 鏍规嵁璁惧缂栫爜鏌ヨ鐐逛綅淇℃伅
+ *
+ * @param serialNumber 搴忓垪鍙�
+ * @return {@link YwPoint }
+ * @author
+ */
+ @Override
+ public YwPoint selectBySerialNumber(String serialNumber) {
+ return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0"));
+ }
+
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList, Boolean needUpdateUnit) {
+ Date startTime = new Date();
+ this.baseMapper.updatePoint(dataList, needUpdateUnit);
Date endTime = new Date();
log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
}
+ @Override
+ public <T extends BaseResult> void setDeviceTagByGB(List<T> dataList,Short category) {
+ 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);
+ //閫氳繃璁惧绫诲瀷鎵撶渷鍘呮爣绛�
+ if(CheckConstants.Rule_Category_Video.equals(category)){
+ data.setProvinceTag(tag.getProvinceTagVideo());
+ }else if(CheckConstants.Rule_Category_Car.equals(category)){
+ data.setProvinceTag(tag.getProvinceTagCar());
+ }else if(CheckConstants.Rule_Category_Face.equals(category)){
+ data.setProvinceTag(tag.getProvinceTagFace());
+ }else if(CheckConstants.Rule_Category_Or.equals(category)){
+ if(tag.getProvinceTagVideo() || tag.getProvinceTagCar() || tag.getProvinceTagFace()) {
+ data.setProvinceTag(Boolean.TRUE);
+ }else {
+ data.setProvinceTag(Boolean.FALSE);
+ }
+ }
+ }
+ }
+ }
+
+ @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