Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cneeds-server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangzr
cneeds-server
Commits
42833488
Commit
42833488
authored
Jun 12, 2020
by
zzrdark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改渠道号统计模块Bug
parent
8e3ae77f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
6 deletions
+10
-6
application.yml
...s-server-authorization/src/main/resources/application.yml
+1
-1
application.yml
cneeds-server-datashow/src/main/resources/application.yml
+1
-1
DeviceChannelController.java
.../mx/cneeds/server/device/web/DeviceChannelController.java
+5
-1
application.yml
cneeds-server-device/src/main/resources/application.yml
+1
-1
application.yml
cneeds-server-logupload/src/main/resources/application.yml
+1
-1
application.yml
cneeds-server-user/src/main/resources/application.yml
+1
-1
No files found.
cneeds-server-authorization/src/main/resources/application.yml
View file @
42833488
spring
:
profiles
:
active
:
prod
active
:
dev
application
:
name
:
cneeds-server-authorization
server
:
...
...
cneeds-server-datashow/src/main/resources/application.yml
View file @
42833488
spring
:
profiles
:
active
:
prod
active
:
dev
application
:
name
:
cneeds-server-datashow
server
:
...
...
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java
View file @
42833488
...
...
@@ -182,9 +182,13 @@ public class DeviceChannelController {
deviceInfoChannelEntities
=
deviceInfoChannelService
.
queryDeviceInfoChannelByChannelIds
(
channelIds
);
}
if
(
deviceInfoChannelEntities
==
null
||
deviceInfoChannelEntities
.
size
()
==
0
){
return
new
LinkedList
<>();
}
Set
<
Long
>
deviceIds
=
new
HashSet
<>();
Map
<
Long
,
List
<
Long
>>
deviceIdChannelMap
=
new
HashMap
<
Long
,
List
<
Long
>>();
deviceInfoChannelEntities
.
forEach
(
deviceInfoChannel
->
{
deviceInfoChannelEntities
.
forEach
(
deviceInfoChannel
->
{
deviceIds
.
add
(
deviceInfoChannel
.
getDeviceId
());
if
(
deviceIdChannelMap
.
get
(
deviceInfoChannel
.
getChannelId
())
==
null
)
{
deviceIdChannelMap
.
put
(
deviceInfoChannel
.
getChannelId
(),
new
ArrayList
<
Long
>());
...
...
cneeds-server-device/src/main/resources/application.yml
View file @
42833488
spring
:
profiles
:
active
:
prod
active
:
dev
application
:
name
:
cneeds-server-device
...
...
cneeds-server-logupload/src/main/resources/application.yml
View file @
42833488
spring
:
profiles
:
active
:
prod
active
:
dev
application
:
name
:
cneeds-server-logupload
...
...
cneeds-server-user/src/main/resources/application.yml
View file @
42833488
spring
:
profiles
:
active
:
prod
active
:
dev
application
:
name
:
cneeds-server-user
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment