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
3b96edd7
Commit
3b96edd7
authored
Feb 21, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.消防字体编辑数据同步报错
parent
8532719e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
CarController.java
...ava/com/yeejoin/equipmanage/controller/CarController.java
+1
-2
FireFightingSystemController.java
.../equipmanage/controller/FireFightingSystemController.java
+1
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/CarController.java
View file @
3b96edd7
...
...
@@ -1124,7 +1124,7 @@ public class CarController extends AbstractBaseController {
+
"/iot/v1/livedata/list?timeStart="
+
timeStart
+
"&timeEnd="
+
timeEnd
+
"&productKey="
+
prefix
+
"&deviceName="
+
suffix
,
HttpMethod
.
GET
,
httpEntity
,
FeignClientResult
.
class
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
log
.
error
(
e
.
getMessage
()
);
}
if
(
null
!=
feignClientResult
&&
feignClientResult
.
getBody
().
getStatus
()
==
200
)
{
return
CommonResponseUtil
.
success
(
feignClientResult
.
getBody
().
getResult
());
...
...
@@ -1133,7 +1133,6 @@ public class CarController extends AbstractBaseController {
log
.
error
(
"注:iotCode为 ("
+
iotCode
+
") 的车辆不存在于物联系统或物联系统车辆历史轨迹接口出错!"
);
return
CommonResponseUtil
.
success
();
}
}
/**
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java
View file @
3b96edd7
...
...
@@ -349,6 +349,7 @@ public class FireFightingSystemController extends AbstractBaseController {
try
{
return
CommonResponseUtil
.
success
(
fireFightingSystemService
.
update
(
vo
));
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
(),
e
);
return
CommonResponseUtil
.
failure
(
e
.
getMessage
());
}
}
...
...
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