1 燃气用户列表 大屏地图 labelsLayer 标注的方式 分页查询 居民用户

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java

@@ -137,6 +137,18 @@ public class TDetectorUserController extends BaseController
     }
 
 
+    /**
+     * 获取探测器用户列表 大屏地图 labelsLayer 标注的方式 分页查询 居民用户
+     * @param tDetectorUser t
+     * @return r
+     */
+    @GetMapping("/pageQueryLabelsLayerMarksDUser")
+    public TableDataInfo pageQueryLabelsLayerMarksDUser(TDetectorUser tDetectorUser) {
+        startPage();
+        List<Map<String, Object>> maps = tDetectorUserService.pageQueryLabelsLayerMarksDUser(tDetectorUser);
+        return getDataTable(maps);
+    }
+
     /**
      * 获取探测器用户列表 大屏地图 labelsLayer 标注的方式
      * @return ajaxResult

zh-baseversion-system/src/main/java/com/zehong/system/service/ITDetectorUserService.java

@@ -48,6 +48,14 @@ public interface ITDetectorUserService
      */
     Map<Object,List<Map<String,Object>>> labelsLayerMarksDUserVillageSafDevInfoMap(TDetectorUser tDetectorUser);
 
+
+    /**
+     * 获取探测器用户列表 大屏地图 labelsLayer 标注的方式 分页查询 居民用户
+     * @param tDetectorUser t
+     * @return r
+     */
+    List<Map<String,Object>> pageQueryLabelsLayerMarksDUser(TDetectorUser tDetectorUser);
+
     /**
      * 查询探测器用户列表
      *

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java

@@ -162,6 +162,32 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
     }
 
 
+    /**
+     * 获取探测器用户列表 大屏地图 labelsLayer 标注的方式 分页查询 居民用户
+     * @param tDetectorUser t
+     * @return r
+     */
+    @Override
+    public List<Map<String, Object>> pageQueryLabelsLayerMarksDUser(TDetectorUser tDetectorUser) {
+
+        if (tDetectorUser.getVillageId() == null) {
+            return  new ArrayList<>();
+        }
+
+        List<TDetectorUserVillageSafetyDeviceInfoVo> tDetectorUserVillageSafetyDeviceInfoVos = tDetectorUserMapper.queryDuserVilSafDevInfo(tDetectorUser);
+
+        List<Map<String, Object>> maps = residentsUserInit(tDetectorUserVillageSafetyDeviceInfoVos);
+
+        if (maps.size() > 0) {
+            Object userMapList = maps.get(0).get("userMapList");
+            if (userMapList != null) {
+                return (List<Map<String, Object>>) userMapList;
+            }
+        }
+
+        return new ArrayList<>();
+    }
+
     /**
      * 查询探测器用户列表 地图使用 labelsLayerMarks 标注的方式
      * @param tDetectorUser tDetectorUser
@@ -353,6 +379,7 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
 
                         // 过滤掉 没有 安全装置的
                         List<TDetectorUserVillageSafetyDeviceInfoVo> collect4 = userList.stream().filter(item -> item.getGasUserSafetyDeviceId() != null).collect(Collectors.toList());
+
                         // 按照 安全装置 分组
                         Map<Long, List<TDetectorUserVillageSafetyDeviceInfoVo>> collect3 = collect4.stream().collect(Collectors.groupingBy(TDetectorUserVillageSafetyDeviceInfoVo::getGasUserSafetyDeviceId));
 

zh-baseversion-system/src/main/resources/mapper/system/TDetectorUserMapper.xml

@@ -322,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN t_county_level_region region ON region.f_id = userVillage.f_region
         <where> (safetyDeviceInfo.is_del = '0' or safetyDeviceInfo.is_del is null)
             <if test="userId != null  and userId != ''"> and dUser.user_id = #{userId}</if>
+            <if test="villageId != null  and villageId != ''"> and dUser.f_village_id = #{villageId}</if>
         </where>
 
     </select>