From 2d88fb2e23151892afb3974131b008089ee96d2c Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 27 May 2024 10:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83=EF=BC=8C=E5=8F=96=E6=B6=88=E6=AF=8D=E7=BA=BF=E7=9A=84?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=8F=B7=E6=8E=92=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LineIntegrityDataController.java          |  2 +-
 .../service/impl/TerminalBaseServiceImpl.java | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
index 47b4712d1..b69c8ca62 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LineIntegrityDataController.java
@@ -122,7 +122,7 @@ public class LineIntegrityDataController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/lineDataQuality")
     @ApiOperation("获取监测点的在线率和数据完成性")
-    @ApiImplicitParam(name = "lineIds", value = "参数实体", required = true)
+    @ApiImplicitParam(name = "lineDataQualityParam", value = "参数实体", required = true)
     public HttpResult<List<LineDataQualityDTO>> getLineDataQuality(@RequestBody LineDataQualityParam lineDataQualityParam) {
         String methodDescribe = getMethodDescribe("getLineDataQuality");
         List<LineDataQualityDTO> result = irStatIntegrityDService.getLineDataQuality(lineDataQualityParam);
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index 0fdad6a9a..d0d7c1d81 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -2011,18 +2011,18 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 if (Objects.isNull(temp)) {
                     temp = assembleLine(subvName, LineBaseEnum.SUB_V_LEVEL.getCode(), pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), pids);
                     this.baseMapper.insert(temp);
-                    //判断线路号
+                    //判断线路号，不判断母线号了
                     Integer subvNum = oracleTerminalExcel.getSubvNum();
-                    List<Voltage> voltages = voltageMapper.getVoltageByNum(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(subvNum).collect(Collectors.toList()));
-                    if (CollectionUtil.isNotEmpty(voltages)) {
-                        Voltage voltage = voltages.get(0);
-                        if (!voltage.getId().equalsIgnoreCase(temp.getId())) {
-                            oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "母线线路号：" + subvNum + "已存在"));
-                            //删除刚刚新增母线信息
-                            this.baseMapper.deleteById(temp.getId());
-                            continue;
-                        }
-                    }
+//                    List<Voltage> voltages = voltageMapper.getVoltageByNum(pids.get(LineBaseEnum.DEVICE_LEVEL.getCode()), Stream.of(subvNum).collect(Collectors.toList()));
+//                    if (CollectionUtil.isNotEmpty(voltages)) {
+//                        Voltage voltage = voltages.get(0);
+//                        if (!voltage.getId().equalsIgnoreCase(temp.getId())) {
+//                            oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "母线线路号：" + subvNum + "已存在"));
+//                            //删除刚刚新增母线信息
+//                            this.baseMapper.deleteById(temp.getId());
+//                            continue;
+//                        }
+//                    }
                     Voltage voltage = new Voltage();
                     voltage.setNum(subvNum);
                     voltage.setId(temp.getId());
@@ -2049,7 +2049,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 String lineName = oracleTerminalExcel.getLineName();
                 temp = queryLine(lineLambdaQueryWrapper, lineName, pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), LineBaseEnum.LINE_LEVEL.getCode(), DataStateEnum.ENABLE.getCode());
                 if (Objects.nonNull(temp)) {
-                    oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点名称重复，请联系管理员"));
+//                    oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "监测点名称重复，请联系管理员"));
                 } else {
                     //判断是否因为改了终端名称导致没有查到数据
                     LambdaQueryWrapper<LineBak> lineBakLambdaQueryWrapper = new LambdaQueryWrapper<>();