设备首页根据区域分组

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -769,15 +769,15 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfo> deviceInfoList = this.list(lqw);
         //未分配线路的设置默认值
         deviceInfoList.stream().filter(s -> s.getPlaceLineId() == null).forEach(s -> s.setPlaceLineId(-1L));
-        //根据线路id分组
-        Map<Long, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfo::getPlaceLineId));
+        //根据区域id分组
+        Map<Long, List<DeviceInfo>> deviceMap = deviceInfoList.stream().collect(Collectors.groupingBy(DeviceInfo::getDistrictId));
         for (DeviceInfoDto.MercHomeCountVO v : list) {
             DeviceInfoDto.MercHomeListVO vo = new DeviceInfoDto.MercHomeListVO();
-            Long placeLineId = v.getPlaceLineId();
+            Long districtId = v.getDistrictId();
             vo.setDeviceNum(v.getDeviceNum());
-            vo.setPlaceLineId(v.getPlaceLineId());
-            //线路下的设备列表
-            List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(placeLineId), DeviceInfoDto.MercHomeDeviceVo.class);
+            vo.setDistrictId(v.getDistrictId());
+            //区域下的设备列表
+            List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = BeanUtil.copyToList(deviceMap.get(districtId), DeviceInfoDto.MercHomeDeviceVo.class);
             if (CollUtil.isEmpty(deviceInfos)) {
                 continue;
             }

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -304,7 +304,7 @@
 
     <!--  小程序首页设备列表线路分组  -->
     <select id="merHomeCountList" resultType="com.xy.dto.DeviceInfoDto$MercHomeCountVO">
-        select count(*) deviceNum, IFNULL(place_line_id, -1) placeLineId
+        select count(*) deviceNum, IFNULL(district_id, -1) districtId
         from device_info
 
         <where>
@@ -333,7 +333,7 @@
                 </foreach>
             </if>
         </where>
-        group by place_line_id
+        group by district_id
     </select>
     <select id="netStateCount" resultType="com.xy.dto.DeviceInfoDto$NetStateCount">
         SELECT d.merc_id,net_state, count(*) as count

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -683,11 +683,11 @@ public class DeviceInfoDto {
     @Data
     @Accessors(chain = true)
     public static class MercHomeListVO {
-        @ApiModelProperty(value = "线路名称")
-        private String placeLineName;
+        @ApiModelProperty(value = "区域名称")
+        private String districtName;
 
-        @ApiModelProperty(value = "线路ID")
-        private Long placeLineId;
+        @ApiModelProperty(value = "区域ID")
+        private Long districtId;
 
         @ApiModelProperty(value = "设备数")
         private Integer deviceNum;
@@ -702,8 +702,8 @@ public class DeviceInfoDto {
     public static class MercHomeCountVO {
 
 
-        @ApiModelProperty(value = "线路ID")
-        private Long placeLineId;
+        @ApiModelProperty(value = "区域ID")
+        private Long districtId;
 
         @ApiModelProperty(value = "设备数")
         private Integer deviceNum;