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
269cb894
Commit
269cb894
authored
Mar 28, 2025
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大屏列表查询添加"无设备类别"条件
parent
6b333737
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ZLDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
+4
-2
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 @
269cb894
...
@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
...
@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper
;
import
com.yeejoin.amos.feign.systemctl.model.RegionModel
;
import
com.yeejoin.amos.feign.systemctl.model.RegionModel
;
import
org.apache.catalina.security.SecurityUtil
;
import
org.apache.commons.compress.utils.Lists
;
import
org.apache.commons.compress.utils.Lists
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.lucene.queryparser.classic.QueryParser
;
import
org.apache.lucene.queryparser.classic.QueryParser
;
...
@@ -913,11 +912,14 @@ public class ZLDPStatisticsServiceImpl {
...
@@ -913,11 +912,14 @@ public class ZLDPStatisticsServiceImpl {
boolMust
.
must
(
meBuilder
);
boolMust
.
must
(
meBuilder
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_CATEGORY"
)))
{
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_CATEGORY"
)))
{
if
(
"无设备类别"
.
equals
(
map
.
getString
(
"EQU_CATEGORY"
))){
boolMust
.
mustNot
(
QueryBuilders
.
existsQuery
(
"EQU_CATEGORY"
));
}
else
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"EQU_CATEGORY"
));
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"EQU_CATEGORY"
));
meBuilder
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY"
,
"*"
+
test
+
"*"
));
meBuilder
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY"
,
"*"
+
test
+
"*"
));
boolMust
.
must
(
meBuilder
);
boolMust
.
must
(
meBuilder
);
}
}
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_ORG_CODE"
)))
{
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_ORG_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
...
...
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