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
367f0119
Commit
367f0119
authored
May 27, 2020
by
zzrdark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.fix 系列号修改不成功
parent
574e7177
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
application.yml
cneeds-server-datashow/src/main/resources/application.yml
+1
-1
DeviceInfoController.java
...com/mx/cneeds/server/device/web/DeviceInfoController.java
+1
-1
application.yml
cneeds-server-device/src/main/resources/application.yml
+1
-1
No files found.
cneeds-server-datashow/src/main/resources/application.yml
View file @
367f0119
spring
:
spring
:
profiles
:
profiles
:
active
:
prod
active
:
dev
application
:
application
:
name
:
cneeds-server-datashow
name
:
cneeds-server-datashow
server
:
server
:
...
...
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java
View file @
367f0119
...
@@ -215,7 +215,7 @@ public class DeviceInfoController {
...
@@ -215,7 +215,7 @@ public class DeviceInfoController {
if
(
devicesDto
.
getImeis
()
!=
null
&&
devicesDto
.
getImeis
().
size
()
!=
0
)
{
if
(
devicesDto
.
getImeis
()
!=
null
&&
devicesDto
.
getImeis
().
size
()
!=
0
)
{
devicesDto
.
getImeis
().
forEach
(
str
->
{
devicesDto
.
getImeis
().
forEach
(
str
->
{
DeviceInfoEntity
queryDeviceByImei
=
deviceInfoService
.
queryDeviceByImei
(
str
);
DeviceInfoEntity
queryDeviceByImei
=
deviceInfoService
.
queryDeviceByImei
(
str
);
if
(
queryDeviceByImei
=
=
null
){
if
(
queryDeviceByImei
!
=
null
){
DeviceInfoEntity
deviceInfoEntity
=
new
DeviceInfoEntity
();
DeviceInfoEntity
deviceInfoEntity
=
new
DeviceInfoEntity
();
deviceInfoEntity
.
setImei
(
str
);
deviceInfoEntity
.
setImei
(
str
);
deviceInfoEntity
.
setSeriesId
(
devicesDto
.
getSeriesId
());
deviceInfoEntity
.
setSeriesId
(
devicesDto
.
getSeriesId
());
...
...
cneeds-server-device/src/main/resources/application.yml
View file @
367f0119
spring
:
spring
:
profiles
:
profiles
:
active
:
prod
active
:
dev
application
:
application
:
name
:
cneeds-server-device
name
:
cneeds-server-device
...
...
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