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
04e10a09
Commit
04e10a09
authored
Nov 10, 2023
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 td信息
parent
8130ca01
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
TDBigScreenAnalyseController.java
...le/jxiop/biz/controller/TDBigScreenAnalyseController.java
+5
-1
FanHealthIndex.xml
...iz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @
04e10a09
...
@@ -127,14 +127,18 @@ public class TDBigScreenAnalyseController extends BaseController {
...
@@ -127,14 +127,18 @@ public class TDBigScreenAnalyseController extends BaseController {
StationBasic
stationBasic
=
stationBasicMapper
.
selectById
(
stationCode
);
StationBasic
stationBasic
=
stationBasicMapper
.
selectById
(
stationCode
);
stationCode
=
stationBasic
.
getFanGatewayId
();
stationCode
=
stationBasic
.
getFanGatewayId
();
}
}
if
(
StrUtil
.
isNotEmpty
(
areaCode
))
{
areaCode
=
"%"
+
areaCode
+
"%"
;
}
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
HashMap
<
String
,
Object
>
resultMap
=
new
HashMap
<>();
List
<
Map
<
String
,
String
>>
dateInfoBy15
=
idxBizFanHealthIndexMapper
.
getDateInfoBy15
();
List
<
Map
<
String
,
String
>>
dateInfoBy15
=
idxBizFanHealthIndexMapper
.
getDateInfoBy15
();
List
<
String
>
valueList
=
new
ArrayList
<>();
List
<
String
>
valueList
=
new
ArrayList
<>();
String
finalStationCode
=
stationCode
;
String
finalStationCode
=
stationCode
;
List
<
String
>
dateList
=
new
ArrayList
<>();
List
<
String
>
dateList
=
new
ArrayList
<>();
String
finalAreaCode
=
areaCode
;
dateInfoBy15
.
forEach
(
item
->
{
dateInfoBy15
.
forEach
(
item
->
{
String
healthListInfo
=
fanHealthIndexMapper
.
getInfoByDate
(
a
reaCode
,
finalStationCode
,
item
.
get
(
"date"
));
String
healthListInfo
=
fanHealthIndexMapper
.
getInfoByDate
(
finalA
reaCode
,
finalStationCode
,
item
.
get
(
"date"
));
valueList
.
add
(
CharSequenceUtil
.
isNotEmpty
(
healthListInfo
)
?
healthListInfo
.
replace
(
".0"
,
""
)
:
"100"
);
valueList
.
add
(
CharSequenceUtil
.
isNotEmpty
(
healthListInfo
)
?
healthListInfo
.
replace
(
".0"
,
""
)
:
"100"
);
String
date
=
item
.
get
(
"date"
);
String
date
=
item
.
get
(
"date"
);
Date
date1
=
DateUtils
.
dateAddDays
(
DateUtil
.
parse
(
date
,
DateUtils
.
DATE_PATTERN
),
-
1
);
Date
date1
=
DateUtils
.
dateAddDays
(
DateUtil
.
parse
(
date
,
DateUtils
.
DATE_PATTERN
),
-
1
);
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml
View file @
04e10a09
...
@@ -343,7 +343,7 @@
...
@@ -343,7 +343,7 @@
<where>
<where>
rec_date = concat(#{date}, ' 00:00:00')
rec_date = concat(#{date}, ' 00:00:00')
<if
test=
"areaCode != null and areaCode != ''"
>
<if
test=
"areaCode != null and areaCode != ''"
>
AND area
= concat(#{areaCode}, '区域')
AND area
like #{areaCode}
AND analysis_obj_type = '片区'
AND analysis_obj_type = '片区'
</if>
</if>
<if
test=
"stationCode != null and stationCode != ''"
>
<if
test=
"stationCode != null and stationCode != ''"
>
...
@@ -364,7 +364,7 @@
...
@@ -364,7 +364,7 @@
<where>
<where>
rec_date = concat(#{date}, ' 00:00:00')
rec_date = concat(#{date}, ' 00:00:00')
<if
test=
"areaCode != null and areaCode != ''"
>
<if
test=
"areaCode != null and areaCode != ''"
>
AND area
= concat(#{areaCode}, '区域')
AND area
like #{areaCode}
AND analysis_obj_type = '片区'
AND analysis_obj_type = '片区'
</if>
</if>
<if
test=
"stationCode != null and stationCode != ''"
>
<if
test=
"stationCode != null and stationCode != ''"
>
...
...
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