From f6593a5f6f1138abf09a0ee69fc5119fdce412c9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 07 十二月 2024 17:52:07 +0800
Subject: [PATCH] 标签bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 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 c4e154c..77e4435 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
@@ -35,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;
@@ -136,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("淇敼鎴愬姛");
}
@@ -260,9 +266,12 @@
headers.add(PointHeaderConstant.ID);
headers.add(PointHeaderConstant.Point_Name);
headers.add(PointHeaderConstant.Serial_Number);
- headers.add(PointHeaderConstant.Area);
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);
List<String> headersList = new LinkedList<>();
@@ -279,9 +288,12 @@
list.add(export.getId());
list.add(export.getPointName());
list.add(export.getSerialNumber());
- list.add(export.getArea());
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());
for (String header : headersList) {
@@ -336,7 +348,9 @@
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)));
List<DynamicColumnVO> dynamics = new ArrayList<>();
@@ -381,11 +395,15 @@
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());
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
+ } else {
+ point.setUnitId(null);
}
point.setStartTime(startTime);
point.setEndTime(endTime);
@@ -399,7 +417,7 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
@Override
@@ -444,7 +462,7 @@
//鏁版嵁搴撻噷鏌ヤ笉鍒癳xcel閲岄潰鐨勮繖涓偣浣嶅姩鎬佸垪锛屽叏涓烘柊澧�
List<DynamicColumnVO> dynamicData = pointExport.getDynamicData();
for (DynamicColumnVO excelData : dynamicData) {
- if(excelData.getColumnValue()!=null) {
+ if (excelData.getColumnValue() != null) {
Integer dynamicId = dictionary.get(excelData.getLabelValue());
DynamicColumnValue entity = new DynamicColumnValue();
entity.setColumnValue(excelData.getColumnValue());
@@ -457,11 +475,11 @@
}
//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.deleteBatch(deleteList);
+ if (!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
}
/**
@@ -476,15 +494,15 @@
return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0"));
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
+ 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));
@@ -492,6 +510,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