ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPDATE: 重新修改导入被检设备逻辑

Browse Source
This commit is contained in:
贾同学
2025-10-21 14:02:22 +08:00
parent 90d618b66f
commit b53ef274cf
4 changed files with 164 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java
View File

@@ -12,7 +12,6 @@ import com.njcn.common.utils.LogUtil;
import com.njcn.gather.device.pojo.param.PqDevParam; import com.njcn.gather.device.pojo.param.PqDevParam;
import com.njcn.gather.device.pojo.vo.PqDevVO; import com.njcn.gather.device.pojo.vo.PqDevVO;
import com.njcn.gather.device.service.IPqDevService; import com.njcn.gather.device.service.IPqDevService;
import com.njcn.gather.monitor.pojo.po.PqMonitor;
import com.njcn.gather.type.service.IDevTypeService; import com.njcn.gather.type.service.IDevTypeService;
import com.njcn.web.controller.BaseController; import com.njcn.web.controller.BaseController;
import com.njcn.web.utils.FileUtil; import com.njcn.web.utils.FileUtil;
@@ -137,7 +136,7 @@ public class PqDevController extends BaseController {
@ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true), @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
@ApiImplicitParam(name = "patternId", value = "模式id", required = true) @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
}) })
public HttpResult<Boolean> importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, HttpServletResponse response) { public HttpResult importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
String methodDescribe = getMethodDescribe("importDev"); String methodDescribe = getMethodDescribe("importDev");
LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename()); LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename()); boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
@@ -147,12 +146,7 @@ public class PqDevController extends BaseController {
if ("null".equals(planId)) { if ("null".equals(planId)) {
planId = null; planId = null;
} }
Boolean result = pqDevService.importDev(file, patternId, planId, response); return pqDevService.importDev(file, patternId, planId, response, cover);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
}
} }
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)

9
detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java
View File

