Commit 42833488 by zzrdark

1.修改渠道号统计模块Bug

parent 8e3ae77f
spring: spring:
profiles: profiles:
active: prod active: dev
application: application:
name: cneeds-server-authorization name: cneeds-server-authorization
server: server:
......
spring: spring:
profiles: profiles:
active: prod active: dev
application: application:
name: cneeds-server-datashow name: cneeds-server-datashow
server: server:
......
...@@ -182,9 +182,13 @@ public class DeviceChannelController { ...@@ -182,9 +182,13 @@ public class DeviceChannelController {
deviceInfoChannelEntities = deviceInfoChannelService.queryDeviceInfoChannelByChannelIds(channelIds); deviceInfoChannelEntities = deviceInfoChannelService.queryDeviceInfoChannelByChannelIds(channelIds);
} }
if (deviceInfoChannelEntities == null || deviceInfoChannelEntities.size() == 0){
return new LinkedList<>();
}
Set<Long> deviceIds = new HashSet<>(); Set<Long> deviceIds = new HashSet<>();
Map<Long,List<Long>> deviceIdChannelMap = new HashMap<Long,List<Long>>(); Map<Long,List<Long>> deviceIdChannelMap = new HashMap<Long,List<Long>>();
deviceInfoChannelEntities.forEach(deviceInfoChannel -> { deviceInfoChannelEntities.forEach(deviceInfoChannel -> {
deviceIds.add(deviceInfoChannel.getDeviceId()); deviceIds.add(deviceInfoChannel.getDeviceId());
if (deviceIdChannelMap.get(deviceInfoChannel.getChannelId()) == null) { if (deviceIdChannelMap.get(deviceInfoChannel.getChannelId()) == null) {
deviceIdChannelMap.put(deviceInfoChannel.getChannelId(),new ArrayList<Long>()); deviceIdChannelMap.put(deviceInfoChannel.getChannelId(),new ArrayList<Long>());
......
spring: spring:
profiles: profiles:
active: prod active: dev
application: application:
name: cneeds-server-device name: cneeds-server-device
......
spring: spring:
profiles: profiles:
active: prod active: dev
application: application:
name: cneeds-server-logupload name: cneeds-server-logupload
......
spring: spring:
profiles: profiles:
active: prod active: dev
application: application:
name: cneeds-server-user name: cneeds-server-user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment