From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 21 二月 2025 15:51:13 +0800 Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数 --- ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 457 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 403 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 60cf212..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,37 +1,60 @@ 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.ycl.platform.domain.entity.YwPoint; -import com.ycl.platform.domain.entity.YwUnit; +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.*; +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.mapper.YwUnitMapper; +import com.ycl.platform.service.DynamicColumnService; 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.SysDept; -import com.ycl.system.service.ISysDeptService; - -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.ycl.system.mapper.SysDeptMapper; import com.ycl.system.page.PageUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +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 java.util.ArrayList; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.function.Function; +import java.util.stream.Collectors; /** * 杩愮淮鐐逛綅 鏈嶅姟瀹炵幇绫� @@ -41,24 +64,27 @@ */ @Service @RequiredArgsConstructor +@Slf4j public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService { - private final YwPointMapper ywPointMapper; - @Autowired - private ISysDeptService deptService; - @Autowired - private YwUnitService unitService; - private final YwUnitMapper ywUnitMapper; + private final SysDeptMapper sysDeptMapper; + private final TMonitorMapper monitorMapper; + private final DynamicColumnMapper dynamicColumnMapper; + private final ApplicationContext context; /** * 娣诲姞 + * * @param form * @return */ @Override public Result add(YwPointForm form) { YwPoint entity = YwPointForm.getEntityByForm(form, null); - if(baseMapper.insert(entity) > 0) { + Date now = new Date(); + entity.setCreateTime(now); + entity.setUpdateTime(now); + if (baseMapper.insert(entity) > 0) { return Result.ok("娣诲姞鎴愬姛"); } return Result.error("娣诲姞澶辫触"); @@ -71,6 +97,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("娣诲姞鎴愬姛"); @@ -83,8 +112,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) @@ -92,6 +120,7 @@ .set(YwPoint::getUnitId, form.getUnitId()) .set(YwPoint::getStartTime, null) .set(YwPoint::getEndTime, null) + .set(YwPoint::getUpdateTime, new Date()) .update(); } return Result.ok("淇敼鎴愬姛"); @@ -99,31 +128,35 @@ /** * 淇敼 + * * @param form * @return */ @Override public Result update(YwPointForm form) { - YwPoint entity = baseMapper.selectById(form.getId()); - - // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊 Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); BeanUtils.copyProperties(form, entity); - if (baseMapper.updateById(entity) > 0) { - return Result.ok("淇敼鎴愬姛"); + if (form.getUnitId() != null) { + entity.setUnitId(Long.valueOf(form.getUnitId())); + }else { + entity.setUnitId(null); } - return Result.error("淇敼澶辫触"); + Date now = new Date(); + entity.setUpdateTime(now); + 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("鍒犻櫎澶辫触"); @@ -131,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("鍒犻櫎澶辫触"); @@ -144,44 +178,41 @@ /** * 鍒嗛〉鏌ヨ + * * @param query * @return */ @Override public Result page(YwPointQuery query) { - - IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper) - .like(StringUtils.hasText(query.getPointName()), YwPoint::getPointName, query.getPointName()) - .orderByDesc(YwPoint::getCreateTime) - .page(PageUtil.getPage(query, YwPoint.class)); - - List<YwPointVO> vos = page.getRecords().stream() - .map( - entity -> YwPointVO.getVoByEntity(entity, null) - .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName()) - .setUnitName(unitService.getById(entity.getUnitId()).getUnitName()) - ) - .collect(Collectors.toList()); - - return Result.ok().data(vos).total(page.getTotal()); + IPage<YwPointVO> page = PageUtil.getPage(query, YwPointVO.class); + baseMapper.page(page, query); + return Result.ok().data(page.getRecords()).total(page.getTotal()); } /** * 鏍规嵁id鏌ユ壘 + * * @param id * @return */ @Override public Result detail(String id) { - YwPoint entity = baseMapper.selectById(id); Assert.notNull(entity, "璁板綍涓嶅瓨鍦�"); YwPointVO vo = YwPointVO.getVoByEntity(entity, null); + if (Objects.nonNull(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 @@ -194,4 +225,322 @@ .collect(Collectors.toList()); return Result.ok().data(vos); } + + @Override + public Result select(String keyword) { + 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); + //鑾峰彇鍔ㄦ�佸垪鏁版嵁 + 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 ReportAuditingRecordVO getReportResult(String serialNumber, String reportType) { + return baseMapper.getReportResult(serialNumber, reportType); + } + + /** + * 淇敼鐐逛綅鐨勮繍缁村崟浣� + * + * @param dataList + * @param unitId + */ + 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(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); + } 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, needUpdateUnit); + } + + @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