@@ -3,6 +3,7 @@ package com.njcn.gather.device.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.common.pojo.poi.PullDown; import com.njcn.common.pojo.poi.PullDown;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum; import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
import com.njcn.gather.device.pojo.param.PqDevParam; import com.njcn.gather.device.pojo.param.PqDevParam;
import com.njcn.gather.device.pojo.po.PqDev; import com.njcn.gather.device.pojo.po.PqDev;
@@ -124,7 +125,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param devId * @param devId
* @param userId * @param userId
*/ */
void updateResult(String devId,String userId); void updateResult(String devId, String userId);
void updatePqDevReportState(String devId, int i); void updatePqDevReportState(String devId, int i);
@@ -160,7 +161,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param planId 计划Id * @param planId 计划Id
* @param response 响应 * @param response 响应
*/ */
boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response); HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
/** /**
* 导入灿能二楼设备数据 * 导入灿能二楼设备数据
@@ -254,7 +255,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param planId 计划Id * @param planId 计划Id
* @param response 响应 * @param response 响应
*/ */
boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response); HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
/** /**
* 导入比对式设备数据 * 导入比对式设备数据
@@ -262,7 +263,7 @@ public interface IPqDevService extends IService<PqDev> {
* @param contrastDevExcelList * @param contrastDevExcelList
* @param patternId * @param patternId
*/ */
boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId); HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover);
/** /**
* 获取比对式设备导出、导出文件模板的下拉列表 * 获取比对式设备导出、导出文件模板的下拉列表

255
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -11,6 +11,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -19,8 +20,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.poi.PullDown; import com.njcn.common.pojo.poi.PullDown;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.EncryptionUtil; import com.njcn.common.utils.EncryptionUtil;
import com.njcn.db.mybatisplus.constant.DbConstant; import com.njcn.db.mybatisplus.constant.DbConstant;
import com.njcn.gather.device.mapper.PqDevMapper; import com.njcn.gather.device.mapper.PqDevMapper;
@@ -35,7 +38,6 @@ import com.njcn.gather.monitor.pojo.po.PqMonitor;
import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel; import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
import com.njcn.gather.monitor.service.IPqMonitorService; import com.njcn.gather.monitor.service.IPqMonitorService;
import com.njcn.gather.pojo.enums.DetectionResponseEnum; import com.njcn.gather.pojo.enums.DetectionResponseEnum;
import com.njcn.gather.report.pojo.enums.ReportResponseEnum;
import com.njcn.gather.storage.service.DetectionDataDealService; import com.njcn.gather.storage.service.DetectionDataDealService;
import com.njcn.gather.system.cfg.pojo.enums.SceneEnum; import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
import com.njcn.gather.system.cfg.pojo.po.SysTestConfig; import com.njcn.gather.system.cfg.pojo.po.SysTestConfig;
@@ -50,6 +52,7 @@ import com.njcn.gather.user.user.pojo.po.SysUser;
import com.njcn.gather.user.user.service.ISysUserService; import com.njcn.gather.user.user.service.ISysUserService;
import com.njcn.web.factory.PageFactory; import com.njcn.web.factory.PageFactory;
import com.njcn.web.utils.ExcelUtil; import com.njcn.web.utils.ExcelUtil;
import com.njcn.web.utils.HttpResultUtil;
import com.njcn.web.utils.PoiUtil; import com.njcn.web.utils.PoiUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -653,25 +656,31 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
} }
@Override @Override
public boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) { public HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
DictData dictData = dictDataService.getDictDataById(patternId); DictData dictData = dictDataService.getDictDataById(patternId);
if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) { if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
return this.importContrastDev(file, patternId, planId, response); return this.importContrastDev(file, patternId, planId, response, cover);
} else { } else {
String currrentScene = sysTestConfigService.getCurrrentScene(); String currrentScene = sysTestConfigService.getCurrrentScene();
SceneEnum sceneEnum = SceneEnum.getSceneEnum(currrentScene); SceneEnum sceneEnum = SceneEnum.getSceneEnum(currrentScene);
switch (sceneEnum) { switch (sceneEnum) {
case PROVINCE_PLATFORM: case PROVINCE_PLATFORM:
return this.importProvinceDev(file, patternId, planId, response); boolean result = this.importProvinceDev(file, patternId, planId, response);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
}
case LEAVE_FACTORY_TEST: case LEAVE_FACTORY_TEST:
return this.importCNDev(file, patternId, planId, response); result = this.importCNDev(file, patternId, planId, response);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
}
case SELF_TEST: case SELF_TEST:
break; break;
default: default:
break; break;
} }
} }
return false; return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
} }
@Override @Override
@@ -798,21 +807,15 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
* @param isExcludeSelf 是否排除自己 * @param isExcludeSelf 是否排除自己
*/ */
private void checkRepeat(PqDevParam param, boolean isExcludeSelf) { private void checkRepeat(PqDevParam param, boolean isExcludeSelf) {
QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>(); LambdaQueryWrapper<PqDev> queryWrapper = new LambdaQueryWrapper<PqDev>()
queryWrapper .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
.eq("state", DataStateEnum.ENABLE.getCode()) .eq(StrUtil.isNotBlank(param.getIp()), PqDev::getIp, param.getIp())
.eq(StrUtil.isNotBlank(param.getDevType()), "Dev_Type", param.getDevType()) .eq(ObjectUtil.isNotNull(param.getPort()), PqDev::getPort, param.getPort())
.eq(StrUtil.isNotBlank(param.getPattern()), "pattern", param.getPattern()) .eq(StrUtil.isNotBlank(param.getPattern()), PqDev::getPattern, param.getPattern())
.eq(StrUtil.isNotBlank(param.getCityName()), "City_Name", param.getCityName()) .eq(StrUtil.isNotBlank(param.getCreateId()), PqDev::getCreateId, param.getCreateId());
.eq(StrUtil.isNotBlank(param.getGdName()), "Gd_Name", param.getGdName())
.eq(StrUtil.isNotBlank(param.getSubName()), "Sub_Name", param.getSubName())
.and(q -> q.eq(StrUtil.isNotBlank(param.getName()), "name", param.getName()).or()
.eq(StrUtil.isNotBlank(param.getCreateId()), "Create_Id", param.getCreateId())); //设备序列号重复
// .eq("manufacturer", param.getManufacturer())
// .eq("Dev_Type", param.getDevType()).or()
if (isExcludeSelf) { if (isExcludeSelf) {
if (param instanceof PqDevParam.UpdateParam) { if (param instanceof PqDevParam.UpdateParam) {
queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId()); queryWrapper.ne(PqDev::getId, ((PqDevParam.UpdateParam) param).getId());
} }
} }
int count = this.count(queryWrapper); int count = this.count(queryWrapper);
@@ -1191,7 +1194,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
} }
@Override @Override
public boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) { public HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
ImportParams params = new ImportParams(); ImportParams params = new ImportParams();
params.setStartSheetIndex(0); params.setStartSheetIndex(0);
params.setSheetNum(1); params.setSheetNum(1);
@@ -1211,20 +1214,22 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL); throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL);
} }
return this.importContrastDev(contrastDevExcelList, patternId, planId); return this.importContrastDev(contrastDevExcelList, patternId, planId, cover);
} }
@Override @Override
@Transactional @Transactional
public boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId) { public HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover) {
if (CollUtil.isNotEmpty(contrastDevExcelList)) { if (CollUtil.isNotEmpty(contrastDevExcelList)) {
// 根据设备名称分组 // 根据设备名称分组
Map<String, List<ContrastDevExcel>> listMap = contrastDevExcelList.stream() Map<String, List<ContrastDevExcel>> listMap = contrastDevExcelList.stream()
.collect(Collectors.groupingBy(ContrastDevExcel::getName, LinkedHashMap::new, Collectors.toList())); .collect(Collectors.groupingBy(ContrastDevExcel::getName, LinkedHashMap::new, Collectors.toList()));
List<PqDev> oldDevList = new ArrayList<>(listMap.size()); List<PqDev> newDevList = new ArrayList<>(listMap.size());
List<PqMonitor> finalMonitorList = new ArrayList<>(); List<PqDev> updateDevList = new ArrayList<>();
List<PqDev> finalUpdateDevList = new ArrayList<>();
for (Map.Entry<String, List<ContrastDevExcel>> entry : listMap.entrySet()) { for (Map.Entry<String, List<ContrastDevExcel>> entry : listMap.entrySet()) {
String name = entry.getKey(); String name = entry.getKey();
List<ContrastDevExcel> devExcelList = entry.getValue(); List<ContrastDevExcel> devExcelList = entry.getValue();
// 监测点数据 // 监测点数据
List<PqMonitorExcel> pqMonitorExcelList = devExcelList.stream() List<PqMonitorExcel> pqMonitorExcelList = devExcelList.stream()
@@ -1234,16 +1239,16 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
.collect(Collectors.toList()); .collect(Collectors.toList());
// 取第一条为设备基本信息 // 取第一条为设备基本信息
ContrastDevExcel devExcel = devExcelList.get(0); ContrastDevExcel devExcel = devExcelList.get(0);
PqDev pqDev = BeanUtil.copyProperties(devExcel, PqDev.class); PqDev importPqDev = BeanUtil.copyProperties(devExcel, PqDev.class);
if (pqDev.getEncryptionFlag() == 1) { if (importPqDev.getEncryptionFlag() == 1) {
if (StrUtil.isNotBlank(pqDev.getSeries()) && StrUtil.isNotBlank(pqDev.getDevKey())) { if (StrUtil.isNotBlank(importPqDev.getSeries()) && StrUtil.isNotBlank(importPqDev.getDevKey())) {
pqDev.setSeries(EncryptionUtil.encodeString(1, pqDev.getSeries())); importPqDev.setSeries(EncryptionUtil.encodeString(1, importPqDev.getSeries()));
pqDev.setDevKey(EncryptionUtil.encodeString(1, pqDev.getDevKey())); importPqDev.setDevKey(EncryptionUtil.encodeString(1, importPqDev.getDevKey()));
} else { } else {
throw new BusinessException(DetectionResponseEnum.SERIES_AND_DEVKEY_NOT_BLANK); throw new BusinessException(DetectionResponseEnum.SERIES_AND_DEVKEY_NOT_BLANK);
} }
} }
DevType devType = devTypeService.getByName(pqDev.getDevType()); DevType devType = devTypeService.getByName(importPqDev.getDevType());
if (ObjectUtil.isNull(devType)) { if (ObjectUtil.isNull(devType)) {
throw new BusinessException(DetectionResponseEnum.DEV_TYPE_NOT_EXIST); throw new BusinessException(DetectionResponseEnum.DEV_TYPE_NOT_EXIST);
} }
@@ -1264,18 +1269,16 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_OUT_OF_RANGE); throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_OUT_OF_RANGE);
} }
pqDev.setDevType(devType.getId()); importPqDev.setDevType(devType.getId());
pqDev.setImportFlag(1); importPqDev.setImportFlag(1);
pqDev.setId(UUID.randomUUID().toString().replaceAll("-", "")); importPqDev.setId(UUID.randomUUID().toString().replaceAll("-", ""));
pqDev.setCreateId(pqDev.getName()); //导入时设备序列号默认与设备名称相同
List<PqMonitor> monitorList = new ArrayList<>(); if (StrUtil.isEmpty(importPqDev.getCreateId())) {
// 与设备名称相同
importPqDev.setCreateId(importPqDev.getName());
}
// 根据num排序 // 根据num排序
pqMonitorExcelList.sort(Comparator.comparingInt(PqMonitorExcel::getNum)); pqMonitorExcelList.sort(Comparator.comparingInt(PqMonitorExcel::getNum));
for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
monitor.setDevId(pqDev.getId());
monitorList.add(monitor);
}
StringBuilder inspectChannelBuilder = new StringBuilder(); StringBuilder inspectChannelBuilder = new StringBuilder();
for (int i = 1; i <= devChns; i++) { for (int i = 1; i <= devChns; i++) {
inspectChannelBuilder.append(i); inspectChannelBuilder.append(i);
@@ -1283,71 +1286,121 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
inspectChannelBuilder.append(","); inspectChannelBuilder.append(",");
} }
} }
pqDev.setInspectChannel(inspectChannelBuilder.toString()); importPqDev.setInspectChannel(inspectChannelBuilder.toString());
oldDevList.add(pqDev); List<PqMonitor> monitorList = new ArrayList<>();
finalMonitorList.addAll(monitorList); // 1、先判断是否有谐波系统ID
} boolean hasHarmSys = false;
//逆向可视化 if (StrUtil.isNotBlank(importPqDev.getHarmSysId())) {
this.reverseVisualizeProvinceDev(oldDevList, patternId); // 1.1、如果有则判断是否已存在
List<PqDev> hasList = this.lambdaQuery()
List<PqDev> newDevList = new ArrayList<>(); .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
oldDevList.forEach(pqDev -> { .eq(PqDev::getPattern, patternId)
PqDevParam param = BeanUtil.copyProperties(pqDev, PqDevParam.class); .eq(PqDev::getHarmSysId, importPqDev.getHarmSysId())
this.checkRepeat(param, false); .isNull(PqDev::getPlanId)
long count = newDevList.stream().filter(dev -> .orderByDesc(PqDev::getCreateTime).list();
dev.getDevType().equals(pqDev.getDevType()) // 1.2、 存在则放入强制更新list
&& dev.getCityName().equals(pqDev.getCityName()) if (CollUtil.isNotEmpty(hasList)) {
&& dev.getGdName().equals(pqDev.getGdName()) importPqDev.setId(hasList.get(0).getId());
&& dev.getSubName().equals(pqDev.getSubName()) for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
&& (dev.getName().equals(pqDev.getName()) || dev.getCreateId().equals(pqDev.getCreateId()))) PqMonitor pqMonitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
.count(); pqMonitor.setDevId(importPqDev.getId());
if (count == 0) { monitorList.add(pqMonitor);
pqDev.setPlanId(planId); }
newDevList.add(pqDev); importPqDev.setMonitorList(monitorList);
} finalUpdateDevList.add(importPqDev);
}); hasHarmSys = true;
QueryWrapper<PqDev> wrapper1 = new QueryWrapper<PqDev>()
.eq("pq_dev.State", DataStateEnum.ENABLE.getCode())
.in("pq_dev.Harm_Sys_Id", newDevList.stream().map(PqDev::getHarmSysId).collect(Collectors.toList()));
List<PqDev> oldDevList1 = this.list(wrapper1);
if (CollUtil.isNotEmpty(oldDevList1)) {
oldDevList1.stream().forEach(oldDev -> {
PqDev newDev = newDevList.stream().filter(dev -> dev.getHarmSysId().equals(oldDev.getHarmSysId())).findFirst().orElse(null);
if (ObjectUtil.isNotNull(newDev)) {
newDevList.remove(newDev);
finalMonitorList.stream()
.filter(monitor -> monitor.getDevId().equals(newDev.getId()))
.forEach(monitor -> monitor.setDevId(oldDev.getId()));
BeanUtil.copyProperties(newDev, oldDev, "id");
} }
});
this.updateBatchById(oldDevList1);
}
this.saveBatch(newDevList);
List<PqDevSub> pqDevSubList = new ArrayList<>();
for (PqDev dev : newDevList) {
PqDevSub pqDevSub = new PqDevSub();
pqDevSub.setDevId(dev.getId());
pqDevSub.setCheckState(CheckStateEnum.UNCHECKED.getValue());
pqDevSub.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
pqDevSub.setReportState(DevReportStateEnum.UNCHECKED.getValue());
pqDevSub.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
pqDevSub.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
pqDevSubList.add(pqDevSub);
}
pqDevSubService.saveBatch(pqDevSubList);
List<String> devIdList = oldDevList1.stream().map(PqDev::getId).collect(Collectors.toList()); }
if (CollUtil.isNotEmpty(devIdList)) { if (!hasHarmSys) {
QueryWrapper<PqMonitor> wrapper = new QueryWrapper<PqMonitor>() // 2、查询 ip + 端口 + 序列号 + patternId + Plan_Id为空 是否存在
.in("pq_monitor.Dev_Id", devIdList); List<PqDev> hasList = this.lambdaQuery()
pqMonitorService.remove(wrapper); .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
.eq(PqDev::getIp, devExcel.getIp())
.eq(PqDev::getPort, devExcel.getPort())
.eq(PqDev::getPattern, patternId)
.eq(PqDev::getCreateId, devExcel.getCreateId())
.isNull(PqDev::getPlanId)
.orderByDesc(PqDev::getCreateTime).list();
// 2.1、存在则放入更新list
if (CollUtil.isNotEmpty(hasList)) {
importPqDev.setId(hasList.get(0).getId());
for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
monitor.setDevId(importPqDev.getId());
monitorList.add(monitor);
}
importPqDev.setMonitorList(monitorList);
updateDevList.add(importPqDev);
} else {
//2.2、不存在则放入新增list
for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
monitor.setDevId(importPqDev.getId());
monitorList.add(monitor);
}
importPqDev.setMonitorList(monitorList);
newDevList.add(importPqDev);
}
}
} }
pqMonitorService.reverseVisualizeMonitor(finalMonitorList); // 3、是否有重复的设备
pqMonitorService.saveBatch(finalMonitorList); if (CollUtil.isNotEmpty(updateDevList)) {
return true; // 3.1、有则让用户确认是否覆盖
if (cover == 0) {
List<String> existDevList = new ArrayList<>();
updateDevList.forEach(pqDev -> {
existDevList.add(pqDev.getName() + "(" + pqDev.getIp() + ":" + pqDev.getPort() + ")");
});
return HttpResultUtil.assembleResult(DetectionResponseEnum.DEV_IP_PORT_EXIST.getCode(), existDevList, "请确认是否覆盖");
} else {
// 3.2、确认覆盖则放入强制更新list
finalUpdateDevList.addAll(updateDevList);
}
}
// 4、新增list
if (CollUtil.isNotEmpty(newDevList)) {
//逆向可视化
this.reverseVisualizeProvinceDev(newDevList, patternId);
this.saveBatch(newDevList);
List<PqDevSub> pqDevSubList = new ArrayList<>();
List<PqMonitor> newMonitorList = new ArrayList<>();
for (PqDev dev : newDevList) {
PqDevSub pqDevSub = new PqDevSub();
pqDevSub.setDevId(dev.getId());
pqDevSub.setCheckState(CheckStateEnum.UNCHECKED.getValue());
pqDevSub.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
pqDevSub.setReportState(DevReportStateEnum.UNCHECKED.getValue());
pqDevSub.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
pqDevSub.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
pqDevSubList.add(pqDevSub);
newMonitorList.addAll(dev.getMonitorList());
}
pqMonitorService.reverseVisualizeMonitor(newMonitorList);
pqMonitorService.saveBatch(newMonitorList);
pqDevSubService.saveBatch(pqDevSubList);
}
// 5、更新list
if (CollUtil.isNotEmpty(finalUpdateDevList)) {
//逆向可视化
this.reverseVisualizeProvinceDev(finalUpdateDevList, patternId);
this.updateBatchById(finalUpdateDevList);
List<PqMonitor> updateMonitorList = new ArrayList<>();
for (PqDev dev : finalUpdateDevList) {
updateMonitorList.addAll(dev.getMonitorList());
}
pqMonitorService.reverseVisualizeMonitor(updateMonitorList);
for (PqMonitor monitor : updateMonitorList) {
pqMonitorService.update(monitor, new LambdaUpdateWrapper<PqMonitor>().eq(PqMonitor::getDevId, monitor.getDevId()));
}
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "导入成功");
} }
return false; return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
} }
@Override @Override

5
detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java
View File

@@ -73,8 +73,9 @@ public enum DetectionResponseEnum {
MONITOR_NUM_REPEAT("A02094", "该被检设备下存在相同线路号的监测点"), MONITOR_NUM_REPEAT("A02094", "该被检设备下存在相同线路号的监测点"),
PLAN_HAS_CHILDREN("A02095", "该计划下存在子计划，请先删除子计划"), PLAN_HAS_CHILDREN("A02095", "该计划下存在子计划，请先删除子计划"),
PLAN_REPEATED_IN_SAME_LEVEL("A02096", "该父计划下存在同名的子计划"), PLAN_REPEATED_IN_SAME_LEVEL("A02096", "该父计划下存在同名的子计划"),
PLEASE_UNASSIGN_STANDARD_DEV("A02097","存在已分配给子计划的标准设备，请先解除分配" ), PLEASE_UNASSIGN_STANDARD_DEV("A02097", "存在已分配给子计划的标准设备，请先解除分配"),
PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配"); PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配"),
DEV_IP_PORT_EXIST("A02099", "存在重复被检设备");
private final String code; private final String code;