From 5533880a277aa5dd75c1794f7f5fa4426ea41d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 14 十一月 2024 23:54:08 +0800
Subject: [PATCH] 白名单故障类型
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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..dc82f15 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;
@@ -135,9 +136,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,6 +266,8 @@
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);
headers.add(PointHeaderConstant.Impotrant_Command_Image);
headers.add(PointHeaderConstant.Dept_Tag);
@@ -278,6 +286,8 @@
list.add(export.getPointName());
list.add(export.getSerialNumber());
list.add(export.getPointIP());
+ list.add(export.getArea());
+ list.add(export.getUnitName());
list.add(export.getProvinceTagString());
list.add(export.getImportantCommandImageTagString());
list.add(export.getDeptTagString());
@@ -383,6 +393,8 @@
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
+ } else {
+ point.setUnitId(null);
}
point.setStartTime(startTime);
point.setEndTime(endTime);
@@ -396,7 +408,7 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
@Override
@@ -441,7 +453,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());
@@ -452,17 +464,30 @@
}
}
}
+ //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()));
}
--
Gitblit v1.8.0