From f8751d6e701e0c3e7d8959449b67db6c35d09ec8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 08 十二月 2024 19:24:07 +0800
Subject: [PATCH] 新增故障类型
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 170 insertions(+), 35 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 15e8456..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
@@ -3,15 +3,14 @@
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.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.entity.*;
import com.ycl.platform.domain.excel.PointExport;
import com.ycl.platform.domain.form.BatchEditPointForm;
import com.ycl.platform.domain.form.YwPointForm;
@@ -25,6 +24,7 @@
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;
@@ -34,11 +34,14 @@
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;
@@ -67,6 +70,7 @@
private final SysDeptMapper sysDeptMapper;
private final TMonitorMapper monitorMapper;
private final DynamicColumnMapper dynamicColumnMapper;
+ private final ApplicationContext context;
/**
* 娣诲姞
@@ -133,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("淇敼鎴愬姛");
}
@@ -250,14 +259,19 @@
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));
+ 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);
List<String> headersList = new LinkedList<>();
@@ -271,12 +285,17 @@
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.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.getDeptTag());
+ list.add(export.getDeptTagString());
for (String header : headersList) {
//鍒涘缓涓�涓彉閲忚褰曟壘娌℃壘鍒拌繖涓猦eader
boolean flag = false;
@@ -308,27 +327,52 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
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);
- } catch (ExecutionException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
+ 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)));
+ 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);
+ }
}
- };
- 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);
+ 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();
}
@@ -343,7 +387,6 @@
* @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 {
if (CollectionUtils.isEmpty(dataList)) {
@@ -351,12 +394,16 @@
}
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());
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
+ } else {
+ point.setUnitId(null);
}
point.setStartTime(startTime);
point.setEndTime(endTime);
@@ -370,18 +417,92 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
+ @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) {
+ //寰楀埌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);
+
+ } 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);
+ }
+ }
+ }
+ }
+ //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);
+ 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));
@@ -389,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