Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

台账导入微调，取消母线的线路号排重

Browse Source
This commit is contained in:
hongawen
2024-05-27 10:08:08 +08:00
parent 3f7a5da207
commit 2d88fb2e23
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
View File

@@ -122,7 +122,7 @@ public class LineIntegrityDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/lineDataQuality") @PostMapping("/lineDataQuality")
@ApiOperation("获取监测点的在线率和数据完成性") @ApiOperation("获取监测点的在线率和数据完成性")
@ApiImplicitParam(name = "lineIds", value = "参数实体", required = true) @ApiImplicitParam(name = "lineDataQualityParam", value = "参数实体", required = true)
public HttpResult<List<LineDataQualityDTO>> getLineDataQuality(@RequestBody LineDataQualityParam lineDataQualityParam) { public HttpResult<List<LineDataQualityDTO>> getLineDataQuality(@RequestBody LineDataQualityParam lineDataQualityParam) {
String methodDescribe = getMethodDescribe("getLineDataQuality"); String methodDescribe = getMethodDescribe("getLineDataQuality");
List<LineDataQualityDTO> result = irStatIntegrityDService.getLineDataQuality(lineDataQualityParam); List<LineDataQualityDTO> result = irStatIntegrityDService.getLineDataQuality(lineDataQualityParam);

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
View File

@@ -2011,18 +2011,18 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(temp)) { if (Objects.isNull(temp)) {
temp = assembleLine(subvName, LineBaseEnum.SUB_V_LEVEL.getCode(), pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), pids); temp = assembleLine(subvName, LineBaseEnum.SUB_V_LEVEL.getCode(), pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), pids);
this.baseMapper.insert(temp); this.baseMapper.insert(temp);
//判断线路号 //判断线路号，不判断母线号了
Integer subvNum = oracleTerminalExcel.getSubvNum(); Integer subvNum = oracleTerminalExcel.getSubvNum();
List<Voltage> voltages = voltageMapper.getVoltageByNum(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(subvNum).collect(Collectors.toList())); // List<Voltage> voltages = voltageMapper.getVoltageByNum(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(subvNum).collect(Collectors.toList()));
if (CollectionUtil.isNotEmpty(voltages)) { // if (CollectionUtil.isNotEmpty(voltages)) {
Voltage voltage = voltages.get(0); // Voltage voltage = voltages.get(0);
if (!voltage.getId().equalsIgnoreCase(temp.getId())) { // if (!voltage.getId().equalsIgnoreCase(temp.getId())) {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "母线线路号：" + subvNum + "已存在")); // oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "母线线路号：" + subvNum + "已存在"));
//删除刚刚新增母线信息 // //删除刚刚新增母线信息
this.baseMapper.deleteById(temp.getId()); // this.baseMapper.deleteById(temp.getId());
continue; // continue;
} // }
} // }
Voltage voltage = new Voltage(); Voltage voltage = new Voltage();
voltage.setNum(subvNum); voltage.setNum(subvNum);
voltage.setId(temp.getId()); voltage.setId(temp.getId());
@@ -2049,7 +2049,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
String lineName = oracleTerminalExcel.getLineName(); String lineName = oracleTerminalExcel.getLineName();
temp = queryLine(lineLambdaQueryWrapper, lineName, pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), LineBaseEnum.LINE_LEVEL.getCode(), DataStateEnum.ENABLE.getCode()); temp = queryLine(lineLambdaQueryWrapper, lineName, pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), LineBaseEnum.LINE_LEVEL.getCode(), DataStateEnum.ENABLE.getCode());
if (Objects.nonNull(temp)) { if (Objects.nonNull(temp)) {
oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点名称重复，请联系管理员")); // oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点名称重复，请联系管理员"));
} else { } else {
//判断是否因为改了终端名称导致没有查到数据 //判断是否因为改了终端名称导致没有查到数据
LambdaQueryWrapper<LineBak> lineBakLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LineBak> lineBakLambdaQueryWrapper = new LambdaQueryWrapper<>();