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
cc294fb8
Commit
cc294fb8
authored
Aug 19, 2024
by
Lambertliu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):设备列表bug修改
parent
c1878639
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
22 deletions
+25
-22
ZLDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
+25
-22
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
View file @
cc294fb8
...
...
@@ -698,6 +698,7 @@ public class ZLDPStatisticsServiceImpl {
List
<
CountDto
>
yData
=
getYDataForQZ
(
regionList
,
paramDto
);
result
.
put
(
"legendData"
,
legendData
);
result
.
put
(
"xdata"
,
xData
);
result
.
put
(
"unit"
,
"%"
);
result
.
put
(
"equipTotal"
,
yData
.
stream
().
map
(
CountDto:
:
getLongValue
).
collect
(
Collectors
.
toList
()));
result
.
put
(
"claimRate"
,
yData
.
stream
().
map
(
CountDto:
:
getStrValue
).
collect
(
Collectors
.
toList
()));
return
result
;
...
...
@@ -953,34 +954,36 @@ public class ZLDPStatisticsServiceImpl {
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"USE_UNIT_NAME"
,
"*"
+
test
+
"*"
));
boolMust
.
must
(
query
);
}
if
(
"2300"
.
equals
(
paramDto
.
getTreeValue
()))
{
if
(!
""
.
equals
(
paramDto
.
getEquCategoryCode
()))
{
// treeValue 为 "2300" 且 equCategoryCode 非空时
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
String
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getEquCategoryCode
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_DEFINE_CODE"
,
escapedValue
));
boolMust
.
must
(
query
);
if
(!
ObjectUtils
.
isEmpty
(
paramDto
.
getTreeValue
()))
{
if
(
"2300"
.
equals
(
paramDto
.
getTreeValue
()))
{
if
(
paramDto
.
getEquCategoryCode
()
!=
null
)
{
// treeValue 为 "2300" 且 equCategoryCode 非空时
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
String
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getEquCategoryCode
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_DEFINE_CODE"
,
escapedValue
));
boolMust
.
must
(
query
);
}
else
{
// treeValue 为 "2300" 且 equCategoryCode 为空时
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
String
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getTreeValue
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY_CODE"
,
escapedValue
));
boolMust
.
must
(
query
);
}
}
else
{
// treeValue
为 "2300" 且 equCategoryCode 为空
时
// treeValue
不为 "2300"
时
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
String
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getTreeValue
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY_CODE"
,
escapedValue
));
boolMust
.
must
(
query
);
}
}
else
{
// treeValue 不为 "2300" 时
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
String
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getTreeValue
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_LIST_CODE"
,
escapedValue
));
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_LIST_CODE"
,
escapedValue
));
// 处理 equCategoryCode 为空的情况
if
(!
""
.
equals
(
paramDto
.
getEquCategoryCode
()))
{
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getEquCategoryCode
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY_CODE"
,
escapedValue
));
// 处理 equCategoryCode 为空的情况
if
(
paramDto
.
getEquCategoryCode
()
!=
null
)
{
escapedValue
=
QueryParser
.
escape
(
paramDto
.
getEquCategoryCode
());
query
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY_CODE"
,
escapedValue
));
}
boolMust
.
must
(
query
);
}
boolMust
.
must
(
query
);
}
BoolQueryBuilder
pBuilder
=
QueryBuilders
.
boolQuery
();
String
param
=
QueryParser
.
escape
(
"true"
);
pBuilder
.
must
(
QueryBuilders
.
matchQuery
(
IS_INTO_MANAGEMENT
,
param
));
...
...
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