From a35ee521b6cc5d125093e0cae4842472751bcaa6 Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 13 Aug 2025 11:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=9A=82=E9=99=8D=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/param/LargeScreenCountParam.java     |  2 ++
 .../impl/LargeScreenCountServiceImpl.java     | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java
index b3659716..ed79d870 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java
@@ -46,4 +46,6 @@ public class LargeScreenCountParam extends BaseParam {
     private List<String> eventIds;
 
     private Integer gdIndex;
+
+    private String devName;
 }
diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
index f4371bfb..b0e49da9 100644
--- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
+++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
@@ -1190,8 +1190,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         if(StrUtil.isNotBlank(largeScreenCountParam.getState())){
             lambdaQueryWrapper.eq(PqDevice::getStatus,Integer.valueOf(largeScreenCountParam.getState()));
         }
-        if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){
-            lambdaQueryWrapper.eq(StrUtil.isNotEmpty(largeScreenCountParam.getSearchValue()),PqDevice::getName,largeScreenCountParam.getSearchValue());
+        if(StrUtil.isNotBlank(largeScreenCountParam.getDevName())){
+            lambdaQueryWrapper.like(StrUtil.isNotEmpty(largeScreenCountParam.getDevName()),PqDevice::getName,largeScreenCountParam.getDevName());
         }
         lambdaQueryWrapper.in(PqDevice::getDevIndex, devIndexs);
 
@@ -1199,24 +1199,20 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
 
         log.info("完成设备查询sql："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s");
         List<Integer> runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList());
-
-
+        if(CollUtil.isEmpty(runDevList)){
+            return new Page<>();
+        }
 
         List<PqsDicData> pqsDicDataList = pqsDicDataMapper.selectList(new LambdaQueryWrapper<PqsDicData>().eq(PqsDicData::getDicType,"cbb2de8a-87da-4ae9-a35c-aaab999c7bc7"));
         Map<String,PqsDicData> pqsDicDataMap = pqsDicDataList.stream().collect(Collectors.toMap(PqsDicData::getDicIndex,Function.identity()));
 
-        List<Long> gdList = new ArrayList<>();
         List<Integer> bdList = new ArrayList<>();
         if(StrUtil.isNotBlank(largeScreenCountParam.getSearchValue())){
-           List<PqGdCompany> pqGdCompanyList = pqGdCompanyMapper.selectList(new LambdaQueryWrapper<PqGdCompany>().like(PqGdCompany::getName,largeScreenCountParam.getSearchValue()));
-            gdList = pqGdCompanyList.stream().map(PqGdCompany::getGdIndex).collect(Collectors.toList());
            List<PqSubstation> substationList = pqSubstationMapper.selectList(new LambdaQueryWrapper<PqSubstation>().like(PqSubstation::getName,largeScreenCountParam.getSearchValue()));
-            bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList());
+           bdList = substationList.stream().map(PqSubstation::getSubIndex).collect(Collectors.toList());
         }
-        if(CollUtil.isNotEmpty(runDevList)||CollUtil.isNotEmpty(gdList)||CollUtil.isNotEmpty(bdList)){
-            return new Page<>();
-        }
-       Page<PqDevice> page = pqDeviceService.lambdaQuery().in(PqDevice::getGdIndex,gdList).in(PqDevice::getSubIndex,bdList)
+
+       Page<PqDevice> page = pqDeviceService.lambdaQuery().in(CollUtil.isNotEmpty(bdList),PqDevice::getSubIndex,bdList)
                         .in(PqDevice::getDevIndex,runDevList).page(new Page<>(PageFactory.getPageNum(largeScreenCountParam),PageFactory.getPageSize(largeScreenCountParam)));
         log.info("完成设备部门查询："+timeInterval.intervalMs()+"ms; "+timeInterval.intervalSecond()+"s");
        // pqsEventdetailPage =  pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList);
@@ -1293,7 +1289,9 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
                 dto.setLogonTime(pqDevice.getLogontime());
                 dto.setDeptName(pqLineMap.get(pqDevice.getDevIndex()).get(0).getDeptName());
 
-                dto.setManufacturerName(pqsDicDataMap.get(pqDeviceDetail.getManufacturer()).getDicName());
+                if(pqsDicDataMap.containsKey(pqDeviceDetail.getManufacturer())){
+                    dto.setManufacturerName(pqsDicDataMap.get(pqDeviceDetail.getManufacturer()).getDicName());
+                }
                 result.add(dto);
 
             }