From 100e952066f126467e128a672fb6a7fc3cf367c3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 08 Nov 2021 11:29:18 +0800
Subject: [PATCH] update

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 8d26374..0691274 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -12,6 +12,7 @@
 import com.moral.api.service.DeviceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.moral.api.service.OrganizationService;
 import com.moral.api.service.SysDictDataService;
 import com.moral.api.util.CacheUtils;
 import com.moral.api.util.AdjustDataUtils;
@@ -39,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -75,8 +77,6 @@
     @Autowired
     private SysDictDataService sysDictDataService;
 
-    @Autowired
-    private LogUtils logUtils;
 
     @Autowired
     private RedisTemplate redisTemplate;
@@ -92,6 +92,9 @@
 
     @Autowired
     private AdjustDataUtils adjustDataUtils;
+
+    @Autowired
+    private OrganizationService organizationService;
 
     /*
      * ���redis������������������
@@ -135,7 +138,7 @@
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
         content.append("������������������").append(device.getName()).append(":").append("mac���").append(mac);
-        logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
     }
 
     @Override
@@ -158,7 +161,7 @@
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         StringBuilder content = new StringBuilder();
         content.append("������������������").append(device.getName()).append(";").append("mac���").append(mac);
-        logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
     }
 
     @Override
@@ -218,7 +221,7 @@
             }
 
         }
-        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
     }
 
     @Override
@@ -242,8 +245,14 @@
 
     @Override
     public List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId) {
+        //���������������������
+        List<Organization> organizations = organizationService.getAllChildrenOrganization(orgId);
+        List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+        orgIds.add(orgId);
         QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("id", "name").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
+        queryWrapper.select("id", "name")
+                .eq("is_delete", Constants.NOT_DELETE)
+                .in("organization_id", orgIds);
         return monitorPointMapper.selectMaps(queryWrapper);
     }
 
@@ -269,9 +278,13 @@
         Object orgId = parameters.get("organizationId");
         Object mpId = parameters.get("monitorPointId");
 
-        //������������������������������
+        //������������������������������,���������������
         if (orgId != null) {
-            queryWrapper.eq("organization_id", orgId);
+            //���������������������
+            List<Organization> organizations = organizationService.getAllChildrenOrganization(Integer.parseInt(orgId.toString()));
+            List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
+            orgIds.add(Integer.parseInt(orgId.toString()));
+            queryWrapper.in("organization_id", orgIds);
         }
 
         //������������������������������
@@ -279,14 +292,9 @@
             queryWrapper.eq("monitor_point_id", mpId);
         }
 
-        //���������������������
-        if (name != null) {
-            queryWrapper.like("name", name);
-        }
-
-        //mac������������
-        if (mac != null) {
-            queryWrapper.like("mac", mac);
+        //���������������mac������������
+        if (name != null && mac != null) {
+            queryWrapper.like("name", name).or().like("mac", mac);
         }
 
         //������������,������create_time������
@@ -445,7 +453,7 @@
             Map<String, Object> govMpInfo = (Map<String, Object>) deviceInfo.get("govMonitorPoint");
             Map<String, Object> aqiMap = null;
             if (govMpInfo.get("guid") != null) {
-               aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
+                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
             }
             return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
         }

--
Gitblit v1.8.0