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
35bae294
Commit
35bae294
authored
Feb 08, 2023
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:iot参数同步修改
parent
bd2d3fb2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
IotFeign.java
...src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java
+1
-0
EmergencyServiceImpl.java
...eejoin/equipmanage/service/impl/EmergencyServiceImpl.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java
View file @
35bae294
...
@@ -44,6 +44,7 @@ public interface IotFeign {
...
@@ -44,6 +44,7 @@ public interface IotFeign {
@RequestHeader
(
"product"
)
String
product
,
@RequestHeader
(
"product"
)
String
product
,
@RequestHeader
(
"token"
)
String
token
,
@RequestHeader
(
"token"
)
String
token
,
@RequestParam
(
value
=
"measurement"
)
String
measurement
,
@RequestParam
(
value
=
"measurement"
)
String
measurement
,
@RequestParam
(
required
=
false
,
value
=
"deviceName"
)
String
deviceName
,
@RequestParam
(
value
=
"timeStart"
)
String
beginDate
,
@RequestParam
(
value
=
"timeStart"
)
String
beginDate
,
@RequestParam
(
value
=
"timeEnd"
)
String
endDate
,
@RequestParam
(
value
=
"timeEnd"
)
String
endDate
,
@RequestParam
(
"FHS_PressurePump_Start"
)
String
key
,
@RequestParam
(
"FHS_PressurePump_Start"
)
String
key
,
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EmergencyServiceImpl.java
View file @
35bae294
...
@@ -236,7 +236,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -236,7 +236,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
if
(
x
.
get
(
"iotCode"
)
!=
null
&&
iotCode
.
toString
().
length
()
>
8
)
{
if
(
x
.
get
(
"iotCode"
)
!=
null
&&
iotCode
.
toString
().
length
()
>
8
)
{
prefix
=
iotCode
.
toString
().
substring
(
0
,
8
);
prefix
=
iotCode
.
toString
().
substring
(
0
,
8
);
try
{
try
{
ResponseModel
responseModel
=
iotFeign
.
selectListNew
(
appKey
,
product
,
token
,
prefix
,
startTime
,
endTime
,
null
,
pressurePumpStart
);
ResponseModel
responseModel
=
iotFeign
.
selectListNew
(
appKey
,
product
,
token
,
prefix
,
null
,
startTime
,
endTime
,
null
,
pressurePumpStart
);
if
(
200
==
responseModel
.
getStatus
())
{
if
(
200
==
responseModel
.
getStatus
())
{
String
json
=
JSON
.
toJSONString
(
responseModel
.
getResult
());
String
json
=
JSON
.
toJSONString
(
responseModel
.
getResult
());
List
<
Map
<
String
,
String
>>
dataList
=
(
List
<
Map
<
String
,
String
>>)
JSONArray
.
parse
(
json
);
List
<
Map
<
String
,
String
>>
dataList
=
(
List
<
Map
<
String
,
String
>>)
JSONArray
.
parse
(
json
);
...
@@ -360,7 +360,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
...
@@ -360,7 +360,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
// 停泵前的前5分钟,判断管网压力状态
// 停泵前的前5分钟,判断管网压力状态
try
{
try
{
String
stop5BeforeTime
=
DateUtils
.
convertDateToString
(
DateUtils
.
dateAddMinutes
(
DateUtils
.
convertStrToDate
(
intervalTime
,
"yyyy-MM-dd HH:mm:ss"
),
-
5
),
"yyyy-MM-dd HH:mm:ss"
);
String
stop5BeforeTime
=
DateUtils
.
convertDateToString
(
DateUtils
.
dateAddMinutes
(
DateUtils
.
convertStrToDate
(
intervalTime
,
"yyyy-MM-dd HH:mm:ss"
),
-
5
),
"yyyy-MM-dd HH:mm:ss"
);
ResponseModel
pipeResponseModel
=
iotFeign
.
selectListNew
(
appKey
,
product
,
token
,
prefix
,
stop5BeforeTime
,
intervalTime
,
null
,
"FHS_PipePressureDetector_PipePressure"
);
ResponseModel
pipeResponseModel
=
iotFeign
.
selectListNew
(
appKey
,
product
,
token
,
prefix
,
null
,
stop5BeforeTime
,
intervalTime
,
null
,
"FHS_PipePressureDetector_PipePressure"
);
if
(
200
==
pipeResponseModel
.
getStatus
())
{
if
(
200
==
pipeResponseModel
.
getStatus
())
{
String
pipeJson
=
JSON
.
toJSONString
(
pipeResponseModel
.
getResult
());
String
pipeJson
=
JSON
.
toJSONString
(
pipeResponseModel
.
getResult
());
List
<
Map
<
String
,
String
>>
pipeDataList
=
(
List
<
Map
<
String
,
String
>>)
JSONArray
.
parse
(
pipeJson
);
List
<
Map
<
String
,
String
>>
pipeDataList
=
(
List
<
Map
<
String
,
String
>>)
JSONArray
.
parse
(
pipeJson
);
...
...
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