From 0a86b2f05a7324887dd5c9eeb8cbb20d823bd159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Mon, 24 Jul 2023 19:19:19 +0800
Subject: [PATCH] =?UTF-8?q?pms=E5=8F=B0=E8=B4=A6=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/IDistributionMonitorService.java     | 11 ++++++++++-
 .../impl/PowerDistributionareaServiceImpl.java        |  6 +++++-
 .../main/java/com/njcn/system/enums/DicDataEnum.java  |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java
index 5417fab9d..9d9c81c90 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IDistributionMonitorService.java
@@ -1,6 +1,7 @@
 package com.njcn.device.pms.service.majornetwork;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.jeffreyning.mybatisplus.service.IMppService;
 import com.njcn.device.pms.pojo.dto.PmsDistributionMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
 import com.njcn.device.pms.pojo.dto.PwPmsMonitorDTO;
@@ -21,7 +22,7 @@ import java.util.List;
  * @author hongawen
  * @since 2022-10-14
  */
-public interface IDistributionMonitorService extends IService<DistributionMonitor> {
+public interface IDistributionMonitorService extends IMppService<DistributionMonitor> {
 
 
     /**
@@ -99,4 +100,12 @@ public interface IDistributionMonitorService extends IService<DistributionMonito
 
     List<PwPmsMonitorDTO> pwMonitorAreaDetailInfo(List<String> monitorIds);
 
+
+    /**
+     * 批量同步台区到配网表
+     * @author cdf
+     * @date 2023/7/24
+     */
+    Boolean batchOpDistributionArea();
+
 }
diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
index a414d99ec..35931350e 100644
--- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
+++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PowerDistributionareaServiceImpl.java
@@ -86,8 +86,12 @@ public class PowerDistributionareaServiceImpl extends ServiceImpl<PowerDistribut
         if(StrUtil.isNotBlank(powerDistributionareaParam.getLineId())){
             lambdaQueryWrapper.eq(PowerDistributionarea::getLineId,powerDistributionareaParam.getLineId());
         }
+        if(StrUtil.isNotBlank(powerDistributionareaParam.getName())){
+            lambdaQueryWrapper.like(PowerDistributionarea::getName,powerDistributionareaParam.getName())
+            .or().like(PowerDistributionarea::getOrgName,powerDistributionareaParam.getName());
+        }
 
-        lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName,PowerDistributionarea::getPowerStationId)
+        lambdaQueryWrapper.select(PowerDistributionarea::getId,PowerDistributionarea::getName,PowerDistributionarea::getOrgId,PowerDistributionarea::getOrgName,PowerDistributionarea::getPowerStationId).last(" limit 1000")
        ;
 
         lambdaQueryWrapper.orderByDesc(PowerDistributionarea::getCreateTime);
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
index 9a3969716..00b322d4f 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java
@@ -48,9 +48,9 @@ public enum DicDataEnum {
     /**
      * 监测点类别
      */
-    ONE_LINE("I类监测点", "One_Line"),
-    TWO_LINE("II类监测点", "Two_Line"),
-    THREE_LINE("III类监测点", "Three_Line"),
+    ONE_LINE("Ⅰ类监测点", "One_Line"),
+    TWO_LINE("Ⅱ类监测点", "Two_Line"),
+    THREE_LINE("Ⅲ类监测点", "Three_Line"),
 
 
     /**