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 | 138 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 43 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 646081a..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
@@ -3,6 +3,7 @@
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;
@@ -34,6 +35,7 @@
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;
@@ -135,9 +137,14 @@
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("淇敼鎴愬姛");
}
@@ -194,7 +201,11 @@
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);
}
@@ -254,15 +265,21 @@
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.Province_Tag);
+ 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)) {
//浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
@@ -278,9 +295,15 @@
list.add(export.getPointName());
list.add(export.getSerialNumber());
list.add(export.getPointIP());
- list.add(export.getProvinceTagString());
+ 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;
@@ -333,9 +356,13 @@
pointExport.setPointName(map.get(PointHeaderConstant.Point_Name));
pointExport.setPointIP(map.get(PointHeaderConstant.IP));
pointExport.setSerialNumber(map.get(PointHeaderConstant.Serial_Number));
- pointExport.setProvinceTag("鏄�".equals(map.get(PointHeaderConstant.Province_Tag)));
+ 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()) {
@@ -378,11 +405,17 @@
List<YwPoint> pointList = dataList.stream().map(item -> {
YwPoint point = new YwPoint();
point.setImportantCommandImageTag(item.getImportantCommandImageTag());
- point.setProvinceTag(item.getProvinceTag());
+ 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);
@@ -396,7 +429,7 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
@Override
@@ -415,60 +448,65 @@
}
//鏍规嵁label_value鍜宺ef_id鍒ゆ柇鏄惁鏄悓涓�鏁版嵁
for (PointExport pointExport : dataList) {
- //寰楀埌excel涓姩鎬佸垪鍚嶄綔涓簁ey鐨刴ap
- Map<String, DynamicColumnVO> exportMap = pointExport.getDynamicData().stream().collect(Collectors.toMap(DynamicColumnVO::getLabelValue, Function.identity()));
- //鏌ュ嚭鏁版嵁搴撲腑杩欎釜鐐逛綅鐨勫姩鎬佸垪
- List<DynamicColumnVO> dynamicColumnVOS = dynamicVOMap.get(pointExport.getId());
- if (!CollectionUtils.isEmpty(dynamicColumnVOS)) {
- //閬嶅巻鏁版嵁搴撲腑杩欎釜鐐逛綅鐨勫姩鎬佸垪锛屽苟鏍规嵁鍔ㄦ�佸垪鍚嶆壘鍑篹xcel涓殑鍊�
- for (DynamicColumnVO vo : dynamicColumnVOS) {
- DynamicColumnVO dynamicColumnVO = exportMap.get(vo.getLabelValue());
- //瀛樺湪璇存槑excel鏈夎繖涓暟鎹紝灏嗘暟鎹簱杩欎釜鏁版嵁鐨勫�兼敼涓篹xcel鐨勫��
- if (dynamicColumnVO.getColumnValue() != null) {
- DynamicColumnValue entity = new DynamicColumnValue();
- entity.setColumnValue(dynamicColumnVO.getColumnValue());
- entity.setDynamicColumnId(vo.getId());
- entity.setRefId(vo.getRefId());
- entity.setId(vo.getValueId());
- updateList.add(entity);
+ //鏁版嵁搴撲腑鐨勫姩鎬佸垪
+ 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 {
- //涓嶅瓨鍦ㄥ垯鍙栨秷鏍囩锛屽垹闄�
- deleteList.add(vo.getValueId());
- }
- }
- } else {
- //鏁版嵁搴撻噷鏌ヤ笉鍒癳xcel閲岄潰鐨勮繖涓偣浣嶅姩鎬佸垪锛屽叏涓烘柊澧�
- List<DynamicColumnVO> dynamicData = pointExport.getDynamicData();
- for (DynamicColumnVO excelData : dynamicData) {
- if(excelData.getColumnValue()!=null) {
- Integer dynamicId = dictionary.get(excelData.getLabelValue());
- DynamicColumnValue entity = new DynamicColumnValue();
- entity.setColumnValue(excelData.getColumnValue());
entity.setDynamicColumnId(dynamicId);
- entity.setRefId(pointExport.getId());
insertList.add(entity);
}
+ } else if (databaseVo != null) {
+ //excel閲屼负绌轰絾鏄暟鎹簱瀛樺湪 鍒犻櫎
+ deleteList.add(databaseVo.getValueId());
}
}
}
+ //mybaits鏂规硶
//鎻掑叆
- if(!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
+ if (!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
//鏇存柊
- if(!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
+ if (!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
//鍒犻櫎
- if(!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatchIds(deleteList);
+ if (!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
+ /**
+ * 鏍规嵁璁惧缂栫爜鏌ヨ鐐逛綅淇℃伅
+ *
+ * @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);
+ 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) {
+ 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));
@@ -476,6 +514,20 @@
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);
+ }
+ }
}
}
}
--
Gitblit v1.8.0