Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
90101303
Commit
90101303
authored
Nov 01, 2022
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
e017e1ca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
ConfigureController.java
...m/yeejoin/equipmanage/controller/ConfigureController.java
+10
-2
application-dev.properties
...ystem-equip/src/main/resources/application-dev.properties
+1
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java
View file @
90101303
...
...
@@ -191,8 +191,10 @@ public class ConfigureController extends AbstractBaseController {
records
.
forEach
(
item
->
{
String
prefix
=
null
;
String
suffix
=
null
;
String
iotCode
=
item
.
get
(
"iot_code"
).
toString
();
if
(
iotCode
.
length
()
>
8
)
{
String
iotCode
=
null
;
if
(!
ObjectUtils
.
isEmpty
(
item
.
get
(
"iot_code"
)))
{
iotCode
=
item
.
get
(
"iot_code"
).
toString
();
if
(
iotCode
.
length
()
>
8
)
{
prefix
=
iotCode
.
substring
(
0
,
8
);
suffix
=
iotCode
.
substring
(
8
);
}
else
{
...
...
@@ -223,7 +225,13 @@ public class ConfigureController extends AbstractBaseController {
e
.
printStackTrace
();
}
}
}
else
{
item
.
put
(
"carState"
,
"无"
);
item
.
put
(
"count"
,
0
);
item
.
put
(
"carStateDate"
,
"--"
);
}
});
}
return
CommonResponseUtil
.
success
(
fireCarInfoByWL
);
}
...
...
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @
90101303
...
...
@@ -81,7 +81,7 @@ dcs.url.sendalarm=http://198.87.103.158:8001/alarm-service/appalarm/sendalarm
param.system.online.date
=
2019-02-12
# 视频转码服务开关 hls(关)/flv(开),默认关闭,数字换流站使用时开启
window.vedioFormat
=
hls
window.vedioFormat
=
flv
window.vedioFormat.video
=
flv
# 航天视频服务地址
param.htvideo.url
=
http://192.168.4.174:9001;
...
...
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